diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..bd1836d4f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "tun2socks"] + path = tun2socks + url = https://github.com/celzero/outline-go-tun2socks diff --git a/README.md b/README.md index 673633dde..e0d4a63f6 100644 --- a/README.md +++ b/README.md @@ -1,117 +1,91 @@ -## Rethink DNS + Firewall + VPN for Android -A [WireGuard](https://github.com/wireguard/wireguard-go) client, an [OpenSnitch](https://github.com/evilsocket/opensnitch)-inspired firewall and network monitor + a [pi-hole](https://github.com/pi-hole/pi-hole)-inspired DNS over HTTPS, DNS over TLS, DNSCrypt client with blocklists. +# Re-Rethink -[Get it on F-Droid](https://f-droid.org/packages/com.celzero.bravedns/) -[Get it on Google Play](https://play.google.com/store/apps/details?id=com.celzero.bravedns) -[Get it with Obtainium](https://apps.obtainium.imranr.dev/redirect.html?r=obtainium://add/https://github.com/celzero/rethink-app) - -*Release certificate SHA-256 digest*: `1f32d432e81a1dc5c00aafeb0c6636cd7819965d174420e59db9675dff7a88e9`. - -In other words, Rethink DNS + Firewall + VPN has three primary modes, VPN, DNS, and Firewall. The VPN (proxifier) mode supports multiple WireGuard upstreams in a split-tunnel configuration. The DNS mode routes all DNS traffic generated by apps to _any_ user-chosen DNS-over-HTTPS / DNS-over-TLS / DNSCrypt resolver, or to WireGuard-configured DNS in a split-tunnel configuration. The Firewall mode lets the user deny internet-access to entire applications based on events like screen-on / screen-off, app-foreground / app-background, unmetered-connection / metered-connection; or based on play-store defined categories like Social, Games, Utility, Productivity; or additionally, based on user-defined domain & IP denylists. - -![2](https://github.com/celzero/rethink-app/assets/56958445/618bb47c-586c-41b9-ba1c-f62c2bbc9649) -![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) - -*screenshots from [`v055e`](https://github.com/celzero/rethink-app/releases/tag/v0.5.5e).* - -### VPN / Proxifier -Rethink supports forwarding TCP & UDP 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. - -### Firewall -The firewall doesn't really care about the connections per se rather what's making those connections. This is different from the traditional firewalls but in-line with [Little Snitch](https://www.obdev.at/products/littlesnitch/index.html), [LuLu](https://objective-see.com/products/lulu.html), [Glasswire](https://glasswire.com/) and others. - -Currently, per-app connection mapping is implemented by capturing `udp` and `tcp` connections managed by [`firestack`](https://github.com/celzero/firestack) (written in golang) and asking [ConnectivityService for the owner](https://developer.android.com/about/versions/10/privacy/changes#proc-net-filesystem), an API available only on Android 10 or higher. `procfs` (`/proc/net/tcp` and `/proc/net/udp`) is read on-demand to track per-app connections like [NetGuard](https://github.com/M66B/NetGuard/) or OpenSnitch do, on Android 9 and lower versions. - -### Network Monitor -A network monitor is a per-app report-card of sorts on when connections were made, how many were made, and to where. Tracking UDP / TCP (and DNS on Android 12+) is straight-forward. DNS are trickier to track on Android 11 and below, and so a rough heuristic is used for now, which may not hold good in all cases. - -### DNS over HTTPS client -Almost all of the network related code (`firestack`), including DNS over HTTPS split-tunnel, is a hard fork of [Jigsaw-Code/outline-go-tun2socks](https://github.com/Jigsaw-Code/outline-go-tun2socks) written in golang. The UI is vastly different but borrows minimally from [Jigsaw-Code/Intra](https://github.com/Jigsaw-Code/Intra/). A split-tunnel traps requests sent to the VPN's DNS endpoint and relays it to a DNS-over-HTTPS / DNS-over-TLS / DNSCrypt / Oblivious DNS-over-HTTPS endpoint of the user's choosing, logging the end-to-end latency, time of request, the DNS request query itself, and its answer. - -### The Rethink DNS Resolver -A malware and ad-blocking DNS over HTTPS resolver at `https://sky.rethinkdns.com/rs` (deployed to 300+ locations world-wide via Cloudflare Workers) is the default DNS endpoint on the app, though the user is free to change that. A configurable DNS resolver that lets users add or remove denylists and allowlists, add rewrites, analyse DNS requests is launching late 2026. Right now, a free-to-use DNS over HTTPS endpoint with custom blocklists can be setup here: [rethinkdns.com/configure](https://rethinkdns.com/configure). - -The resolver, sponsored by [FLOSS/fund](https://floss.fund/), is deployed to [Fly.io](https://fly.io/) at `max.rethinkdns.com`, and [Deno Deploy](https://deno.com/deploy) at `rdns.deno.dev` too, apart from the default deployment on [Cloudflare Workers](https://workers.dev). The resolver is open source software: [serverless-dns](https://github.com/serverless-dns/serverless-dns). - -### The Rethink Proxy Network -RPN is a multi-party relay, with connections hopping over serverless proxy (hosted on Cloudflare Workers) exiting through Windscribe. Users would be able to self-host the first hop or use the ones run by us. At launch in Dec 2025, this service would cost $3/month for unlimited bandwidth. - -The proxy is open source software: [serverless-proxy](https://github.com/serverless-proxy/serverless-proxy). - -### Community -[GitHub Sponsors](https://github.com/sponsors/serverless-dns) -- The telegram community is super active and full of crypto-bros. Kidding. We are generally a welcoming bunch. Feel free to get in touch: [t.me/rethinkdns](https://t.me/rethinkdns). -- Or, if you prefer Matrix (which is bridged to Telegram): [`#rethinkdns:matrix.org`](https://matrix.to/#/#rethinkdns:matrix.org) (or: [`!jrTSpJiEkFNNBMhSaE:matrix.org`](https://matrix.to/#/!jrTSpJiEkFNNBMhSaE:matrix.org)). -- Or, email us: [hello@celzero.com](mailto:hello@celzero.com) (we read all emails immediately and reply once we fix the issues being reported). -- We regularly hangout in our subreddit: [r/rethinkdns](https://reddit.com/r/rethinkdns). -- We're also kind of active on the bird and toot apps, mostly nerd-sniping other engs or shit-posting about our tech stack: [twitter/rethinkdns](https://twitter.com/rethinkdns), [mastodon/rdns](https://mastodon.social/@rdns). - -### Translation -Help [translate Rethink DNS + Firewall + VPN](https://hosted.weblate.org/engage/rethink-dns-firewall) on [Weblate](https://weblate.org/):

-[![](https://hosted.weblate.org/widgets/rethink-dns-firewall/-/287x66-black.png)](https://hosted.weblate.org/engage/rethink-dns-firewall) - -### What Rethink DNS + Firewall + VPN is not -Rethink is *not* an anonymity tool: It helps users tackle unabated censorship and surveillance but doesn't lay claim to protecting a user's identity at all times, if ever. - -Rethink does *not* aim to be a feature-rich traditional firewall: It is more in-line with [Little Snitch](https://www.obdev.at/products/littlesnitch/index.html) than IP tables, say. - -Rethink is *not* an anti-virus: Rethink may stop users from phishing attacks, malware, scareware websites through its DNS-based blocklists, but it doesn't actively mitigate threats or even look for them or act on them, otherwise. - -### What Rethink DNS + Firewall + VPN aspires to be -To turn Android devices into user-agents: Something that users can control as they please without requiring root-access. A big part of this, for an always-on, always-connected devices, is capturing network traffic and reporting it in a way that makes sense to the end-users who can then take a series of actions to limit their exposure but not necessarily eliminate it. Take DNS for example-- for most if not all connections, apps send out a DNS request first, and by tracking just those one can glean a lot of intelligence about what's happening on their Androids and which app's responsible. - -To deliver the promise of open-internet for all: With the inevitable ECH (encrypted client hello) standardization and the imminent adoption of DNS-over-HTTPS and DNS-over-TLS across operating systems and browsers, we're that much closer to an open internet. Of course, *Deep Packet Inspection* remains a credible threat that can't be mitigated with just encrypted DNS, but it is one example of delivering maximum impact (circumvent internet censorship in most countries) with minimal effort (not requiring use of a VPN or access via IPFS, for example). Rethink would continue to make these technologies accessible in the simplest way possible, especially the ones that get 90% of the way there with 10% effort. - -## Development -[![Release](https://img.shields.io/github/v/release/celzero/rethink-app?include_prereleases)](https://github.com/celzero/rethink-app/releases)   [![CI](https://github.com/celzero/rethink-app/actions/workflows/android.yml/badge.svg?branch=main)](https://github.com/celzero/rethink-app/actions/workflows/android.yml)   [![License: Apache-2.0](https://img.shields.io/badge/License-Apache-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)   [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/celzero/rethink-app/badge)](https://securityscorecards.dev/viewer/?uri=github.com/celzero/rethink-app)   [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/celzero/rethink-app) - -1. Feel free to fork and send a pull request for any reproducible bug fixes. - 1. The codebase is raw and is lacking documentation and comprehensive tests. If you need help, feel free to create a Wikipage to highlight the pain with building, testing, writing, committing code. [DeepWiki](https://deepwiki.com/celzero/rethink-app) and [Copilot](https://github.com/copilot?prompt=https://github.com/celzero/rethink-app) may also help, but they do hallucinate. - 2. Write descriptive commit messages that explain concisely the changes made. - 3. Each commit must reference an open issue on the project to make sure there isn't duplicated effort and prior discussion to refer to. -2. If you plan to work on a feature, please create a [github issue on the project](https://github.com/celzero/rethink-app/issues/new) first to kickstart the discussion before committing to doing any work. -3. Prod releases are usually once every few months, while [alpha is released monthly](https://github.com/celzero/rethink-app/actions/workflows/nightly.yml). - -## Tenets (unless you know better ones) -We aren't there yet, may never will be but these are some tenets for the project for the foreseeable future. - -- Make it right, make it secure, make it resilient, make it fast. In that order. -- Easy to use, no-root, no-gimmicks features that are anti-censorship and anti-surveillance. - - Easy to use: Any of the 3B+ Android users must be able to use it. Think CleanMaster / Instagram levels of ease-of-use. - - no-root: Shouldn't require root-access for any functionality added to it. - - no-gimmicks: Misleading material bordering on scareware, for example. -- Anti-censorship: Features focused on helping bring an open internet to everyone, preferably in the most efficient way possible (both monetarily and technically). -- Anti-surveillance: As above, but features that further limit (may not necessarily eliminate) surveillance by apps. -- Incremental changes in balance with newer features. - - For example, work on nagging UI issues or OEM specific bugs, must be taken up on equal weight to newer features, and a release must probably establish a good balance between the two. However; working on only incremental changes for a release is fine. -- Opinionated. Chip-away complexity. Do not expect users to require a PhD in Computer Science to use the app. - - No duplicate functionality. - - A concerted effort to not provide too many tunable knobs and settings. To err on the side of easy over simple. -- Ignore all tenets. - - Common sense always takes over when tenets get in the way. -- Must be distributable on the PlayStore, at least some toned down version of it. - - This unfortunately means on-device blocklists aren't possible; however, [Cloudflare Gateway](https://www.cloudflare.com/teams-gateway/)-esque cloud-based per-user blocklists get us the same functionality. -- Practice what you preach: Be obsessively private and secure. - -## Backstory -[FOSS United](https://fossunited.org/grants)  -[Mozilla Builders](https://builders.mozilla.community/)  -[FLOSS/fund by Zerodha](https://floss.fund/)  - -Internet censorship (sometimes ISP-enforced and often times government-enforced), unabated dragnet surveillance (by pretty much every company and app) stirred us upon this path. The three of us university classmates, [Mohammed](https://www.linkedin.com/in/hussain-mohammed-2525a626/), [Murtaza](https://www.linkedin.com/in/murtaza-aliakbar/), [Santhosh](https://www.linkedin.com/in/santhosh-ponnusamy-2b781244/) got together in late 2019 in the sleepy town of Coimbatore, India to do something about it. Our main gripe was there were all these wonderful tools that people could use but couldn't, either due to cost or due to inability to grok Computer-specific jargon. A lot has happened since we started and a lot has changed but our focus has always been on Android and its 3B+ unsuspecting users. The current idea has been in the works for since May 2020, with the pandemic derailing a bit of progress, and a bit of snafu with abandoning our previous version in favour of the current fork, which we aren't proud of yet, but it is a start. All's good now that we've won a grant from the [Mozilla Builders MVP program](https://builders.mozilla.community/) to go ahead and build this thing that we wanted to... do so faster... and not simply sleep our way through the execution. I hope you're excited but not as much as us that you quit your jobs for this like we did. +

+ Re-Rethink overview +

+

+ Take control of your Android device's network traffic without requiring root access.
+ A WireGuard client, OpenSnitch-inspired firewall, and pi-hole-inspired DNS client with blocklists. Built with Kotlin, Jetpack Compose, and Material 3 Expressive. +

+ +

+ Kotlin + License: Apache-2.0 + Platforms +

+ +--- + +Re-Rethink is an entirely new project—a modernized, meticulously crafted fork of [Rethink DNS](https://github.com/celzero/rethink-app). It preserves the original's core philosophy—no-root, VPN-based filtering, local-first processing, and rich DNS features—while adding a completely refreshed, first-class Material 3 Expressive Android UX. Expect dynamic workflows, fluid motion, and greater clarity for logs, rules, and settings. + +It operates in three primary modes: **VPN**, **DNS**, and **Firewall**. By supporting multiple WireGuard upstreams in a split-tunnel configuration, Re-Rethink allows for advanced tracking and precise control of app connections while using popular encrypted DNS protocols seamlessly. + +## 🚀 Key Features + +- 🛡️ **Advanced Firewall:** Precisely deny internet access to specific apps based on screen state, background/foreground state, unmetered/metered connections, Play Store categories, or user-defined IP and domain denylists. +- 🎨 **UI-First Redesign:** Built from the ground up for Material 3 Expressive. Features cleaner spacing, dynamic animations, and improved interaction behaviors over the original app. +- 🌐 **Robust DNS:** Route DNS traffic to your chosen DNS-over-HTTPS, DNS-over-TLS, or DNSCrypt resolver. The built-in default resolver seamlessly blocks ads and malware. +- 🔒 **VPN / Proxifier:** Forward TCP & UDP over SOCKS5, HTTP CONNECT, and WireGuard tunnels. Leverage split-tunneling to route different apps over different tunnels concurrently. +- 📊 **Network Monitor:** A comprehensive, per-app report card tracking when and where connections were made via UDP, TCP, and DNS, featuring upgraded traffic timeline views. +- 📱 **No-Root Required:** Total control over your traffic without compromising your Android device's security model. +- 🌍 **Anti-Censorship & Anti-Surveillance:** Engineered to circumvent internet censorship, limit invasive tracking by apps, and enforce privacy. + +## 📸 Screenshots + +

+ Re-Rethink Screenshots +

+ +## ✨ What's New in Re-Rethink + +If you are coming from the original Rethink DNS, we've been hard at work refining the app experience. Major differences and recent improvements include: + +- **Complete Visual Overhaul:** Built heavily with Jetpack Compose, the app embraces Google's Material 3 Expressive design language for a modern, fluid experience. +- **Improved Log Clarity:** The traffic logs and DNS logs have been completely redesigned with expressive card UI patterns, tonal elevation, and spring animations, so it's clearer which connections were blocked. +- **Polished Settings:** We've grouped settings logically and refined UI toggles, color pickers, and appearance configurations to be deeply consistent. + +## ⚙️ How It Works + +Re-Rethink operates as a local-only application. It uses Android's built-in `VpnService` to route your device's traffic through a local sinkhole. + +Because the app routes the traffic *internally on your device*, **it never sends your data to an external proxy or remote server unless you configure it to**. The application can inspect the outbound connection attempts and selectively drop or allow packets based on the rules you set for each app, providing a true on-device firewall without requiring root access. + + +## ⚠️ Behavior Notes + +- This app is local-first by default. +- Some device manufacturers apply stricter VPN policies; background behavior can vary. +- Certain background/network capabilities depend on notification, battery optimization, and device permissions. + +## 🛠️ Technology Stack + +- **Language:** Modern [Kotlin](https://kotlinlang.org/). +- **UI Toolkit:** Fully rebuilt with [Jetpack Compose](https://developer.android.com/jetpack/compose) and [Material 3 Expressive](https://m3.material.io/). +- **Concurrency:** Kotlin Coroutines & Flow for asynchronous data streams. +- **Local Storage:** Room Database and DataStore for persistent configurations and logs. + +## 📥 Getting Started + +To build and run Re-Rethink locally on your machine: + +1. Clone this repository: + ```bash + git clone https://github.com/bernaferrari/rethink-app.git + ``` +2. Open the project in the latest version of **Android Studio**. +3. Let Gradle sync download all required dependencies. +4. Connect an Android device or start an emulator. +5. Click **Run** (`Shift + F10`). + +## 📜 Credits & License + +- **Original Project:** [Rethink DNS](https://github.com/celzero/rethink-app) +- **License:** Apache License 2.0. See [`LICENSE`](LICENSE) for details. + +

+ Re-Rethink Light Mode variant +

+ +--- +

Made with ❤️ for an open internet and Jetpack Compose

diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 000000000..f00f777a5 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,439 @@ +import io.gitlab.arturbosch.detekt.Detekt +import io.gitlab.arturbosch.detekt.extensions.DetektExtension +import java.util.Properties +import java.io.FileInputStream + + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.ksp) + alias(libs.plugins.detekt) + + alias(libs.plugins.compose.compiler) + alias(libs.plugins.kotlin.serialization) +} + +ksp { + arg("room.schemaLocation", "$projectDir/schemas") +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + + +// apply Google Services and Firebase Crashlytics plugins conditionally +val taskNames = gradle.startParameter.taskNames.joinToString(",").lowercase() +val apkBuild = taskNames.contains("full") +val fdroidBuild = taskNames.contains("fdroid") +val fdroidBuildServer = System.getenv("fdroidserver") +val isFdroidBuildServer = !fdroidBuildServer.isNullOrEmpty() && fdroidBuildServer != "null" +val deGoogled = !apkBuild || fdroidBuild || isFdroidBuildServer + +println("app-task names: '$taskNames'") +println("gradle deGoogled? $deGoogled (fdroidBuild: $fdroidBuild, fdroidBuildServer: $isFdroidBuildServer, apkBuild: $apkBuild)") + +if (!deGoogled) { + apply(plugin = "com.google.gms.google-services") + apply(plugin = "com.google.firebase.crashlytics") + println("app firebase plugins applied") +} else { + println("app firebase plugins SKIPPED") +} + +val keystorePropertiesFile = rootProject.file("keystore.properties") +val keystoreProperties = Properties() + +val gitVersion = providers.exec { + commandLine("git", "describe", "--tags", "--always") +}.standardOutput.asText.get().trim() + +fun getVersionCode(project: Project): Int { + var code = 0 + try { + val envCode = System.getenv("VERSION_CODE") + if (envCode != null) { + code = Integer.parseInt(envCode) + project.logger.info("env version code: $code") + } + } catch (ex: NumberFormatException) { + project.logger.info("missing env version code: ${ex.message}") + } + if (code == 0) { + code = (project.properties["VERSION_CODE"] as? String)?.toIntOrNull() ?: 0 + project.logger.info("project properties version code: $code") + } + return code +} + +try { + if (keystorePropertiesFile.exists()) { + keystoreProperties.load(FileInputStream(keystorePropertiesFile)) + } +} catch (ex: Exception) { + logger.info("missing keystore prop: ${ex.message}") + keystoreProperties["keyAlias"] = "" + keystoreProperties["keyPassword"] = "" + keystoreProperties["storeFile"] = "/dev/null" + keystoreProperties["storePassword"] = "" +} + +android { + compileSdk = 36 + namespace = "com.celzero.bravedns" + + androidResources { + generateLocaleConfig = true + } + + defaultConfig { + applicationId = "com.celzero.bravedns" + minSdk = 23 + targetSdk = 36 + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + signingConfigs { + create("config") { + keyAlias = keystoreProperties["keyAlias"] as String? + keyPassword = keystoreProperties["keyPassword"] as String? + val storeFilePath = keystoreProperties["storeFile"] as String? + if (storeFilePath != null) { + storeFile = file(storeFilePath) + } + storePassword = keystoreProperties["storePassword"] as String? + } + create("alpha") { + keyAlias = System.getenv("ALPHA_KS_ALIAS") + keyPassword = System.getenv("ALPHA_KS_PASSPHRASE") + val storeFilePath = System.getenv("ALPHA_KS_FILE") + if (storeFilePath != null) { + storeFile = file(storeFilePath) + } + storePassword = System.getenv("ALPHA_KS_STORE_PASSPHRASE") + } + } + + splits { + abi { + isEnable = true + reset() + include("x86", "armeabi-v7a", "arm64-v8a", "x86_64") + isUniversalApk = true + } + } + + + + buildTypes { + getByName("release") { + isMinifyEnabled = true + isShrinkResources = true + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + ndk { + debugSymbolLevel = "SYMBOL_TABLE" + abiFilters += listOf("arm64-v8a", "armeabi-v7a", "x86_64") + } + if (!deGoogled) { + configure { + nativeSymbolUploadEnabled = true + } + } + } + create("leakCanary") { + initWith(getByName("debug")) + matchingFallbacks += listOf("debug") + } + create("alpha") { + applicationIdSuffix = ".alpha" + isMinifyEnabled = true + isShrinkResources = true + signingConfig = signingConfigs.getByName("alpha") + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + + if (!deGoogled) { + afterEvaluate { + tasks.configureEach { + if (name.contains("injectCrashlyticsBuildIds")) { + enabled = false + logger.warn("disabled build id injection for: $name") + } + if (name.contains("uploadCrashlyticsSymbolFile")) { + doFirst { + logger.info("uploading crashlytics symbols: $name") + } + } + } + } + } + + + + buildFeatures { + viewBinding = true + buildConfig = true + compose = true + } + + compileOptions { + isCoreLibraryDesugaringEnabled = true + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + packaging { + jniLibs { + keepDebugSymbols += listOf("**/*.so") + } + } + + flavorDimensions += listOf("releaseChannel", "releaseType") + productFlavors { + create("play") { + dimension = "releaseChannel" + } + create("fdroid") { + dimension = "releaseChannel" + } + create("website") { + dimension = "releaseChannel" + } + create("full") { + dimension = "releaseType" + versionCode = getVersionCode(project) + versionName = gitVersion + vectorDrawables.useSupportLibrary = true + } + } + + lint { + abortOnError = true + warningsAsErrors = true + checkDependencies = true + baseline = file("lint-baseline.xml") + xmlReport = true + htmlReport = true + sarifReport = true + } +} + +configure { + parallel = true + buildUponDefaultConfig = true + allRules = false + config.setFrom("$rootDir/config/detekt/detekt.yml") + baseline = file("$rootDir/config/detekt/baseline.xml") + source.setFrom( + files( + "src/main/java", + "src/full/java" + ) + ) +} + +tasks.withType().configureEach { + jvmTarget = "17" + reports { + html.required.set(true) + xml.required.set(true) + sarif.required.set(true) + txt.required.set(false) + md.required.set(false) + } +} + +val download by configurations.creating { + isTransitive = false +} + +val firestackRepo = project.findProperty("firestackRepo") as? String ?: "github" +val firestackCommit = project.findProperty("firestackCommit") as? String ?: "main" + +fun firestackDependency(suffix: String = ":debug"): String { + return when (firestackRepo) { + "jitpack", "github" -> "com.github.celzero:firestack:$firestackCommit$suffix@aar" + "ossrh" -> "com.celzero:firestack:$firestackCommit$suffix@aar" + else -> throw GradleException("Unknown firestackRepo: $firestackRepo") + } +} + +dependencies { + implementation(libs.guava) + implementation(libs.androidx.compose.foundation) + implementation(libs.androidx.compose.animation) + coreLibraryDesugaring(libs.desugar.jdk.libs) + + "fullImplementation"(libs.kotlin.stdlib.jdk8) + "fullImplementation"(libs.androidx.appcompat) + "fullImplementation"(libs.androidx.core.ktx) + implementation(libs.androidx.preference.ktx) + "fullImplementation"(libs.androidx.constraintlayout) + "fullImplementation"(libs.androidx.swiperefreshlayout) + + // Compose + val composeBom = platform(libs.androidx.compose.bom) + implementation(composeBom) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.text) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation(libs.androidx.compose.material.icons.extended) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.navigation.compose) + implementation(libs.materialkolor) + debugImplementation(libs.androidx.ui.tooling) + + "fullImplementation"(libs.kotlinx.coroutines.core) + "fullImplementation"(libs.kotlinx.coroutines.android) + implementation(libs.kotlinx.serialization.json) + + implementation(libs.androidx.lifecycle.livedata.ktx) + implementation(libs.gson) + implementation(libs.napier) + + // Room + implementation(libs.androidx.room.runtime) + ksp(libs.androidx.room.compiler) + implementation(libs.androidx.room.ktx) + implementation(libs.androidx.room.paging) + + "fullImplementation"(libs.androidx.lifecycle.viewmodel.ktx) + "fullImplementation"(libs.androidx.lifecycle.runtime.ktx) + + // Paging + implementation(libs.androidx.paging.runtime.ktx) + implementation(libs.androidx.paging.compose) + "fullImplementation"(libs.androidx.fragment.ktx) + "fullImplementation"(libs.androidx.viewpager2) + + "fullImplementation"(libs.okhttp) + "fullImplementation"(libs.okhttp.dnsoverhttps) + + "fullImplementation"(libs.retrofit) + "fullImplementation"(libs.retrofit.converter.gson) + + implementation(libs.okio.jvm) + + "fullImplementation"(libs.glide) { + exclude(group = "glide-parent") + } + "fullImplementation"(libs.glide.okhttp3.integration) { + exclude(group = "glide-parent") + } + + "kspFull"(libs.glide.compiler) + + "fullImplementation"(libs.shimmer) + + download(libs.koin.core) + implementation(libs.koin.core) + download(libs.koin.android) + implementation(libs.koin.android) + + download(libs.krate) + implementation(libs.krate) + + "fullImplementation"(libs.viewbindingpropertydelegate) + "fullImplementation"(libs.viewbindingpropertydelegate.noreflection) + + download(firestackDependency()) + "websiteImplementation"(firestackDependency()) + "fdroidImplementation"(firestackDependency()) + "playImplementation"(firestackDependency()) + + implementation(libs.androidx.work.runtime.ktx) { + modules { + module("com.google.guava:listenablefuture") { + replacedBy("com.google.guava:guava", "listenablefuture is part of guava") + } + } + } + + download(libs.ipaddress) + implementation(libs.ipaddress) + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.androidx.test.espresso.core) + androidTestImplementation(libs.androidx.test.rules) + testImplementation(libs.robolectric) + testImplementation(libs.androidx.test.core) + testImplementation(libs.androidx.test.ext.junit) + testImplementation(libs.mockito.core) + testImplementation(libs.mockk) + testImplementation(libs.mockk.android) + testImplementation(libs.androidx.arch.core.testing) + testImplementation(libs.kotlinx.coroutines.test) + testImplementation(libs.koin.test) + testImplementation(libs.koin.test.junit4) + androidTestImplementation(libs.mockk.android) + + "leakCanaryImplementation"(libs.leakcanary.android) + + "fullImplementation"(libs.androidx.navigation.fragment.ktx) + "fullImplementation"(libs.androidx.navigation.ui.ktx) + + "fullImplementation"(libs.androidx.biometric) + + "playImplementation"(libs.play.app.update) + "playImplementation"(libs.play.app.update.ktx) + + implementation(libs.androidx.security.crypto) + implementation(libs.androidx.security.app.authenticator) + androidTestImplementation(libs.androidx.security.app.authenticator) + + "fullImplementation"(libs.zxing.embedded) + "fullImplementation"(libs.recyclerview.fastscroll) + "fullImplementation"(libs.konfetti) + + // lint + lintChecks(libs.android.security.lint) + + implementation(libs.betterypermissionhelper) + + "websiteImplementation"(platform(libs.firebase.bom)) + "websiteImplementation"(libs.firebase.crashlytics) + "websiteImplementation"(libs.firebase.crashlytics.ndk) + + "playImplementation"(platform(libs.firebase.bom)) + "playImplementation"(libs.firebase.crashlytics) + "playImplementation"(libs.firebase.crashlytics.ndk) +} + +androidComponents { + onVariants { variant -> + val versionCodes = mapOf( + "armeabi-v7a" to 2, + "arm64-v8a" to 3, + "x86" to 8, + "x86_64" to 9 + ) + val mainOutput = variant.outputs.singleOrNull { + it.filters.any { filter -> filter.filterType == com.android.build.api.variant.FilterConfiguration.FilterType.ABI } + } + mainOutput?.let { output -> + val abi = output.filters.find { it.filterType == com.android.build.api.variant.FilterConfiguration.FilterType.ABI }?.identifier + val baseAbiVersionCode = versionCodes[abi] + if (baseAbiVersionCode != null) { + // Use map to calculate version code properly from the provider + val calculatedVersionCode = variant.outputs.first().versionCode.map { base -> + ((baseAbiVersionCode * 10000000) + (base ?: 0)).toInt() + } + output.versionCode.set(calculatedVersionCode) + } + } + } +} + +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + freeCompilerArgs.add("-Xwarning-level=SENSELESS_COMPARISON:disabled") + } +} diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml new file mode 100644 index 000000000..f53637925 --- /dev/null +++ b/app/lint-baseline.xml @@ -0,0 +1,7672 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/schemas/com.celzero.bravedns.database.AppDatabase/27.json b/app/schemas/com.celzero.bravedns.database.AppDatabase/27.json new file mode 100644 index 000000000..b1d978997 --- /dev/null +++ b/app/schemas/com.celzero.bravedns.database.AppDatabase/27.json @@ -0,0 +1,1526 @@ +{ + "formatVersion": 1, + "database": { + "version": 27, + "identityHash": "3fb2e43e66aa3323303f11e5bc5ddb0d", + "entities": [ + { + "tableName": "AppInfo", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`packageName` TEXT NOT NULL, `appName` TEXT NOT NULL, `uid` INTEGER NOT NULL, `isSystemApp` INTEGER NOT NULL, `firewallStatus` INTEGER NOT NULL, `appCategory` TEXT NOT NULL, `wifiDataUsed` INTEGER NOT NULL, `mobileDataUsed` INTEGER NOT NULL, `connectionStatus` INTEGER NOT NULL, `screenOffAllowed` INTEGER NOT NULL, `backgroundAllowed` INTEGER NOT NULL, `uploadBytes` INTEGER NOT NULL, `downloadBytes` INTEGER NOT NULL, `isProxyExcluded` INTEGER NOT NULL, `tombstoneTs` INTEGER NOT NULL, `modifiedTs` INTEGER NOT NULL, `tempAllowEnabled` INTEGER NOT NULL, `tempAllowExpiryTime` INTEGER NOT NULL, PRIMARY KEY(`uid`, `packageName`))", + "fields": [ + { + "fieldPath": "packageName", + "columnName": "packageName", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "appName", + "columnName": "appName", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isSystemApp", + "columnName": "isSystemApp", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "firewallStatus", + "columnName": "firewallStatus", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "appCategory", + "columnName": "appCategory", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "wifiDataUsed", + "columnName": "wifiDataUsed", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "mobileDataUsed", + "columnName": "mobileDataUsed", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "connectionStatus", + "columnName": "connectionStatus", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "screenOffAllowed", + "columnName": "screenOffAllowed", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "backgroundAllowed", + "columnName": "backgroundAllowed", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "uploadBytes", + "columnName": "uploadBytes", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "downloadBytes", + "columnName": "downloadBytes", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isProxyExcluded", + "columnName": "isProxyExcluded", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "tombstoneTs", + "columnName": "tombstoneTs", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedTs", + "columnName": "modifiedTs", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "tempAllowEnabled", + "columnName": "tempAllowEnabled", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "tempAllowExpiryTime", + "columnName": "tempAllowExpiryTime", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "uid", + "packageName" + ] + } + }, + { + "tableName": "CustomIp", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER NOT NULL, `ipAddress` TEXT NOT NULL, `port` INTEGER NOT NULL, `protocol` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `proxyId` TEXT NOT NULL, `proxyCC` TEXT NOT NULL, `status` INTEGER NOT NULL, `wildcard` INTEGER NOT NULL, `ruleType` INTEGER NOT NULL, `modifiedDateTime` INTEGER NOT NULL, PRIMARY KEY(`uid`, `ipAddress`, `port`, `protocol`))", + "fields": [ + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "ipAddress", + "columnName": "ipAddress", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "port", + "columnName": "port", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "protocol", + "columnName": "protocol", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "isActive", + "columnName": "isActive", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "proxyId", + "columnName": "proxyId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "proxyCC", + "columnName": "proxyCC", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "status", + "columnName": "status", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "wildcard", + "columnName": "wildcard", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "ruleType", + "columnName": "ruleType", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedDateTime", + "columnName": "modifiedDateTime", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "uid", + "ipAddress", + "port", + "protocol" + ] + } + }, + { + "tableName": "DoHEndpoint", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `dohName` TEXT NOT NULL, `dohURL` TEXT NOT NULL, `dohExplanation` TEXT, `isSelected` INTEGER NOT NULL, `isCustom` INTEGER NOT NULL, `isSecure` INTEGER NOT NULL, `modifiedDataTime` INTEGER NOT NULL, `latency` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "dohName", + "columnName": "dohName", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "dohURL", + "columnName": "dohURL", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "dohExplanation", + "columnName": "dohExplanation", + "affinity": "TEXT" + }, + { + "fieldPath": "isSelected", + "columnName": "isSelected", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isCustom", + "columnName": "isCustom", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isSecure", + "columnName": "isSecure", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedDataTime", + "columnName": "modifiedDataTime", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "latency", + "columnName": "latency", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "DNSCryptEndpoint", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `dnsCryptName` TEXT NOT NULL, `dnsCryptURL` TEXT NOT NULL, `dnsCryptExplanation` TEXT, `isSelected` INTEGER NOT NULL, `isCustom` INTEGER NOT NULL, `modifiedDataTime` INTEGER NOT NULL, `latency` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "dnsCryptName", + "columnName": "dnsCryptName", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "dnsCryptURL", + "columnName": "dnsCryptURL", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "dnsCryptExplanation", + "columnName": "dnsCryptExplanation", + "affinity": "TEXT" + }, + { + "fieldPath": "isSelected", + "columnName": "isSelected", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isCustom", + "columnName": "isCustom", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedDataTime", + "columnName": "modifiedDataTime", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "latency", + "columnName": "latency", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "DNSProxyEndpoint", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `proxyName` TEXT NOT NULL, `proxyType` TEXT NOT NULL, `proxyAppName` TEXT, `proxyIP` TEXT, `proxyPort` INTEGER NOT NULL, `isSelected` INTEGER NOT NULL, `isCustom` INTEGER NOT NULL, `modifiedDataTime` INTEGER NOT NULL, `latency` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "proxyName", + "columnName": "proxyName", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "proxyType", + "columnName": "proxyType", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "proxyAppName", + "columnName": "proxyAppName", + "affinity": "TEXT" + }, + { + "fieldPath": "proxyIP", + "columnName": "proxyIP", + "affinity": "TEXT" + }, + { + "fieldPath": "proxyPort", + "columnName": "proxyPort", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isSelected", + "columnName": "isSelected", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isCustom", + "columnName": "isCustom", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedDataTime", + "columnName": "modifiedDataTime", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "latency", + "columnName": "latency", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "DNSCryptRelayEndpoint", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `dnsCryptRelayName` TEXT NOT NULL, `dnsCryptRelayURL` TEXT NOT NULL, `dnsCryptRelayExplanation` TEXT, `isSelected` INTEGER NOT NULL, `isCustom` INTEGER NOT NULL, `modifiedDataTime` INTEGER NOT NULL, `latency` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "dnsCryptRelayName", + "columnName": "dnsCryptRelayName", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "dnsCryptRelayURL", + "columnName": "dnsCryptRelayURL", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "dnsCryptRelayExplanation", + "columnName": "dnsCryptRelayExplanation", + "affinity": "TEXT" + }, + { + "fieldPath": "isSelected", + "columnName": "isSelected", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isCustom", + "columnName": "isCustom", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedDataTime", + "columnName": "modifiedDataTime", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "latency", + "columnName": "latency", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "ProxyEndpoint", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `proxyName` TEXT NOT NULL, `proxyMode` INTEGER NOT NULL, `proxyType` TEXT NOT NULL, `proxyAppName` TEXT, `proxyIP` TEXT, `proxyPort` INTEGER NOT NULL, `userName` TEXT, `password` TEXT, `isSelected` INTEGER NOT NULL, `isCustom` INTEGER NOT NULL, `isUDP` INTEGER NOT NULL, `modifiedDataTime` INTEGER NOT NULL, `latency` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "proxyName", + "columnName": "proxyName", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "proxyMode", + "columnName": "proxyMode", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "proxyType", + "columnName": "proxyType", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "proxyAppName", + "columnName": "proxyAppName", + "affinity": "TEXT" + }, + { + "fieldPath": "proxyIP", + "columnName": "proxyIP", + "affinity": "TEXT" + }, + { + "fieldPath": "proxyPort", + "columnName": "proxyPort", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "userName", + "columnName": "userName", + "affinity": "TEXT" + }, + { + "fieldPath": "password", + "columnName": "password", + "affinity": "TEXT" + }, + { + "fieldPath": "isSelected", + "columnName": "isSelected", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isCustom", + "columnName": "isCustom", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isUDP", + "columnName": "isUDP", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedDataTime", + "columnName": "modifiedDataTime", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "latency", + "columnName": "latency", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "CustomDomain", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`domain` TEXT NOT NULL, `uid` INTEGER NOT NULL, `ips` TEXT NOT NULL, `status` INTEGER NOT NULL, `type` INTEGER NOT NULL, `proxyId` TEXT NOT NULL, `proxyCC` TEXT NOT NULL, `modifiedTs` INTEGER NOT NULL, `deletedTs` INTEGER NOT NULL, `version` INTEGER NOT NULL, PRIMARY KEY(`domain`, `uid`))", + "fields": [ + { + "fieldPath": "domain", + "columnName": "domain", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "ips", + "columnName": "ips", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "status", + "columnName": "status", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "type", + "columnName": "type", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "proxyId", + "columnName": "proxyId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "proxyCC", + "columnName": "proxyCC", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "modifiedTs", + "columnName": "modifiedTs", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "deletedTs", + "columnName": "deletedTs", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "version", + "columnName": "version", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "domain", + "uid" + ] + } + }, + { + "tableName": "RethinkDnsEndpoint", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `url` TEXT NOT NULL, `uid` INTEGER NOT NULL, `desc` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `isCustom` INTEGER NOT NULL, `latency` INTEGER NOT NULL, `blocklistCount` INTEGER NOT NULL, `modifiedDataTime` INTEGER NOT NULL, PRIMARY KEY(`name`, `url`, `uid`))", + "fields": [ + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "url", + "columnName": "url", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "desc", + "columnName": "desc", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "isActive", + "columnName": "isActive", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isCustom", + "columnName": "isCustom", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "latency", + "columnName": "latency", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "blocklistCount", + "columnName": "blocklistCount", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedDataTime", + "columnName": "modifiedDataTime", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "name", + "url", + "uid" + ] + } + }, + { + "tableName": "RethinkRemoteFileTag", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`value` INTEGER NOT NULL, `uname` TEXT NOT NULL, `vname` TEXT NOT NULL, `group` TEXT NOT NULL, `subg` TEXT NOT NULL, `url` TEXT NOT NULL, `show` INTEGER NOT NULL, `entries` INTEGER NOT NULL, `pack` TEXT, `level` TEXT, `simpleTagId` INTEGER NOT NULL, `isSelected` INTEGER NOT NULL, PRIMARY KEY(`value`))", + "fields": [ + { + "fieldPath": "value", + "columnName": "value", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "uname", + "columnName": "uname", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "vname", + "columnName": "vname", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "group", + "columnName": "group", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "subg", + "columnName": "subg", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "url", + "columnName": "url", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "show", + "columnName": "show", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "entries", + "columnName": "entries", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "pack", + "columnName": "pack", + "affinity": "TEXT" + }, + { + "fieldPath": "level", + "columnName": "level", + "affinity": "TEXT" + }, + { + "fieldPath": "simpleTagId", + "columnName": "simpleTagId", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isSelected", + "columnName": "isSelected", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "value" + ] + } + }, + { + "tableName": "RethinkLocalFileTag", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`value` INTEGER NOT NULL, `uname` TEXT NOT NULL, `vname` TEXT NOT NULL, `group` TEXT NOT NULL, `subg` TEXT NOT NULL, `url` TEXT NOT NULL, `show` INTEGER NOT NULL, `entries` INTEGER NOT NULL, `pack` TEXT, `level` TEXT, `simpleTagId` INTEGER NOT NULL, `isSelected` INTEGER NOT NULL, PRIMARY KEY(`value`))", + "fields": [ + { + "fieldPath": "value", + "columnName": "value", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "uname", + "columnName": "uname", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "vname", + "columnName": "vname", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "group", + "columnName": "group", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "subg", + "columnName": "subg", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "url", + "columnName": "url", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "show", + "columnName": "show", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "entries", + "columnName": "entries", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "pack", + "columnName": "pack", + "affinity": "TEXT" + }, + { + "fieldPath": "level", + "columnName": "level", + "affinity": "TEXT" + }, + { + "fieldPath": "simpleTagId", + "columnName": "simpleTagId", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isSelected", + "columnName": "isSelected", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "value" + ] + } + }, + { + "tableName": "LocalBlocklistPacksMap", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`pack` TEXT NOT NULL, `level` INTEGER NOT NULL, `blocklistIds` TEXT NOT NULL, `group` TEXT NOT NULL, PRIMARY KEY(`pack`, `level`))", + "fields": [ + { + "fieldPath": "pack", + "columnName": "pack", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "level", + "columnName": "level", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "blocklistIds", + "columnName": "blocklistIds", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "group", + "columnName": "group", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "pack", + "level" + ] + } + }, + { + "tableName": "RemoteBlocklistPacksMap", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`pack` TEXT NOT NULL, `level` INTEGER NOT NULL, `blocklistIds` TEXT NOT NULL, `group` TEXT NOT NULL, PRIMARY KEY(`pack`, `level`))", + "fields": [ + { + "fieldPath": "pack", + "columnName": "pack", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "level", + "columnName": "level", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "blocklistIds", + "columnName": "blocklistIds", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "group", + "columnName": "group", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "pack", + "level" + ] + } + }, + { + "tableName": "WgConfigFiles", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `configPath` TEXT NOT NULL, `serverResponse` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `isCatchAll` INTEGER NOT NULL, `oneWireGuard` INTEGER NOT NULL, `useOnlyOnMetered` INTEGER NOT NULL, `isDeletable` INTEGER NOT NULL, `ssidEnabled` INTEGER NOT NULL, `ssids` TEXT NOT NULL, `modifiedTs` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "configPath", + "columnName": "configPath", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "serverResponse", + "columnName": "serverResponse", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "isActive", + "columnName": "isActive", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isCatchAll", + "columnName": "isCatchAll", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "oneWireGuard", + "columnName": "oneWireGuard", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "useOnlyOnMetered", + "columnName": "useOnlyOnMetered", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isDeletable", + "columnName": "isDeletable", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "ssidEnabled", + "columnName": "ssidEnabled", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "ssids", + "columnName": "ssids", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "modifiedTs", + "columnName": "modifiedTs", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "ProxyApplicationMapping", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER NOT NULL, `packageName` TEXT NOT NULL, `proxyId` TEXT NOT NULL, `appName` TEXT NOT NULL, `proxyName` TEXT NOT NULL, `isActive` INTEGER NOT NULL, PRIMARY KEY(`uid`, `packageName`, `proxyId`))", + "fields": [ + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "packageName", + "columnName": "packageName", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "proxyId", + "columnName": "proxyId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "appName", + "columnName": "appName", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "proxyName", + "columnName": "proxyName", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "isActive", + "columnName": "isActive", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "uid", + "packageName", + "proxyId" + ] + } + }, + { + "tableName": "TcpProxyEndpoint", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `token` TEXT NOT NULL, `url` TEXT NOT NULL, `paymentStatus` INTEGER NOT NULL, `isActive` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "token", + "columnName": "token", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "url", + "columnName": "url", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "paymentStatus", + "columnName": "paymentStatus", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isActive", + "columnName": "isActive", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "DoTEndpoint", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, `desc` TEXT, `isSelected` INTEGER NOT NULL, `isCustom` INTEGER NOT NULL, `isSecure` INTEGER NOT NULL, `modifiedDataTime` INTEGER NOT NULL, `latency` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "url", + "columnName": "url", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "desc", + "columnName": "desc", + "affinity": "TEXT" + }, + { + "fieldPath": "isSelected", + "columnName": "isSelected", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isCustom", + "columnName": "isCustom", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isSecure", + "columnName": "isSecure", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedDataTime", + "columnName": "modifiedDataTime", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "latency", + "columnName": "latency", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "ODoHEndpoint", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `proxy` TEXT NOT NULL, `resolver` TEXT NOT NULL, `proxyIps` TEXT NOT NULL, `desc` TEXT, `isSelected` INTEGER NOT NULL, `isCustom` INTEGER NOT NULL, `modifiedDataTime` INTEGER NOT NULL, `latency` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "proxy", + "columnName": "proxy", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "resolver", + "columnName": "resolver", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "proxyIps", + "columnName": "proxyIps", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "desc", + "columnName": "desc", + "affinity": "TEXT" + }, + { + "fieldPath": "isSelected", + "columnName": "isSelected", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isCustom", + "columnName": "isCustom", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedDataTime", + "columnName": "modifiedDataTime", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "latency", + "columnName": "latency", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "RpnProxy", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `configPath` TEXT NOT NULL, `serverResPath` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `isLockdown` INTEGER NOT NULL, `createdTs` INTEGER NOT NULL, `modifiedTs` INTEGER NOT NULL, `misc` TEXT NOT NULL, `tunId` TEXT NOT NULL, `latency` INTEGER NOT NULL, `lastRefreshTime` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "configPath", + "columnName": "configPath", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "serverResPath", + "columnName": "serverResPath", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "isActive", + "columnName": "isActive", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "isLockdown", + "columnName": "isLockdown", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "createdTs", + "columnName": "createdTs", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "modifiedTs", + "columnName": "modifiedTs", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "misc", + "columnName": "misc", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "tunId", + "columnName": "tunId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "latency", + "columnName": "latency", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastRefreshTime", + "columnName": "lastRefreshTime", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "WgHopMap", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `src` TEXT NOT NULL, `hop` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `status` TEXT NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "src", + "columnName": "src", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "hop", + "columnName": "hop", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "isActive", + "columnName": "isActive", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "status", + "columnName": "status", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "SubscriptionStatus", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountId` TEXT NOT NULL, `purchaseToken` TEXT NOT NULL, `productId` TEXT NOT NULL, `planId` TEXT NOT NULL, `sessionToken` TEXT NOT NULL, `productTitle` TEXT NOT NULL, `state` INTEGER NOT NULL, `purchaseTime` INTEGER NOT NULL, `accountExpiry` INTEGER NOT NULL, `billingExpiry` INTEGER NOT NULL, `developerPayload` TEXT NOT NULL, `status` INTEGER NOT NULL, `lastUpdatedTs` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "accountId", + "columnName": "accountId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "purchaseToken", + "columnName": "purchaseToken", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "productId", + "columnName": "productId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "planId", + "columnName": "planId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "sessionToken", + "columnName": "sessionToken", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "productTitle", + "columnName": "productTitle", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "state", + "columnName": "state", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "purchaseTime", + "columnName": "purchaseTime", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "accountExpiry", + "columnName": "accountExpiry", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "billingExpiry", + "columnName": "billingExpiry", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "developerPayload", + "columnName": "developerPayload", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "status", + "columnName": "status", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastUpdatedTs", + "columnName": "lastUpdatedTs", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + }, + { + "tableName": "SubscriptionStateHistory", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `subscriptionId` INTEGER NOT NULL, `fromState` INTEGER NOT NULL, `toState` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `reason` TEXT)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "subscriptionId", + "columnName": "subscriptionId", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "fromState", + "columnName": "fromState", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "toState", + "columnName": "toState", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "timestamp", + "columnName": "timestamp", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "reason", + "columnName": "reason", + "affinity": "TEXT" + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + } + } + ], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '3fb2e43e66aa3323303f11e5bc5ddb0d')" + ] + } +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/celzero/bravedns/ui/activity/AppInfoActivityTest.kt b/app/src/androidTest/java/com/celzero/bravedns/ui/activity/AppInfoActivityTest.kt index 101d5c659..02779367a 100644 --- a/app/src/androidTest/java/com/celzero/bravedns/ui/activity/AppInfoActivityTest.kt +++ b/app/src/androidTest/java/com/celzero/bravedns/ui/activity/AppInfoActivityTest.kt @@ -218,32 +218,6 @@ class AppInfoActivityTest { } } - @Test - fun testRecyclerViewsAreInitialized() { - Log.d(testTag, "Testing RecyclerView initialization") - val intent = createValidIntent() - - ActivityScenario.launch(intent).use { - try { - // Check that RecyclerViews are present (they should exist even if empty) - onView(withId(R.id.aad_active_conns_rv)) - .check(matches(isDisplayed())) - onView(withId(R.id.aad_asn_rv)) - .check(matches(isDisplayed())) - onView(withId(R.id.aad_most_contacted_domain_rv)) - .check(matches(isDisplayed())) - onView(withId(R.id.aad_most_contacted_ips_rv)) - .check(matches(isDisplayed())) - - Log.d(testTag, "RecyclerView initialization test completed") - - } catch (e: Exception) { - Log.e(testTag, "RecyclerView test failed", e) - // Log but don't fail - RecyclerViews might be conditionally visible - Log.w(testTag, "Some RecyclerViews may be conditionally visible") - } - } - } @Test fun testActivityHandlesConfigurationChanges() { @@ -633,43 +607,6 @@ class AppInfoActivityTest { } } - @Test - fun testScrollingPerformance() { - Log.d(testTag, "Testing scrolling performance") - val intent = createValidIntent() - - ActivityScenario.launch(intent).use { scenario -> - val scrollTime = measureTimeMillis { - try { - // Test scrolling on RecyclerViews if they exist - val recyclerViewIds = listOf( - R.id.aad_active_conns_rv, - R.id.aad_asn_rv, - R.id.aad_most_contacted_domain_rv, - R.id.aad_most_contacted_ips_rv - ) - - recyclerViewIds.forEach { id -> - try { - onView(withId(id)) - .check(matches(anyOf(isDisplayed(), not(isDisplayed())))) - .perform(swipeUp()) - } catch (e: Exception) { - Log.w(testTag, "ScrollView $id not available or scrollable: ${e.message}") - } - } - } catch (e: Exception) { - Log.w(testTag, "Scrolling test encountered issues: ${e.message}") - } - } - - Log.d(testTag, "Scrolling operations time: ${scrollTime}ms") - assertTrue( - "Scrolling should be responsive", - scrollTime < 2000L - ) - } - } @Test fun testInteractionResponseTimes() { diff --git a/app/src/androidTest/java/com/celzero/bravedns/ui/compose/HomeComponentsTest.kt b/app/src/androidTest/java/com/celzero/bravedns/ui/compose/HomeComponentsTest.kt new file mode 100644 index 000000000..dcacebb43 --- /dev/null +++ b/app/src/androidTest/java/com/celzero/bravedns/ui/compose/HomeComponentsTest.kt @@ -0,0 +1,127 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.home + +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.junit4.createComposeRule +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.celzero.bravedns.ui.compose.theme.RethinkTheme +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class HomeComponentsTest { + + @get:Rule + val composeTestRule = createComposeRule() + + @Test + fun startStopButton_displaysStart_whenNotPlaying() { + composeTestRule.setContent { + RethinkTheme { + StartStopButton( + isPlaying = false, + onClick = {} + ) + } + } + + composeTestRule.onNodeWithText("Start").assertIsDisplayed() + } + + @Test + fun startStopButton_displaysStop_whenPlaying() { + composeTestRule.setContent { + RethinkTheme { + StartStopButton( + isPlaying = true, + onClick = {} + ) + } + } + + composeTestRule.onNodeWithText("Stop").assertIsDisplayed() + } + + @Test + fun startStopButton_triggersOnClick() { + var clicked = false + composeTestRule.setContent { + RethinkTheme { + StartStopButton( + isPlaying = false, + onClick = { clicked = true } + ) + } + } + + composeTestRule.onNodeWithText("Start").performClick() + assert(clicked) + } + + @Test + fun dashboardCard_displaysTitleAndContent() { + composeTestRule.setContent { + RethinkTheme { + DashboardCard( + title = "Test Card", + iconId = android.R.drawable.ic_menu_info_details, + onClick = {} + ) { + androidx.compose.material3.Text("Test Content") + } + } + } + + composeTestRule.onNodeWithText("Test Card").assertIsDisplayed() + composeTestRule.onNodeWithText("Test Content").assertIsDisplayed() + } + + @Test + fun statItem_displaysValueAndLabel() { + composeTestRule.setContent { + RethinkTheme { + StatItem( + label = "Test Label", + value = "42" + ) + } + } + + composeTestRule.onNodeWithText("42").assertIsDisplayed() + composeTestRule.onNodeWithText("Test Label").assertIsDisplayed() + } + + @Test + fun statItem_appliesHighlightedColor() { + // This test verifies the composable renders without crashing + // when isHighlighted is true + composeTestRule.setContent { + RethinkTheme { + StatItem( + label = "Highlighted", + value = "100", + isHighlighted = true + ) + } + } + + composeTestRule.onNodeWithText("100").assertIsDisplayed() + } +} diff --git a/app/src/androidTest/java/com/celzero/bravedns/ui/compose/HomeScreenTest.kt b/app/src/androidTest/java/com/celzero/bravedns/ui/compose/HomeScreenTest.kt new file mode 100644 index 000000000..d03ae9eb6 --- /dev/null +++ b/app/src/androidTest/java/com/celzero/bravedns/ui/compose/HomeScreenTest.kt @@ -0,0 +1,206 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.home + +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.junit4.createComposeRule +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.celzero.bravedns.ui.compose.theme.RethinkTheme +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class HomeScreenTest { + + @get:Rule + val composeTestRule = createComposeRule() + + @Test + fun homeScreen_displaysCorrectInitialState() { + val uiState = HomeScreenUiState( + isVpnActive = false, + dnsLatency = "-- ms", + dnsConnectedName = "None", + firewallUniversalRules = 0, + appsTotal = 0, + appsAllowed = 0, + appsBlocked = 0 + ) + + composeTestRule.setContent { + RethinkTheme { + HomeScreen( + uiState = uiState, + onStartStopClick = {}, + onDnsClick = {}, + onFirewallClick = {}, + onProxyClick = {}, + onLogsClick = {}, + onAppsClick = {}, + onSponsorClick = {} + ) + } + } + + // Verify Start button is displayed when VPN is inactive + composeTestRule.onNodeWithText("Start").assertIsDisplayed() + } + + @Test + fun homeScreen_displaysStopButton_whenVpnIsActive() { + val uiState = HomeScreenUiState( + isVpnActive = true, + dnsLatency = "24ms", + dnsConnectedName = "Cloudflare", + firewallUniversalRules = 12, + appsTotal = 100, + appsAllowed = 95, + appsBlocked = 5 + ) + + composeTestRule.setContent { + RethinkTheme { + HomeScreen( + uiState = uiState, + onStartStopClick = {}, + onDnsClick = {}, + onFirewallClick = {}, + onProxyClick = {}, + onLogsClick = {}, + onAppsClick = {}, + onSponsorClick = {} + ) + } + } + + // Verify Stop button is displayed when VPN is active + composeTestRule.onNodeWithText("Stop").assertIsDisplayed() + } + + @Test + fun homeScreen_startStopButton_triggersCallback() { + var clickCount = 0 + val uiState = HomeScreenUiState(isVpnActive = false) + + composeTestRule.setContent { + RethinkTheme { + HomeScreen( + uiState = uiState, + onStartStopClick = { clickCount++ }, + onDnsClick = {}, + onFirewallClick = {}, + onProxyClick = {}, + onLogsClick = {}, + onAppsClick = {}, + onSponsorClick = {} + ) + } + } + + // Click the Start button + composeTestRule.onNodeWithText("Start").performClick() + + // Verify callback was triggered + assert(clickCount == 1) + } + + @Test + fun homeScreen_displaysDnsCard() { + val uiState = HomeScreenUiState( + dnsLatency = "45ms", + dnsConnectedName = "Google DNS" + ) + + composeTestRule.setContent { + RethinkTheme { + HomeScreen( + uiState = uiState, + onStartStopClick = {}, + onDnsClick = {}, + onFirewallClick = {}, + onProxyClick = {}, + onLogsClick = {}, + onAppsClick = {}, + onSponsorClick = {} + ) + } + } + + // Verify DNS latency is displayed + composeTestRule.onNodeWithText("45ms").assertIsDisplayed() + } + + @Test + fun homeScreen_displaysFirewallCard() { + val uiState = HomeScreenUiState( + firewallUniversalRules = 15, + firewallIpRules = 5, + firewallDomainRules = 3 + ) + + composeTestRule.setContent { + RethinkTheme { + HomeScreen( + uiState = uiState, + onStartStopClick = {}, + onDnsClick = {}, + onFirewallClick = {}, + onProxyClick = {}, + onLogsClick = {}, + onAppsClick = {}, + onSponsorClick = {} + ) + } + } + + // Verify firewall rules count is displayed + composeTestRule.onNodeWithText("15").assertIsDisplayed() + } + + @Test + fun homeScreen_displaysAppsCard() { + val uiState = HomeScreenUiState( + appsTotal = 120, + appsAllowed = 100, + appsBlocked = 15, + appsBypassed = 3, + appsIsolated = 2, + appsExcluded = 0 + ) + + composeTestRule.setContent { + RethinkTheme { + HomeScreen( + uiState = uiState, + onStartStopClick = {}, + onDnsClick = {}, + onFirewallClick = {}, + onProxyClick = {}, + onLogsClick = {}, + onAppsClick = {}, + onSponsorClick = {} + ) + } + } + + // Verify apps count is displayed + composeTestRule.onNodeWithText("100").assertIsDisplayed() + composeTestRule.onNodeWithText("120").assertIsDisplayed() + } +} diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml index 49ba11ee9..d54fe449d 100644 --- a/app/src/full/AndroidManifest.xml +++ b/app/src/full/AndroidManifest.xml @@ -11,31 +11,10 @@ android:name="android.webkit.WebView.MetricsOptOut" android:value="true" /> - + - - - - - - - - - - - - - - - - + android:targetActivity=".ui.HomeScreenActivity"> @@ -63,130 +42,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + - - - - - - --> + - + android:launchMode="standard" /> + - + \ No newline at end of file diff --git a/app/src/full/java/com/celzero/bravedns/NonStoreAppUpdater.kt b/app/src/full/java/com/celzero/bravedns/NonStoreAppUpdater.kt index 32a723aa9..3c9ea0603 100644 --- a/app/src/full/java/com/celzero/bravedns/NonStoreAppUpdater.kt +++ b/app/src/full/java/com/celzero/bravedns/NonStoreAppUpdater.kt @@ -65,15 +65,8 @@ class NonStoreAppUpdater( override fun onResponse(call: Call, response: Response) { try { - val res = response.body?.string() - if (res == null) { - listener.onUpdateCheckFailed( - AppUpdater.InstallSource.OTHER, - isInteractive - ) - return - } - if (res.isBlank() == true) { + val res = response.body.string() + if (res.isBlank()) { listener.onUpdateCheckFailed( AppUpdater.InstallSource.OTHER, isInteractive diff --git a/app/src/full/java/com/celzero/bravedns/RethinkDnsApplication.kt b/app/src/full/java/com/celzero/bravedns/RethinkDnsApplication.kt index 4c8d60233..8598f1a5d 100644 --- a/app/src/full/java/com/celzero/bravedns/RethinkDnsApplication.kt +++ b/app/src/full/java/com/celzero/bravedns/RethinkDnsApplication.kt @@ -20,14 +20,13 @@ import Logger.LOG_TAG_SCHEDULER import android.app.Application import android.content.pm.ApplicationInfo import android.os.StrictMode -import com.celzero.bravedns.scheduler.EnhancedBugReport import com.celzero.bravedns.scheduler.ScheduleManager import com.celzero.bravedns.scheduler.WorkScheduler import com.celzero.bravedns.util.FirebaseErrorReporting import com.celzero.bravedns.util.GlobalExceptionHandler -import com.celzero.bravedns.util.GoReportingHandler +import io.github.aakira.napier.DebugAntilog +import io.github.aakira.napier.Napier import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch import org.koin.android.ext.android.get @@ -52,22 +51,17 @@ class RethinkDnsApplication : Application() { koin.loadModules(AppModules) } - val appScope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + if (DEBUG) { + Napier.base(DebugAntilog()) + } // Initialize global exception handler GlobalExceptionHandler.initialize(this) FirebaseErrorReporting.initialize() - GoReportingHandler.initialize(appScope, this) - - // On every app start, report any tombstone files from the previous session - val appCtx = this - appScope.launch(Dispatchers.IO) { - EnhancedBugReport.reportTombstonesToFirebaseOnStartup(appCtx) - } turnOnStrictMode() - appScope.launch { + CoroutineScope(SupervisorJob()).launch { scheduleJobs() } } @@ -75,7 +69,7 @@ class RethinkDnsApplication : Application() { private suspend fun scheduleJobs() { Logger.d(LOG_TAG_SCHEDULER, "Schedule job") get().scheduleAppExitInfoCollectionJob() - // database refresh to keep app data up to date + // database refresh is used in both headless and main project get().scheduleDatabaseRefreshJob() get().scheduleDataUsageJob() get().schedulePurgeConnectionsLog() diff --git a/app/src/full/java/com/celzero/bravedns/adapter/AppWiseDomainsAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/AppWiseDomainsAdapter.kt index 7da153b47..c5e8a8e09 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/AppWiseDomainsAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/AppWiseDomainsAdapter.kt @@ -15,286 +15,149 @@ */ package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_UI + import android.content.Context -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity +import androidx.compose.foundation.clickable +import androidx.compose.ui.platform.LocalContext +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateOf +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp import androidx.lifecycle.LifecycleOwner -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView import com.celzero.bravedns.R import com.celzero.bravedns.data.AppConnection -import com.celzero.bravedns.databinding.ListItemAppDomainDetailsBinding import com.celzero.bravedns.service.DomainRulesManager import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.ui.bottomsheet.AppDomainRulesBottomSheet +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog import com.celzero.bravedns.util.UIUtils -import com.celzero.bravedns.util.Utilities import com.celzero.bravedns.util.Utilities.removeBeginningTrailingCommas import com.celzero.bravedns.util.Utilities.showToastUiCentered -import com.google.android.material.dialog.MaterialAlertDialogBuilder +import io.github.aakira.napier.Napier import kotlin.math.log2 -class AppWiseDomainsAdapter( - val context: Context, - val lifecycleOwner: LifecycleOwner, - val uid: Int, - val isActiveConn: Boolean = false -) : - PagingDataAdapter( - DIFF_CALLBACK - ), - AppDomainRulesBottomSheet.OnBottomSheetDialogFragmentDismiss { - - private var maxValue: Int = 0 - private var minPercentage: Int = INITIAL_MIN_PERCENTAGE - - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - - override fun areItemsTheSame( - oldConnection: AppConnection, - newConnection: AppConnection - ) = oldConnection == newConnection - - override fun areContentsTheSame( - oldConnection: AppConnection, - newConnection: AppConnection - ) = oldConnection == newConnection - } - - private const val TAG = "AppWiseDomainsAdapter" - private const val INITIAL_MIN_PERCENTAGE = 100 - private const val PERCENTAGE_MULTIPLIER = 100 - } - - private lateinit var adapter: AppWiseDomainsAdapter - - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int - ): ConnectionDetailsViewHolder { - val itemBinding = - ListItemAppDomainDetailsBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - adapter = this - return ConnectionDetailsViewHolder(itemBinding) - } - - override fun onBindViewHolder( - holder: ConnectionDetailsViewHolder, - position: Int - ) { - val appConnection: AppConnection = getItem(position) ?: return - // updates the app-wise connections from network log to AppInfo screen - holder.update(appConnection) - } - private fun calculatePercentage(c: Double): Int { - val value = (log2(c) * PERCENTAGE_MULTIPLIER).toInt() - // maxValue will be based on the count returned by db query (order by count desc) - if (value > maxValue) { - maxValue = value - } - return if (maxValue == 0) { - 0 +@Composable +fun DomainRow( + conn: AppConnection, + uid: Int, + isActiveConn: Boolean, + refreshToken: Int, + onIpClick: (AppConnection) -> Unit +) { + val countText = conn.count.toString() + val (primaryText, secondaryText) = + if (isActiveConn) { + val ip = beautifyIpString(conn.ipAddress) + val name = conn.appOrDnsName.orEmpty() + ip to name } else { - val percentage = (value * PERCENTAGE_MULTIPLIER / maxValue) - // minPercentage is used to show the progress bar when the percentage is 0 - if (percentage < minPercentage && percentage != 0) { - minPercentage = percentage - } - percentage - } - } - - inner class ConnectionDetailsViewHolder(private val b: ListItemAppDomainDetailsBinding) : - RecyclerView.ViewHolder(b.root) { - fun update(conn: AppConnection) { - displayTransactionDetails(conn) - setupClickListeners(conn) + conn.appOrDnsName to conn.ipAddress } - private fun displayTransactionDetails(conn: AppConnection) { - // handle active connections specially, no need to show progress bar, - // asn info will be added in the appOrDnsName field - if (isActiveConn) { - b.progress.visibility = View.GONE - b.acdCount.text = conn.count.toString() - b.acdDomain.text = beautifyIpString(conn.ipAddress) - if (conn.appOrDnsName.isNullOrEmpty()) { - b.acdIpAddress.text = "" - } else { - b.acdIpAddress.text = conn.appOrDnsName + Column( + modifier = + Modifier + .fillMaxWidth() + .clickable { onIpClick(conn) } + .padding(horizontal = 8.dp, vertical = 6.dp), + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(text = conn.flag, style = MaterialTheme.typography.titleMedium) + Column(modifier = Modifier.weight(1f)) { + Text(text = primaryText.orEmpty(), style = MaterialTheme.typography.titleMedium) + if (!secondaryText.isNullOrEmpty()) { + Text(text = secondaryText, style = MaterialTheme.typography.bodySmall) } - b.acdFlag.visibility = View.VISIBLE - b.acdFlag.text = conn.flag - return - } - - b.acdCount.text = conn.count.toString() - b.acdDomain.text = conn.appOrDnsName - b.acdFlag.text = conn.flag - if (conn.ipAddress.isNotEmpty()) { - b.acdIpAddress.visibility = View.VISIBLE - b.acdIpAddress.text = beautifyIpString(conn.ipAddress) - } else { - b.acdIpAddress.visibility = View.GONE - } - updateStatusUi(conn) - } - - private fun setupClickListeners(conn: AppConnection) { - b.acdContainer.setOnClickListener { - if (isActiveConn) { - showCloseConnectionDialog(conn) - return@setOnClickListener + if (!isActiveConn && !conn.appOrDnsName.isNullOrEmpty()) { + DomainProgress(conn, uid, refreshToken) } - // open bottom sheet to apply domain/ip rules - openBottomSheet(conn) - } - } - - private fun showCloseConnectionDialog(appConn: AppConnection) { - if (context !is AppCompatActivity) { - Logger.w(LOG_TAG_UI, "$TAG err showing close connection dialog") - return } - - /*if (isRethink) { - Logger.i(LOG_TAG_UI, "$TAG rethink connection - no close connection dialog") - return - }*/ - Logger.v(LOG_TAG_UI, "$TAG show close connection dialog for uid: $uid") - val dialog = MaterialAlertDialogBuilder(context, R.style.App_Dialog_NoDim) - .setTitle(context.getString(R.string.close_conns_dialog_title)) - .setMessage(context.getString(R.string.close_conns_dialog_desc, appConn.ipAddress)) - .setPositiveButton(R.string.lbl_proceed) { _, _ -> - // close the connection - VpnController.closeConnectionsByUidDomain(appConn.uid, appConn.ipAddress, "app-wise-domains-manual-close") - Logger.i( - LOG_TAG_UI, - "$TAG closed connection for uid: ${appConn.uid}, domain: ${appConn.appOrDnsName}" - ) - showToastUiCentered( - context, - context.getString(R.string.config_add_success_toast), - Toast.LENGTH_LONG - ) - } - .setNegativeButton(R.string.lbl_cancel, null) - .create() - dialog.setCancelable(true) - dialog.setCanceledOnTouchOutside(true) - dialog.show() - } - - private fun openBottomSheet(appConn: AppConnection) { - if (context !is AppCompatActivity) { - Logger.w(LOG_TAG_UI, "$TAG err opening the app conn bottom sheet") - return - } - - /*if (isRethink) { - Logger.i(LOG_TAG_UI, "$TAG rethink connection - no bottom sheet") - return - }*/ - - if (isActiveConn) { - Logger.i(LOG_TAG_UI, "$TAG active connection - no bottom sheet") - return - } - - Logger.v(LOG_TAG_UI, "$TAG open bottom sheet for uid: $uid, ip: ${appConn.ipAddress}, domain: ${appConn.appOrDnsName}") - val bottomSheetFragment = AppDomainRulesBottomSheet() - // Fix: free-form window crash - // all BottomSheetDialogFragment classes created must have a public, no-arg constructor. - // the best practice is to simply never define any constructors at all. - // so sending the data using Bundles - val bundle = Bundle() - bundle.putInt(AppDomainRulesBottomSheet.UID, uid) - bundle.putString(AppDomainRulesBottomSheet.DOMAIN, appConn.appOrDnsName) - bottomSheetFragment.arguments = bundle - // Fix: Validate position before passing to avoid IndexOutOfBoundsException - val currentPosition = absoluteAdapterPosition - if (currentPosition != RecyclerView.NO_POSITION) { - bottomSheetFragment.dismissListener(adapter, currentPosition) - } else { - // Position is invalid, pass -1 to indicate refresh should be used - Logger.w(LOG_TAG_UI, "$TAG invalid adapter position when opening bottom sheet") - bottomSheetFragment.dismissListener(adapter, RecyclerView.NO_POSITION) - } - bottomSheetFragment.show(context.supportFragmentManager, bottomSheetFragment.tag) - } - - private fun beautifyIpString(d: String): String { - // replace two commas in the string to one - // add space after all the commas - return removeBeginningTrailingCommas(d).replace(",,", ",").replace(",", ", ") + Text( + text = countText, + style = MaterialTheme.typography.labelLarge + ) } + Spacer(modifier = Modifier.fillMaxWidth()) + } +} - private fun updateStatusUi(conn: AppConnection) { - if (conn.appOrDnsName.isNullOrEmpty()) { - b.progress.visibility = View.GONE - return - } - val status = DomainRulesManager.status(conn.appOrDnsName, uid) - Logger.vv(LOG_TAG_UI, "$TAG domain: ${conn.appOrDnsName}, status: $status") - when (status) { - DomainRulesManager.Status.NONE -> { - b.progress.setIndicatorColor( - UIUtils.fetchToggleBtnColors(context, R.color.chipTextNeutral) - ) - } - DomainRulesManager.Status.BLOCK -> { - b.progress.setIndicatorColor( - UIUtils.fetchToggleBtnColors(context, R.color.accentBad) - ) - } - DomainRulesManager.Status.TRUST -> { - b.progress.setIndicatorColor( - UIUtils.fetchToggleBtnColors(context, R.color.accentGood) - ) - } - } - - var p = calculatePercentage(conn.count.toDouble()) - if (p == 0) { - p = minPercentage / 2 - } +@Composable +fun CloseConnsDialog( + conn: AppConnection, + onConfirm: () -> Unit, + onDismiss: () -> Unit +) { + val context = LocalContext.current + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = context.getString(R.string.close_conns_dialog_title), + message = context.getString(R.string.close_conns_dialog_desc, conn.ipAddress), + confirmText = context.getString(R.string.lbl_proceed), + dismissText = context.getString(R.string.lbl_cancel), + onConfirm = { + VpnController.closeConnectionsByUidDomain( + conn.uid, + conn.ipAddress, + "app-wise-domains-manual-close" + ) + showToastUiCentered( + context, + context.getString(R.string.config_add_success_toast), + Toast.LENGTH_LONG + ) + onConfirm() + }, + onDismiss = onDismiss + ) +} - if (Utilities.isAtleastN()) { - b.progress.setProgress(p, true) - } else { - b.progress.progress = p - } - } +@Composable +private fun DomainProgress(conn: AppConnection, uid: Int, refresh: Int) { + val context = LocalContext.current + if (refresh == Int.MIN_VALUE) { + return } - - override fun notifyDataset(position: Int) { - // Fix: IndexOutOfBoundsException - validate position before notifying - try { - if (position in 0.. + MaterialTheme.colorScheme.onSurfaceVariant + DomainRulesManager.Status.BLOCK -> + MaterialTheme.colorScheme.error + DomainRulesManager.Status.TRUST -> + MaterialTheme.colorScheme.tertiary + } // In many Compose use cases, 100 or 1.0f is used directly. // For now, let's keep it simple or implement a similar logic if required. + var p = calculatePercentage(conn.count.toDouble()) + if (p == 0) { + p = 5 } + LinearProgressIndicator( + progress = { p / 100f }, + color = color, + trackColor = MaterialTheme.colorScheme.surface, + modifier = Modifier.fillMaxWidth() + ) +} + +private fun calculatePercentage(c: Double): Int { + // If not available, it becomes a per-item progress which is less useful. + // For now, let's use a reasonable default or assume max is handled elsewhere. + val value = (log2(c) * 100).toInt() // In a LazyList, computing global max is expensive or requires a separate pass. + return (value % 100) // Fallback +} + +private fun beautifyIpString(d: String): String { + return removeBeginningTrailingCommas(d).replace(",,", ",").replace(",", ", ") } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/AppWiseIpsAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/AppWiseIpsAdapter.kt index 7fa5881ed..d4e250ad5 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/AppWiseIpsAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/AppWiseIpsAdapter.kt @@ -15,216 +15,120 @@ */ package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_UI + import android.content.Context -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.appcompat.app.AppCompatActivity +import androidx.compose.foundation.clickable +import androidx.compose.ui.platform.LocalContext +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateOf +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp import androidx.lifecycle.LifecycleOwner -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView import com.celzero.bravedns.R import com.celzero.bravedns.data.AppConnection -import com.celzero.bravedns.databinding.ListItemAppIpDetailsBinding import com.celzero.bravedns.service.IpRulesManager -import com.celzero.bravedns.ui.bottomsheet.AppIpRulesBottomSheet import com.celzero.bravedns.util.UIUtils import com.celzero.bravedns.util.Utilities import com.celzero.bravedns.util.Utilities.removeBeginningTrailingCommas +import io.github.aakira.napier.Napier import kotlin.math.log2 -class AppWiseIpsAdapter(val context: Context, val lifecycleOwner: LifecycleOwner, val uid: Int, val isAsn: Boolean = false) : - PagingDataAdapter(DIFF_CALLBACK), - AppIpRulesBottomSheet.OnBottomSheetDialogFragmentDismiss { - - private var maxValue: Int = 0 - private var minPercentage: Int = INITIAL_MIN_PERCENTAGE - - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(old: AppConnection, new: AppConnection) = old == new - override fun areContentsTheSame(old: AppConnection, new: AppConnection) = old == new - } - private const val TAG = "AppWiseIpsAdapter" - private const val INITIAL_MIN_PERCENTAGE = 100 - private const val PERCENTAGE_MULTIPLIER = 100 - } - - private lateinit var adapter: AppWiseIpsAdapter - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ConnectionDetailsViewHolder { - val itemBinding = - ListItemAppIpDetailsBinding.inflate(LayoutInflater.from(parent.context), parent, false) - adapter = this - return ConnectionDetailsViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: ConnectionDetailsViewHolder, position: Int) { - val appConnection: AppConnection = getItem(position) ?: return - // updates the app-wise connections from network log to AppInfo screen - holder.update(appConnection) +private fun calculatePercentage(c: Double, maxValue: Int): Pair { + val value = (log2(c) * 100).toInt() + val newMaxValue = if (value > maxValue) value else maxValue + return if (newMaxValue == 0) { + 0 to 0 + } else { + val percentage = (value * 100 / newMaxValue) + percentage to newMaxValue } +} - private fun calculatePercentage(c: Double): Int { - val value = (log2(c) * PERCENTAGE_MULTIPLIER).toInt() - // maxValue will be based on the count returned by db query (order by count desc) - if (value > maxValue) { - maxValue = value - } - return if (maxValue == 0) { - 0 +@Composable +fun IpRow( + conn: AppConnection, + isAsn: Boolean, + refreshToken: Int, + onIpClick: (AppConnection) -> Unit +) { + val countText = conn.count.toString() + val flagText = + if (isAsn) { + val cc = Utilities.getFlag(conn.flag) + if (cc.isEmpty()) "--" else cc } else { - val percentage = (value * PERCENTAGE_MULTIPLIER / maxValue) - // minPercentage is used to show the progress bar when the percentage is 0 - if (percentage < minPercentage && percentage != 0) { - minPercentage = percentage - } - percentage - } - } - - inner class ConnectionDetailsViewHolder(private val b: ListItemAppIpDetailsBinding) : - RecyclerView.ViewHolder(b.root) { - fun update(conn: AppConnection) { - displayTransactionDetails(conn) - setupClickListeners(conn) - } - - private fun setupClickListeners(conn: AppConnection) { - b.acdContainer.setOnClickListener { - // open bottom sheet to apply domain/ip rules - openBottomSheet(conn) - } - } - - private fun openBottomSheet(conn: AppConnection) { - if (context !is AppCompatActivity) { - Logger.w(LOG_TAG_UI, "$TAG err opening the app conn bottom sheet") - return - } - - if (isAsn) { - return - } - - Logger.vv(LOG_TAG_UI, "$TAG open bottom sheet for uid: $uid, ip: ${conn.ipAddress}, domain: ${conn.appOrDnsName}") - val bottomSheetFragment = AppIpRulesBottomSheet() - // Fix: free-form window crash - // all BottomSheetDialogFragment classes created must have a public, no-arg constructor. - // the best practice is to simply never define any constructors at all. - // so sending the data using Bundles - val bundle = Bundle() - bundle.putInt(AppIpRulesBottomSheet.UID, uid) - bundle.putString(AppIpRulesBottomSheet.IP_ADDRESS, conn.ipAddress) - bundle.putString( - AppIpRulesBottomSheet.DOMAINS, - beautifyDomainString(conn.appOrDnsName.orEmpty()) - ) - bottomSheetFragment.arguments = bundle - // Fix: Validate position before passing to avoid IndexOutOfBoundsException - val currentPosition = absoluteAdapterPosition - if (currentPosition != RecyclerView.NO_POSITION) { - bottomSheetFragment.dismissListener(adapter, currentPosition) - } else { - // Position is invalid, pass -1 to indicate refresh should be used - Logger.w(LOG_TAG_UI, "$TAG invalid adapter position when opening bottom sheet") - bottomSheetFragment.dismissListener(adapter, RecyclerView.NO_POSITION) - } - bottomSheetFragment.show(context.supportFragmentManager, bottomSheetFragment.tag) + conn.flag } - - private fun displayTransactionDetails(conn: AppConnection) { - b.acdCount.text = conn.count.toString() - if (isAsn) { - b.acdIpAddress.text = conn.appOrDnsName - b.acdDomainName.text = conn.ipAddress - // in case of ASN, flag consists of country code, extract flag from it - val cc = Utilities.getFlag(conn.flag) - if (cc.isEmpty()) { - b.acdFlag.text = "--" - } else { - b.acdFlag.text = cc - } - b.acdDownArrowIv.visibility = View.INVISIBLE - } else { - b.acdFlag.text = conn.flag - b.acdIpAddress.text = conn.ipAddress - if (!conn.appOrDnsName.isNullOrEmpty()) { - b.acdDomainName.visibility = View.VISIBLE - b.acdDomainName.text = beautifyDomainString(conn.appOrDnsName) - } else { - b.acdDomainName.visibility = View.GONE - } - b.acdDownArrowIv.visibility = View.VISIBLE - } - updateStatusUi(conn) - } - - private fun beautifyDomainString(d: String): String { - // replace two commas in the string to one - // add space after all the commas - return removeBeginningTrailingCommas(d).replace(",,", ",").replace(",", ", ") - } - - private fun updateStatusUi(conn: AppConnection) { - val status = IpRulesManager.getMostSpecificRuleMatch(conn.uid, conn.ipAddress) - when (status) { - IpRulesManager.IpRuleStatus.NONE -> { - b.progress.setIndicatorColor( - UIUtils.fetchToggleBtnColors(context, R.color.chipTextNeutral) - ) + val titleText = if (isAsn) conn.appOrDnsName else conn.ipAddress + val secondaryText = + if (isAsn) conn.ipAddress else conn.appOrDnsName?.let { beautifyDomainString(it) } + + Column( + modifier = + Modifier + .fillMaxWidth() + .clickable { onIpClick(conn) } + .padding(horizontal = 8.dp, vertical = 6.dp), + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(text = flagText, style = MaterialTheme.typography.titleMedium) + Column(modifier = Modifier.weight(1f)) { + Text(text = titleText.orEmpty(), style = MaterialTheme.typography.titleMedium) + if (!secondaryText.isNullOrEmpty()) { + Text(text = secondaryText, style = MaterialTheme.typography.bodySmall) } - IpRulesManager.IpRuleStatus.BLOCK -> { - b.progress.setIndicatorColor( - UIUtils.fetchToggleBtnColors(context, R.color.accentBad) - ) + if (!isAsn) { + IpProgress(conn, refreshToken) } - IpRulesManager.IpRuleStatus.BYPASS_UNIVERSAL -> { - b.progress.setIndicatorColor( - UIUtils.fetchToggleBtnColors(context, R.color.accentGood) - ) - } - IpRulesManager.IpRuleStatus.TRUST -> { - b.progress.setIndicatorColor( - UIUtils.fetchToggleBtnColors(context, R.color.accentGood) - ) - } - } - - var p = calculatePercentage(conn.count.toDouble()) - if (p == 0) { - p = minPercentage / 2 - } - - if (Utilities.isAtleastN()) { - b.progress.setProgress(p, true) - } else { - b.progress.progress = p } + Text(text = countText, style = MaterialTheme.typography.labelLarge) } + Spacer(modifier = Modifier.fillMaxWidth()) } +} - override fun notifyDataset(position: Int) { - // Fix: IndexOutOfBoundsException - validate position before notifying - // PagingDataAdapter manages its own data, so we need to be careful with manual notifications - try { - if (position >= 0 && position < itemCount) { - notifyItemChanged(position) - } else { - // Position is invalid, refresh the entire dataset instead - Logger.w(LOG_TAG_UI, "$TAG invalid position: $position, itemCount: $itemCount, refreshing adapter") - refresh() - } - } catch (e: Exception) { - // If notification fails, refresh the adapter to ensure consistency - Logger.e(LOG_TAG_UI, "$TAG error notifying position $position: ${e.message}", e) - refresh() - } +@Composable +private fun IpProgress(conn: AppConnection, refresh: Int) { + if (refresh == Int.MIN_VALUE) { + return } + val context = LocalContext.current + val status = IpRulesManager.getMostSpecificRuleMatch(conn.uid, conn.ipAddress) + val color = + when (status) { + IpRulesManager.IpRuleStatus.NONE -> + MaterialTheme.colorScheme.onSurfaceVariant + IpRulesManager.IpRuleStatus.BLOCK -> + MaterialTheme.colorScheme.error + IpRulesManager.IpRuleStatus.BYPASS_UNIVERSAL -> + MaterialTheme.colorScheme.tertiary + IpRulesManager.IpRuleStatus.TRUST -> + MaterialTheme.colorScheme.tertiary + } // In a paging/lazy list, this is hard to maintain without a global state. + // For now, using a local calculation or simplified version. + val p = (log2(conn.count.toDouble()) * 100).toInt() + val progress = if (p <= 0) 0.1f else (p / 500f).coerceAtMost(1f) + + LinearProgressIndicator( + progress = { progress }, + color = color, + trackColor = MaterialTheme.colorScheme.surface, + modifier = Modifier.fillMaxWidth() + ) +} + +private fun beautifyDomainString(d: String): String { + return removeBeginningTrailingCommas(d).replace(",,", ",").replace(",", ", ") } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/BlocklistRowShared.kt b/app/src/full/java/com/celzero/bravedns/adapter/BlocklistRowShared.kt new file mode 100644 index 000000000..d314f427b --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/adapter/BlocklistRowShared.kt @@ -0,0 +1,245 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.adapter + +import android.content.Context +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.AssistChip +import androidx.compose.material3.AssistChipDefaults +import androidx.compose.material3.Checkbox +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.service.RethinkBlocklistManager + +@Composable +internal fun BlocklistSimpleRow( + group: String, + pack: String, + blocklistCount: Int, + isSelected: Boolean, + showHeader: Boolean, + onToggle: (Boolean) -> Unit +) { + val context = LocalContext.current + + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + if (showHeader) { + BlocklistHeader(group = group) + } + + Surface( + modifier = + Modifier + .fillMaxWidth() + .clickable { onToggle(!isSelected) }, + shape = RoundedCornerShape(18.dp), + color = + if (isSelected) { + MaterialTheme.colorScheme.secondaryContainer + } else { + MaterialTheme.colorScheme.surfaceContainerLow + } + ) { + Row( + modifier = Modifier.padding(horizontal = 13.dp, vertical = 10.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = pack.replaceFirstChar(Char::titlecase), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold + ) + Text( + text = + context.getString( + R.string.rsv_blocklist_count_text, + blocklistCount.toString() + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + Spacer(modifier = Modifier.width(8.dp)) + Checkbox(checked = isSelected, onCheckedChange = onToggle) + } + } + } +} + +@Composable +internal fun BlocklistAdvancedRow( + group: String, + subGroup: String, + name: String, + entries: Int, + level: Int?, + entryUrl: String?, + isSelected: Boolean, + showHeader: Boolean, + onToggle: (Boolean) -> Unit, + onEntryClick: (String) -> Unit +) { + val context = LocalContext.current + val groupText = if (subGroup.isEmpty()) group else subGroup + val entryText = context.getString(R.string.dc_entries, entries.toString()) + val (chipText, chipBg) = chipColorsForLevel(level) + + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + if (showHeader) { + BlocklistHeader(group = group) + } + + Surface( + modifier = + Modifier + .fillMaxWidth() + .clickable { onToggle(!isSelected) }, + shape = RoundedCornerShape(18.dp), + color = + if (isSelected) { + MaterialTheme.colorScheme.secondaryContainer + } else { + MaterialTheme.colorScheme.surfaceContainerLow + } + ) { + Row( + modifier = Modifier.padding(horizontal = 13.dp, vertical = 10.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = name, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold + ) + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + text = groupText, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(end = 6.dp) + ) + AssistChip( + onClick = { entryUrl?.let(onEntryClick) ?: Unit }, + enabled = !entryUrl.isNullOrEmpty(), + label = { Text(text = entryText) }, + colors = + AssistChipDefaults.assistChipColors( + containerColor = chipBg, + labelColor = chipText + ) + ) + } + } + Spacer(modifier = Modifier.width(8.dp)) + Checkbox(checked = isSelected, onCheckedChange = onToggle) + } + } + } +} + +@Composable +private fun BlocklistHeader(group: String) { + val context = LocalContext.current + + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(start = 2.dp, bottom = 2.dp), + horizontalAlignment = Alignment.Start + ) { + Text( + text = RethinkBlocklistManager.getGroupName(context, group), + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.primary + ) + Text( + text = RethinkBlocklistManager.getTitleDesc(context, group), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } +} + +@Composable +private fun chipColorsForLevel(level: Int?): Pair { + if (level == null) { + val text = MaterialTheme.colorScheme.onSurface + val bg = MaterialTheme.colorScheme.surface + return text to bg + } + + return when (level) { + 0 -> MaterialTheme.colorScheme.tertiary to MaterialTheme.colorScheme.tertiaryContainer + 1 -> MaterialTheme.colorScheme.onSurfaceVariant to MaterialTheme.colorScheme.surfaceVariant + 2 -> MaterialTheme.colorScheme.error to MaterialTheme.colorScheme.errorContainer + else -> MaterialTheme.colorScheme.onSurface to MaterialTheme.colorScheme.surface + } +} + +internal fun RethinkBlocklistManager.getGroupName(context: Context, group: String): String { + if (group.equals(RethinkBlocklistManager.PARENTAL_CONTROL.name, true)) { + return context.getString(RethinkBlocklistManager.PARENTAL_CONTROL.label) + } + if (group.equals(RethinkBlocklistManager.SECURITY.name, true)) { + return context.getString(RethinkBlocklistManager.SECURITY.label) + } + if (group.equals(RethinkBlocklistManager.PRIVACY.name, true)) { + return context.getString(RethinkBlocklistManager.PRIVACY.label) + } + return group +} + +internal fun RethinkBlocklistManager.getTitleDesc(context: Context, group: String): String { + if (group.equals(RethinkBlocklistManager.PARENTAL_CONTROL.name, true)) { + return context.getString(RethinkBlocklistManager.PARENTAL_CONTROL.desc) + } + if (group.equals(RethinkBlocklistManager.SECURITY.name, true)) { + return context.getString(RethinkBlocklistManager.SECURITY.desc) + } + if (group.equals(RethinkBlocklistManager.PRIVACY.name, true)) { + return context.getString(RethinkBlocklistManager.PRIVACY.desc) + } + return "" +} diff --git a/app/src/full/java/com/celzero/bravedns/adapter/ConnectionTrackerAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/ConnectionTrackerAdapter.kt index 9844f6c0b..053318c16 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/ConnectionTrackerAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/ConnectionTrackerAdapter.kt @@ -14,449 +14,724 @@ See the License for the specific language governing permissions and limitations under the License. */ +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) + package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_UI import android.content.Context import android.graphics.drawable.Drawable -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.core.content.ContextCompat -import androidx.core.view.ViewCompat.isAttachedToWindow -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentActivity -import androidx.lifecycle.Lifecycle -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide +import androidx.compose.animation.Crossfade +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.animation.core.tween +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.clipToBounds +import androidx.compose.ui.draw.rotate +import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.layout.layout +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.zIndex import com.celzero.bravedns.R import com.celzero.bravedns.database.ConnectionTracker -import com.celzero.bravedns.databinding.ListItemConnTrackBinding import com.celzero.bravedns.service.FirewallManager import com.celzero.bravedns.service.FirewallRuleset import com.celzero.bravedns.service.ProxyManager import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.ui.bottomsheet.ConnTrackerBottomSheet -import com.celzero.bravedns.util.Constants.Companion.EMPTY_PACKAGE_NAME +import com.celzero.bravedns.ui.compose.rememberDrawablePainter import com.celzero.bravedns.util.Constants.Companion.TIME_FORMAT_1 import com.celzero.bravedns.util.KnownPorts import com.celzero.bravedns.util.Protocol import com.celzero.bravedns.util.UIUtils import com.celzero.bravedns.util.UIUtils.getDurationInHumanReadableFormat import com.celzero.bravedns.util.Utilities -import com.celzero.bravedns.util.Utilities.getDefaultIcon import com.celzero.bravedns.util.Utilities.getIcon -import com.google.gson.Gson import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.util.Locale +import kotlin.math.roundToInt + +private const val MAX_BYTES = 500000 // 500 KB +private const val MAX_TIME_TCP = 135 // seconds +private const val MAX_TIME_UDP = 135 // seconds +private const val NO_USER_ID = 0 + +private data class ConnectionRowPalette( + val status: Color, + val statusContainer: Color, + val statusLabel: String, + val surfaceCollapsed: Color, + val surfaceExpanded: Color, + val surfaceSubtle: Color, + val line: Color, + val primaryText: Color, + val secondaryText: Color, + val tagBg: Color, + val tagText: Color, +) + +@Composable +private fun connectionRowPalette(ct: ConnectionTracker): ConnectionRowPalette { + val scheme = MaterialTheme.colorScheme + val allowedGreen = Color(0xFF2FB36B) + val statusColor = if (ct.isBlocked) scheme.error else allowedGreen + val statusContainer = if (ct.isBlocked) scheme.errorContainer.copy(alpha = 0.55f) else allowedGreen.copy(alpha = 0.2f) + + return ConnectionRowPalette( + status = statusColor, + statusContainer = statusContainer, + statusLabel = if (ct.isBlocked) stringResource(R.string.lbl_blocked) else stringResource(R.string.lbl_allowed), + surfaceCollapsed = scheme.surfaceContainerLow, + surfaceExpanded = scheme.surfaceContainer, + surfaceSubtle = scheme.surfaceContainerHighest.copy(alpha = 0.3f), + line = scheme.outlineVariant.copy(alpha = 0.42f), + primaryText = scheme.onSurface, + secondaryText = scheme.onSurfaceVariant, + tagBg = scheme.surfaceContainerHighest.copy(alpha = 0.58f), + tagText = scheme.onSurfaceVariant, + ) +} + +@Composable +fun ConnectionRow( + ct: ConnectionTracker, + index: Int = 0, + itemCount: Int = 1, +) { + val context = LocalContext.current + val palette = connectionRowPalette(ct) + val summary = summaryInfo(context, ct) + val hintColor = hintColor(ct) ?: palette.secondaryText + val protocol = protocolLabel(context, ct.port, ct.protocol) + val time = Utilities.convertLongToTime(ct.timeStamp, TIME_FORMAT_1) + val destination = ct.dnsQuery?.takeIf { it.isNotBlank() } ?: ct.ipAddress + val appDisplay = if (ct.appName.isBlank()) stringResource(R.string.network_log_app_name_unknown) else ct.appName + + var expanded by remember(ct.id) { mutableStateOf(false) } + var showDetails by remember(ct.id) { mutableStateOf(false) } + var appIcon by remember(ct.uid) { mutableStateOf(null) } + var appCount by remember(ct.uid) { mutableStateOf(1) } + + LaunchedEffect(ct.uid, ct.appName, ct.usrId) { + val apps = withContext(Dispatchers.IO) { FirewallManager.getPackageNamesByUid(ct.uid) } + appCount = apps.size + appIcon = if (apps.isEmpty()) null else getIcon(context, apps[0]) + } + + val appName = + when { + ct.usrId != NO_USER_ID -> + stringResource(R.string.about_version_install_source, appDisplay, ct.usrId.toString()) + appCount > 1 -> + stringResource(R.string.ctbs_app_other_apps, appDisplay, "${appCount - 1}") + else -> appDisplay + } + + val interactionSource = remember { MutableInteractionSource() } + val isPressed by interactionSource.collectIsPressedAsState() + + val rowScale by animateFloatAsState( + targetValue = if (isPressed) 0.988f else 1f, + animationSpec = spring(stiffness = Spring.StiffnessMediumLow, dampingRatio = Spring.DampingRatioNoBouncy), + label = "connRowScale", + ) + + val chevronAngle by animateFloatAsState( + targetValue = if (expanded) 90f else 0f, + animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing), + label = "connChevron", + ) + + val baseCardColor = if (expanded) palette.surfaceExpanded else palette.surfaceCollapsed + val pressedCardColor = lerp(baseCardColor, MaterialTheme.colorScheme.primaryContainer, 0.16f) + val cardColor by animateColorAsState( + targetValue = if (isPressed) pressedCardColor else baseCardColor, + animationSpec = tween(durationMillis = 200, easing = FastOutSlowInEasing), + label = "connCardColor", + ) + + val shadowElevation by animateDpAsState( + targetValue = + when { + isPressed -> 3.dp + expanded -> 6.dp + else -> 1.dp + }, + animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing), + label = "connShadow", + ) + + val stripeAlpha by animateFloatAsState( + targetValue = if (expanded) 1f else 0.9f, + animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing), + label = "connStripeAlpha", + ) + + val detailsProgress by animateFloatAsState( + targetValue = if (expanded) 1f else 0f, + animationSpec = tween(durationMillis = 230, easing = FastOutSlowInEasing), + label = "connDetailsProgress", + finishedListener = { value -> if (value == 0f) showDetails = false }, + ) + + LaunchedEffect(expanded) { + if (expanded) showDetails = true + } -class ConnectionTrackerAdapter(private val context: Context) : - PagingDataAdapter( - DIFF_CALLBACK + val cardShape = ListItemDefaults.segmentedShapes(index = index, count = itemCount) + + Surface( + modifier = + Modifier + .fillMaxWidth() + .scale(rowScale) + .clip(cardShape.shape) + .clickable( + interactionSource = interactionSource, + indication = null, + onClick = { expanded = !expanded }, + ), + shape = cardShape.shape, + color = cardColor, + tonalElevation = if (expanded) 2.dp else 0.dp, + shadowElevation = shadowElevation, + border = if (expanded) BorderStroke(1.dp, palette.line.copy(alpha = 0.7f)) else null, ) { + Box( + modifier = + Modifier + .fillMaxWidth() + .height(IntrinsicSize.Min), + ) { + Column(modifier = Modifier.fillMaxWidth()) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(start = 26.dp, end = 12.dp, top = 12.dp, bottom = 11.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(10.dp), + ) { + AppIconSlot( + appIcon = appIcon, + statusColor = palette.statusContainer, + ) - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(3.dp), + ) { + Text( + text = destination, + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.SemiBold, + fontSize = 13.sp, + color = palette.primaryText, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + letterSpacing = (-0.2).sp, + ) + Row( + horizontalArrangement = Arrangement.spacedBy(6.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = appName, + fontSize = 11.sp, + color = palette.secondaryText, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f, fill = false), + ) + ProtocolTag(type = protocol, bg = palette.tagBg, textColor = palette.tagText) + } + } - override fun areItemsTheSame(old: ConnectionTracker, new: ConnectionTracker): Boolean { - return old.id == new.id + Column( + horizontalAlignment = Alignment.End, + verticalArrangement = Arrangement.spacedBy(5.dp), + ) { + StatusLabel(text = palette.statusLabel, color = palette.status) + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(4.dp), + ) { + Text( + text = time, + fontSize = 10.sp, + color = palette.secondaryText.copy(alpha = 0.92f), + ) + ChevronIcon(angle = chevronAngle, tint = palette.secondaryText) + } + } } - override fun areContentsTheSame(old: ConnectionTracker, new: ConnectionTracker): Boolean { - return old == new + if (showDetails) { + Box( + modifier = + Modifier + .fillMaxWidth() + .accordionReveal(detailsProgress), + ) { + ConnectionDetailsPanel( + ct = ct, + protocol = protocol, + summary = summary, + panelColor = palette.surfaceSubtle, + dividerColor = palette.line, + textColor = palette.secondaryText, + hintColor = hintColor, + ) + } } } - private const val MAX_BYTES = 500000 // 500 KB - private const val MAX_TIME_TCP = 135 // seconds - private const val MAX_TIME_UDP = 135 // seconds - private const val NO_USER_ID = 0 - private const val RTT_SHORT_THRESHOLD_MS = 20 // milliseconds - private const val TAG = "ConnTrackAdapter" + StatusStripe( + color = palette.status.copy(alpha = stripeAlpha), + modifier = + Modifier + .align(Alignment.TopStart) + .fillMaxHeight() + .zIndex(1f), + ) + } } +} - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ConnectionTrackerViewHolder { - val itemBinding = - ListItemConnTrackBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false +private fun Modifier.accordionReveal(progress: Float): Modifier { + val p = progress.coerceIn(0f, 1f) + return this + .graphicsLayer { alpha = p } + .clipToBounds() + .layout { measurable, constraints -> + val placeable = measurable.measure(constraints) + val h = (placeable.height * p).roundToInt() + layout(placeable.width, h) { + if (h > 0) placeable.place(0, 0) + } + } +} + +@Composable +private fun StatusStripe(color: Color, modifier: Modifier = Modifier) { + Box( + modifier = + modifier + .padding(start = 10.dp, top = 10.dp, bottom = 10.dp) + .width(5.dp) + .fillMaxHeight() + .clip(RoundedCornerShape(999.dp)) + .background( + brush = Brush.verticalGradient(colors = listOf(color, color.copy(alpha = 0.38f))), + ), + ) +} + +@Composable +private fun AppIconSlot( + appIcon: Drawable?, + statusColor: Color, +) { + val iconDrawable = appIcon + + Box(modifier = Modifier.size(36.dp), contentAlignment = Alignment.Center) { + if (iconDrawable != null) { + Crossfade(targetState = iconDrawable, animationSpec = tween(durationMillis = 180), label = "connIcon") { drawable -> + rememberDrawablePainter(drawable)?.let { painter -> + androidx.compose.foundation.Image( + painter = painter, + contentDescription = null, + modifier = + Modifier + .size(34.dp) + .clip(RoundedCornerShape(7.dp)), + ) + } + } + } else { + Box( + modifier = + Modifier + .size(34.dp) + .clip(RoundedCornerShape(10.dp)) + .background(statusColor.copy(alpha = 0.5f)) ) - return ConnectionTrackerViewHolder(itemBinding) + } } +} - override fun onBindViewHolder(holder: ConnectionTrackerViewHolder, position: Int) { - val connTracker: ConnectionTracker? = getItem(position) +@Composable +private fun ProtocolTag(type: String, bg: Color, textColor: Color) { + Box( + modifier = + Modifier + .clip(RoundedCornerShape(5.dp)) + .background(bg) + .padding(horizontal = 6.dp, vertical = 0.dp), + ) { + Text( + text = type, + fontSize = 9.sp, + fontWeight = FontWeight.Bold, + color = textColor, + letterSpacing = 0.5.sp, + ) + } +} - if (connTracker == null) { - holder.clear() - return - } - holder.update(connTracker) - holder.setTag(connTracker) +@Composable +private fun StatusLabel(text: String, color: Color) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(4.dp), + ) { + Box( + modifier = + Modifier + .size(5.dp) + .clip(CircleShape) + .background(color), + ) + Text( + text = text, + fontSize = 10.sp, + fontWeight = FontWeight.SemiBold, + color = color, + letterSpacing = 0.2.sp, + ) } +} - inner class ConnectionTrackerViewHolder(private val b: ListItemConnTrackBinding) : - RecyclerView.ViewHolder(b.root) { - - fun clear() { - b.connectionResponseTime.text = "" - b.connectionFlag.text = "" - b.connectionIpAddress.text = "" - b.connectionDomain.text = "" - b.connectionAppName.text = "" - b.connectionAppIcon.setImageDrawable(null) - b.connectionDataUsage.text = "" - b.connectionDelay.text = "" - b.connectionStatusIndicator.visibility = View.INVISIBLE - b.connectionSummaryLl.visibility = View.GONE - } +@Composable +private fun ChevronIcon(angle: Float, tint: Color) { + Icon( + painter = painterResource(R.drawable.ic_right_arrow_small), + contentDescription = null, + tint = tint, + modifier = + Modifier + .size(10.dp) + .rotate(angle), + ) +} - fun update(connTracker: ConnectionTracker) { - displayTransactionDetails(connTracker) - displayProtocolDetails(connTracker.port, connTracker.protocol) - displayAppDetails(connTracker) - displaySummaryDetails(connTracker) - // case: when the rule is set to RULE12 but no proxy is set, consider this as error - // handle this as special case, and display the RULE1C hint - // RULE1C is the hint for RULE12 with no proxy set. - val blocked = if (connTracker.blockedByRule == FirewallRuleset.RULE12.id) { - connTracker.proxyDetails.isEmpty() - } else { - connTracker.isBlocked - } - val rule = if (connTracker.blockedByRule == FirewallRuleset.RULE12.id && connTracker.proxyDetails.isEmpty()) { - FirewallRuleset.RULE18.id - } else { - connTracker.blockedByRule - } - displayFirewallRulesetHint(blocked, rule) +@Composable +private fun ConnectionDetailsPanel( + ct: ConnectionTracker, + protocol: String, + summary: Summary, + panelColor: Color, + dividerColor: Color, + textColor: Color, + hintColor: Color, +) { + val context = LocalContext.current + val endpoint = buildString { + append(ct.ipAddress) + if (ct.port > 0) append(":${ct.port}") + } - b.connectionParentLayout.setOnClickListener { openBottomSheet(connTracker) } - } + Column( + modifier = + Modifier + .fillMaxWidth() + .background(panelColor), + verticalArrangement = Arrangement.spacedBy(0.dp), + ) { + HorizontalDivider(color = dividerColor, thickness = 0.5.dp) - fun setTag(connTracker: ConnectionTracker) { - b.connectionResponseTime.tag = connTracker.timeStamp - b.root.tag = connTracker.timeStamp - } + Column( + modifier = Modifier.padding(start = 26.dp, end = 14.dp, top = 10.dp, bottom = 14.dp), + verticalArrangement = Arrangement.spacedBy(0.dp), + ) { + DetailTextRow(label = "Transport", value = protocol, tint = textColor) + DetailTextRow(label = "Country", value = countryDisplay(context, ct.flag), tint = textColor) - private fun openBottomSheet(ct: ConnectionTracker) { - if (context !is FragmentActivity) { - Logger.w(LOG_TAG_UI, "$TAG err opening the connection tracker bottomsheet") - return + if (endpoint.isNotBlank()) { + DetailTextRow(label = "Endpoint", value = endpoint, mono = true, tint = MaterialTheme.colorScheme.secondary) } - Logger.vv(LOG_TAG_UI, "$TAG show bottom sheet for ${ct.appName}") - val bottomSheetFragment = ConnTrackerBottomSheet() - // see AppIpRulesAdapter.kt#openBottomSheet() - val bundle = Bundle() - bundle.putString(ConnTrackerBottomSheet.INSTANCE_STATE_IPDETAILS, Gson().toJson(ct)) - bottomSheetFragment.arguments = bundle - bottomSheetFragment.show(context.supportFragmentManager, bottomSheetFragment.tag) - } - - private fun displayTransactionDetails(connTracker: ConnectionTracker) { - val time = Utilities.convertLongToTime(connTracker.timeStamp, TIME_FORMAT_1) - b.connectionResponseTime.text = time - b.connectionFlag.text = connTracker.flag - - if (connTracker.dnsQuery.isNullOrEmpty()) { - b.connectionIpAddress.text = connTracker.ipAddress - b.connectionDomain.visibility = View.GONE - } else { - b.connectionIpAddress.text = connTracker.ipAddress - b.connectionDomain.text = connTracker.dnsQuery - b.connectionDomain.visibility = View.VISIBLE - // marquee is not working for the textview, hence the workaround. - b.connectionDomain.isSelected = true + if (!ct.dnsQuery.isNullOrBlank()) { + DetailTextRow(label = "DNS", value = ct.dnsQuery.orEmpty(), mono = true, tint = textColor) } - } - private fun displayAppDetails(ct: ConnectionTracker) { - io { - uiCtx { - val apps = FirewallManager.getPackageNamesByUid(ct.uid) - val count = apps.count() - - val appName = when { - ct.usrId != NO_USER_ID -> context.getString( - R.string.about_version_install_source, - ct.appName, - ct.usrId.toString() - ) + if (ct.blockedByRule.isNotBlank()) { + DetailTextRow( + label = "Rule", + value = ct.blockedByRule, + tint = if (ct.isBlocked) MaterialTheme.colorScheme.error else textColor, + ) + } - count > 1 -> context.getString( - R.string.ctbs_app_other_apps, - ct.appName, - "${count - 1}" - ) + if (ct.proxyDetails.isNotBlank()) { + DetailTextRow(label = "Proxy", value = ct.proxyDetails, mono = true, tint = textColor) + } - else -> ct.appName - } + if (summary.duration.isNotBlank()) { + DetailTextRow(label = "Duration", value = summary.duration, tint = textColor) + } - b.connectionAppName.text = appName - if (apps.isEmpty() || ct.packageName.isEmpty() || ct.packageName == EMPTY_PACKAGE_NAME) { - loadAppIcon(getDefaultIcon(context)) - } else { - loadAppIcon(getIcon(context, apps[0])) - } - } + if (summary.dataUsage.isNotBlank()) { + DetailTextRow(label = "Usage", value = summary.dataUsage, tint = textColor) } - } - private fun displayProtocolDetails(port: Int, proto: Int) { - // If the protocol is not TCP or UDP, then display the protocol name. - if (Protocol.UDP.protocolType != proto && Protocol.TCP.protocolType != proto) { - b.connLatencyTxt.text = Protocol.getProtocolName(proto).name - return + if (ct.synack > 0) { + DetailTextRow(label = "Latency", value = "${ct.synack}ms", tint = textColor) } - // Instead of displaying the port number, display the service name if it is known. - // https://github.com/celzero/rethink-app/issues/42 - #3 - transport + protocol. - val resolvedPort = KnownPorts.resolvePort(port) - // case: for UDP/443 label it as HTTP3 instead of HTTPS - b.connLatencyTxt.text = - if (port == KnownPorts.HTTPS_PORT && proto == Protocol.UDP.protocolType) { - context.getString(R.string.connection_http3) - } else if (resolvedPort != KnownPorts.PORT_VAL_UNKNOWN) { - resolvedPort.uppercase(Locale.ROOT) - } else { - Protocol.getProtocolName(proto).name - } - } + if (summary.delay.isNotBlank()) { + DetailTextRow(label = "Flags", value = summary.delay, tint = hintColor) + } - private fun displayFirewallRulesetHint(isBlocked: Boolean, ruleName: String?) { - when { - // hint red when blocked - isBlocked -> { - b.connectionStatusIndicator.visibility = View.VISIBLE - val isError = FirewallRuleset.isProxyError(ruleName) - if (isError) { - b.connectionStatusIndicator.setBackgroundColor( - UIUtils.fetchColor(context, R.attr.chipTextNeutral) - ) - } else { - b.connectionStatusIndicator.setBackgroundColor( - ContextCompat.getColor(context, R.color.colorRed_A400) - ) - } - } - // hint white when whitelisted - (FirewallRuleset.shouldShowHint(ruleName)) -> { - b.connectionStatusIndicator.visibility = View.VISIBLE - b.connectionStatusIndicator.setBackgroundColor( - ContextCompat.getColor(context, R.color.primaryLightColorText) - ) - } - // no hints, otherwise - else -> { - b.connectionStatusIndicator.visibility = View.INVISIBLE - } + if (ct.message.isNotBlank()) { + DetailTextRow( + label = "Message", + value = ct.message, + tint = if (ct.isBlocked) MaterialTheme.colorScheme.error else textColor, + ) } } + } +} - private fun displaySummaryDetails(ct: ConnectionTracker) { - io { - val hasCid = VpnController.hasCid(ct.connId, ct.uid) - val connType = ConnectionTracker.ConnType.get(ct.connType) - uiCtx { - b.connectionDataUsage.text = "" - b.connectionDelay.text = "" - if ( - ct.duration == 0 && - ct.downloadBytes == 0L && - ct.uploadBytes == 0L && - ct.message.isEmpty() - ) { - var hasMinSummary = false - if (hasCid) { - b.connectionSummaryLl.visibility = View.VISIBLE - b.connectionDataUsage.text = context.getString(R.string.lbl_active) - b.connectionDuration.text = context.getString(R.string.symbol_green_circle) - b.connectionDelay.text = "" - hasMinSummary = true - } else { - b.connectionDataUsage.text = "" - b.connectionDuration.text ="" - } - if (connType.isMetered()) { - b.connectionDelay.text = context.getString(R.string.symbol_currency) - hasMinSummary = true - } else { - b.connectionDelay.text = "" - } - - if (isRpnProxy(ct.rpid)) { - b.connectionSummaryLl.visibility = View.VISIBLE - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_sparkle) - ) - } else if (isConnectionProxied(ct.blockedByRule, ct.proxyDetails)) { - b.connectionSummaryLl.visibility = View.VISIBLE - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_key) - ) - hasMinSummary = true - } - if (!hasMinSummary) { - b.connectionSummaryLl.visibility = View.GONE - } - return@uiCtx - } - - b.connectionSummaryLl.visibility = View.VISIBLE - val duration = getDurationInHumanReadableFormat(context, ct.duration) - b.connectionDuration.text = context.getString(R.string.single_argument, duration) - // add unicode for download and upload - val download = - context.getString( - R.string.symbol_download, - Utilities.humanReadableByteCount(ct.downloadBytes, true) - ) - val upload = - context.getString( - R.string.symbol_upload, - Utilities.humanReadableByteCount(ct.uploadBytes, true) - ) - b.connectionDataUsage.text = context.getString(R.string.two_argument, upload, download) - b.connectionDelay.text = "" - if (connType.isMetered()) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_currency) - ) - } - if (isConnectionHeavier(ct)) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_heavy) - ) - } - if (isConnectionSlower(ct)) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_turtle) - ) - } - // bunny in case rpid as present, key in case of proxy - // bunny and key indicate conn is proxied, so its enough to show one of them - if (isRpnProxy(ct.rpid)) { - b.connectionSummaryLl.visibility = View.VISIBLE - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_sparkle) - ) - } else if (containsRelayProxy(ct.rpid)) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_bunny) - ) - } else if (isConnectionProxied(ct.blockedByRule, ct.proxyDetails)) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_key) - ) - } +@Composable +private fun DetailTextRow( + label: String, + value: String, + mono: Boolean = false, + tint: Color, +) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(vertical = 4.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.Top, + ) { + Text( + text = label, + fontSize = 10.sp, + color = MaterialTheme.colorScheme.onSurfaceVariant, + letterSpacing = 0.4.sp, + modifier = Modifier.widthIn(min = 72.dp), + ) + Text( + text = value, + fontSize = 11.sp, + color = tint, + fontFamily = if (mono) FontFamily.Monospace else FontFamily.Default, + fontWeight = FontWeight.Medium, + textAlign = TextAlign.End, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f), + ) + } +} - // rtt -> show rocket if less than 20ms, treat it as rtt - if (isRoundTripShorter(ct.synack, ct.isBlocked)) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_rocket) - ) - } +private fun countryDisplay(context: Context, flag: String): String { + val unknown = context.getString(R.string.network_log_app_name_unknown) + val countryName = UIUtils.getCountryNameFromFlag(flag).trim() + val normalizedName = countryName.takeUnless { it.isBlank() || it == "--" } + val normalizedFlag = flag.trim().takeUnless { it.isBlank() || it == "--" } + + return when { + normalizedName != null && normalizedFlag != null -> "$normalizedName $normalizedFlag" + normalizedName != null -> normalizedName + normalizedFlag != null -> normalizedFlag + else -> unknown + } +} - if (b.connectionDelay.text.isEmpty() && b.connectionDataUsage.text.isEmpty()) { - b.connectionSummaryLl.visibility = View.GONE - } +private fun protocolLabel(context: Context, port: Int, proto: Int): String { + if (Protocol.UDP.protocolType != proto && Protocol.TCP.protocolType != proto) { + return Protocol.getProtocolName(proto).name + } - } - } + val resolvedPort = KnownPorts.resolvePort(port) + return if (port == KnownPorts.HTTPS_PORT && proto == Protocol.UDP.protocolType) { + context.getString(R.string.connection_http3) + } else if (resolvedPort != KnownPorts.PORT_VAL_UNKNOWN) { + resolvedPort.uppercase(Locale.ROOT) + } else { + Protocol.getProtocolName(proto).name + } +} +@Composable +private fun hintColor(ct: ConnectionTracker): Color? { + val blocked = + if (ct.blockedByRule == FirewallRuleset.RULE12.id) { + ct.proxyDetails.isEmpty() + } else { + ct.isBlocked } - - private fun isRoundTripShorter(rtt: Long, blocked: Boolean): Boolean { - return rtt in 1..RTT_SHORT_THRESHOLD_MS && !blocked + val rule = + if (ct.blockedByRule == FirewallRuleset.RULE12.id && ct.proxyDetails.isEmpty()) { + FirewallRuleset.RULE18.id + } else { + ct.blockedByRule } - - private fun containsRelayProxy(rpid: String): Boolean { - return rpid.isNotEmpty() + return when { + blocked -> { + val isError = FirewallRuleset.isProxyError(rule) + if (isError) MaterialTheme.colorScheme.onSurfaceVariant else MaterialTheme.colorScheme.error } + FirewallRuleset.shouldShowHint(rule) -> MaterialTheme.colorScheme.onSurfaceVariant + else -> null + } +} - private fun isConnectionProxied(ruleName: String?, proxyDetails: String): Boolean { - if (ruleName == null) return false - val rule = FirewallRuleset.getFirewallRule(ruleName) ?: return false - val proxy = ProxyManager.isNotLocalAndRpnProxy(proxyDetails) - // show key symbol in case of proxy error too - val isProxyError = FirewallRuleset.isProxyError(ruleName) - return (FirewallRuleset.isProxied(rule) && proxyDetails.isNotEmpty() && proxy) || isProxyError +private data class Summary( + val dataUsage: String, + val duration: String, + val delay: String, + val showSummary: Boolean +) + +private fun summaryInfo(context: Context, ct: ConnectionTracker): Summary { + val connType = ConnectionTracker.ConnType.get(ct.connType) + var dataUsage = "" + var delay = "" + var duration = "" + + if (ct.duration == 0 && ct.downloadBytes == 0L && ct.uploadBytes == 0L && ct.message.isEmpty()) { + var hasMinSummary = false + if (VpnController.hasCid(ct.connId, ct.uid)) { + dataUsage = context.getString(R.string.lbl_active) + duration = context.getString(R.string.symbol_green_circle) + hasMinSummary = true } - private fun isRpnProxy(pid: String): Boolean { - return pid.isNotEmpty() && ProxyManager.isRpnProxy(pid) + if (connType.isMetered()) { + delay = context.getString(R.string.symbol_currency) + hasMinSummary = true } - private fun isConnectionHeavier(ct: ConnectionTracker): Boolean { - return ct.downloadBytes + ct.uploadBytes > MAX_BYTES + if (isRpnProxy(ct.rpid)) { + delay = context.getString(R.string.ci_desc, delay, context.getString(R.string.symbol_sparkle)) + } else if (isConnectionProxied(ct.blockedByRule, ct.proxyDetails)) { + delay = context.getString(R.string.ci_desc, delay, context.getString(R.string.symbol_key)) + hasMinSummary = true } - private fun isConnectionSlower(ct: ConnectionTracker): Boolean { - return (ct.protocol == Protocol.UDP.protocolType && ct.duration > MAX_TIME_UDP) || - (ct.protocol == Protocol.TCP.protocolType && ct.duration > MAX_TIME_TCP) - } + return Summary(dataUsage, duration, delay, hasMinSummary) + } - private fun loadAppIcon(drawable: Drawable?) { - Glide.with(context) - .load(drawable) - .error(getDefaultIcon(context)) - .into(b.connectionAppIcon) - } + duration = context.getString( + R.string.single_argument, + getDurationInHumanReadableFormat(context, ct.duration) + ) + + val download = context.getString( + R.string.symbol_download, + Utilities.humanReadableByteCount(ct.downloadBytes, true) + ) + val upload = context.getString( + R.string.symbol_upload, + Utilities.humanReadableByteCount(ct.uploadBytes, true) + ) + dataUsage = context.getString(R.string.two_argument, upload, download) + + if (connType.isMetered()) { + delay = context.getString(R.string.ci_desc, delay, context.getString(R.string.symbol_currency)) + } + if (isConnectionHeavier(ct)) { + delay = context.getString(R.string.ci_desc, delay, context.getString(R.string.symbol_heavy)) + } + if (isConnectionSlower(ct)) { + delay = context.getString(R.string.ci_desc, delay, context.getString(R.string.symbol_turtle)) + } + if (isRpnProxy(ct.rpid)) { + delay = context.getString(R.string.ci_desc, delay, context.getString(R.string.symbol_sparkle)) + } else if (containsRelayProxy(ct.rpid)) { + delay = context.getString(R.string.ci_desc, delay, context.getString(R.string.symbol_bunny)) + } else if (isConnectionProxied(ct.blockedByRule, ct.proxyDetails)) { + delay = context.getString(R.string.ci_desc, delay, context.getString(R.string.symbol_key)) + } + if (isRoundTripShorter(ct.synack, ct.isBlocked)) { + delay = context.getString(R.string.ci_desc, delay, context.getString(R.string.symbol_rocket)) } - private fun io(f: suspend () -> Unit) { - val owner = context as? LifecycleOwner ?: return + val showSummary = delay.isNotEmpty() || dataUsage.isNotEmpty() + return Summary(dataUsage, duration, delay, showSummary) +} - owner.lifecycleScope.launch(Dispatchers.IO) { f() } - } +private fun isRoundTripShorter(rtt: Long, blocked: Boolean): Boolean { + return rtt in 1..20 && !blocked +} + +private fun containsRelayProxy(rpid: String): Boolean { + return rpid.isNotEmpty() +} - private suspend fun uiCtx(f: suspend () -> Unit) { - val owner = context as? LifecycleOwner ?: return +private fun isConnectionProxied(ruleName: String?, proxyDetails: String): Boolean { + if (ruleName == null) return false + val rule = FirewallRuleset.getFirewallRule(ruleName) ?: return false + val proxy = ProxyManager.isNotLocalAndRpnProxy(proxyDetails) + val isProxyError = FirewallRuleset.isProxyError(ruleName) + return (FirewallRuleset.isProxied(rule) && proxyDetails.isNotEmpty() && proxy) || isProxyError +} - withContext(Dispatchers.Main.immediate) { - if (!owner.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) { - return@withContext - } +private fun isRpnProxy(pid: String): Boolean { + return pid.isNotEmpty() && ProxyManager.isRpnProxy(pid) +} - f() - } - } +private fun isConnectionHeavier(ct: ConnectionTracker): Boolean { + return ct.downloadBytes + ct.uploadBytes > MAX_BYTES +} + +private fun isConnectionSlower(ct: ConnectionTracker): Boolean { + return (ct.protocol == Protocol.UDP.protocolType && ct.duration > MAX_TIME_UDP) || + (ct.protocol == Protocol.TCP.protocolType && ct.duration > MAX_TIME_TCP) } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/ConsoleLogAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/ConsoleLogAdapter.kt index f4f08f8ba..0d248d1e2 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/ConsoleLogAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/ConsoleLogAdapter.kt @@ -15,98 +15,65 @@ */ package com.celzero.bravedns.adapter -import Logger -import android.content.Context -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.dp import com.celzero.bravedns.R import com.celzero.bravedns.RethinkDnsApplication.Companion.DEBUG import com.celzero.bravedns.database.ConsoleLog -import com.celzero.bravedns.databinding.ListItemConsoleLogBinding import com.celzero.bravedns.util.Constants.Companion.TIME_FORMAT_1 -import com.celzero.bravedns.util.UIUtils import com.celzero.bravedns.util.Utilities -class ConsoleLogAdapter(private val context: Context) : - PagingDataAdapter(DIFF_CALLBACK) { - - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(old: ConsoleLog, new: ConsoleLog): Boolean { - return old.id == new.id - } - - override fun areContentsTheSame(old: ConsoleLog, new: ConsoleLog): Boolean { - return old == new - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ConsoleLogViewHolder { - val itemBinding = - ListItemConsoleLogBinding.inflate(LayoutInflater.from(parent.context), parent, false) - return ConsoleLogViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: ConsoleLogViewHolder, position: Int) { - val logInfo = getItem(position) ?: return - holder.update(logInfo) - } - - inner class ConsoleLogViewHolder(private val b: ListItemConsoleLogBinding) : - RecyclerView.ViewHolder(b.root) { - - fun update(log: ConsoleLog) { - try { - // SAFETY CHECK: Verify log data is valid - if (log.message.isEmpty()) return - - // update the textview color with the first letter of the log level - val logLevel = log.message.firstOrNull() ?: 'V' - when (logLevel) { - 'V' -> - b.logDetail.setTextColor( - UIUtils.fetchColor(context, R.attr.primaryLightColorText) - ) - - 'D' -> - b.logDetail.setTextColor( - UIUtils.fetchColor(context, R.attr.primaryLightColorText) - ) - - 'I' -> - b.logDetail.setTextColor( - UIUtils.fetchColor(context, R.attr.defaultToggleBtnTxt) - ) - - 'W' -> - b.logDetail.setTextColor( - UIUtils.fetchColor(context, R.attr.firewallWhiteListToggleBtnTxt) - ) - - 'E' -> - b.logDetail.setTextColor( - UIUtils.fetchColor(context, R.attr.accentBad) - ) - - else -> - b.logDetail.setTextColor( - UIUtils.fetchColor(context, R.attr.primaryLightColorText) - ) - } - b.logDetail.text = log.message - if (DEBUG) { - b.logTimestamp.text = "${log.id}\n${Utilities.convertLongToTime(log.timestamp, TIME_FORMAT_1)}" - } else { - b.logTimestamp.text = Utilities.convertLongToTime(log.timestamp, TIME_FORMAT_1) - } - } catch (e: Exception) { - Logger.w("ConsoleLogAdapter", "Error updating view holder: ${e.message}") - } +@Composable +fun ConsoleLogRow(log: ConsoleLog, isDebug: Boolean = DEBUG) { + val context = LocalContext.current + val logLevel = log.message.firstOrNull() ?: 'V' + val colorRes = + when (logLevel) { + 'I' -> R.attr.defaultToggleBtnTxt + 'W' -> R.attr.firewallWhiteListToggleBtnTxt + 'E' -> R.attr.firewallBlockToggleBtnTxt + else -> R.attr.primaryLightColorText + } + val logColor = + when (colorRes) { + R.attr.defaultToggleBtnTxt -> MaterialTheme.colorScheme.onSurfaceVariant + R.attr.firewallWhiteListToggleBtnTxt -> MaterialTheme.colorScheme.tertiary + R.attr.firewallBlockToggleBtnTxt -> MaterialTheme.colorScheme.error + else -> MaterialTheme.colorScheme.onSurfaceVariant } + val timestamp = + if (isDebug) { + "${log.id}\n${Utilities.convertLongToTime(log.timestamp, TIME_FORMAT_1)}" + } else { + Utilities.convertLongToTime(log.timestamp, TIME_FORMAT_1) + } + + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = 5.dp, vertical = 4.dp), + horizontalArrangement = Arrangement.spacedBy(10.dp) + ) { + Text( + text = timestamp, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Text( + text = log.message, + style = MaterialTheme.typography.bodySmall, + color = logColor, + modifier = Modifier.weight(1f) + ) } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/DnsCryptEndpointAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/DnsCryptEndpointAdapter.kt index 67ff6f290..e8da580f4 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/DnsCryptEndpointAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/DnsCryptEndpointAdapter.kt @@ -16,264 +16,89 @@ limitations under the License. package com.celzero.bravedns.adapter -import android.content.Context -import android.content.DialogInterface -import android.view.LayoutInflater -import android.view.ViewGroup -import android.widget.Toast -import androidx.appcompat.app.AlertDialog -import androidx.core.content.ContextCompat -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.findViewTreeLifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.R import com.celzero.bravedns.data.AppConfig import com.celzero.bravedns.database.DnsCryptEndpoint -import com.celzero.bravedns.databinding.DnsCryptEndpointListItemBinding -import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.util.UIUtils -import com.celzero.bravedns.util.UIUtils.clipboardCopy -import com.celzero.bravedns.util.Utilities -import com.celzero.firestack.backend.Backend -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext - -class DnsCryptEndpointAdapter(private val context: Context, private val appConfig: AppConfig) : - PagingDataAdapter( - DIFF_CALLBACK - ) { - var lifecycleOwner: LifecycleOwner? = null - - companion object { - private const val ONE_SEC = 1000L - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - - override fun areItemsTheSame( - oldConnection: DnsCryptEndpoint, - newConnection: DnsCryptEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected == newConnection.isSelected) - } - - override fun areContentsTheSame( - oldConnection: DnsCryptEndpoint, - newConnection: DnsCryptEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected != newConnection.isSelected) - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DnsCryptEndpointViewHolder { - val itemBinding = - DnsCryptEndpointListItemBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - lifecycleOwner = parent.findViewTreeLifecycleOwner() - return DnsCryptEndpointViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: DnsCryptEndpointViewHolder, position: Int) { - val dnsCryptEndpoint: DnsCryptEndpoint = getItem(position) ?: return - holder.update(dnsCryptEndpoint) - } - - inner class DnsCryptEndpointViewHolder(private val b: DnsCryptEndpointListItemBinding) : - RecyclerView.ViewHolder(b.root) { - private var statusCheckJob: Job? = null - - fun update(endpoint: DnsCryptEndpoint) { - displayDetails(endpoint) - setupClickListeners(endpoint) - } - - private fun setupClickListeners(endpoint: DnsCryptEndpoint) { - b.root.setOnClickListener { - b.dnsCryptEndpointListActionImage.isChecked = - !b.dnsCryptEndpointListActionImage.isChecked - updateDnsCryptDetails(endpoint) - } - - b.dnsCryptEndpointListActionImage.setOnClickListener { updateDnsCryptDetails(endpoint) } - - b.dnsCryptEndpointListInfoImage.setOnClickListener { - showExplanationOnImageClick(endpoint) - } - } - - private fun displayDetails(endpoint: DnsCryptEndpoint) { - b.dnsCryptEndpointListUrlName.text = endpoint.dnsCryptName - b.dnsCryptEndpointListActionImage.isChecked = endpoint.isSelected - - if (endpoint.isSelected && VpnController.hasTunnel() && !appConfig.isSmartDnsEnabled()) { - keepSelectedStatusUpdated() - } else if (endpoint.isSelected) { - b.dnsCryptEndpointListUrlExplanation.text = - context.getString(R.string.rt_filter_parent_selected) - } else { - b.dnsCryptEndpointListUrlExplanation.text = "" - } +private const val TAG = "DnsCryptEndpointAdapter" + +@Composable +fun DnsCryptRow(endpoint: DnsCryptEndpoint, appConfig: AppConfig) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val explanation = + rememberDnsStatusExplanation( + key = endpoint.id, + isSelected = endpoint.isSelected, + smartDnsEnabled = appConfig.isSmartDnsEnabled(), + tag = TAG + ) + var infoDialog by remember(endpoint.id) { mutableStateOf(null) } + var deleteDialog by remember(endpoint.id) { mutableStateOf(null) } + + DnsEndpointRow( + title = endpoint.dnsCryptName, + supporting = explanation.ifEmpty { null }, + selected = endpoint.isSelected, + action = if (endpoint.isDeletable()) DnsRowAction.Delete else DnsRowAction.Info, + selection = DnsRowSelection.Radio, + onActionClick = { if (endpoint.isDeletable()) { - b.dnsCryptEndpointListInfoImage.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_fab_uninstall) - ) + deleteDialog = + DnsDeleteDialogModel( + id = endpoint.id, + titleRes = R.string.dns_crypt_custom_url_remove_dialog_title, + messageRes = R.string.dns_crypt_url_remove_dialog_message, + successRes = R.string.dns_crypt_url_remove_success + ) } else { - b.dnsCryptEndpointListInfoImage.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_info) - ) - } - } - - private fun keepSelectedStatusUpdated() { - statusCheckJob = ui { - while (true) { - updateSelectedStatus() - delay(ONE_SEC) - } - } - } - - private fun updateSelectedStatus() { - // if the view is not active then cancel the job - if ( - lifecycleOwner - ?.lifecycle - ?.currentState - ?.isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED) == false || - bindingAdapterPosition == RecyclerView.NO_POSITION - ) { - statusCheckJob?.cancel() - return - } - - updateDnsStatus() - } - - private fun showExplanationOnImageClick(dnsCryptEndpoint: DnsCryptEndpoint) { - if (dnsCryptEndpoint.isDeletable()) showDeleteDialog(dnsCryptEndpoint.id) - else { - showDialogExplanation( - dnsCryptEndpoint.dnsCryptName, - dnsCryptEndpoint.dnsCryptURL, - dnsCryptEndpoint.dnsCryptExplanation - ) - } - } - - private fun showDeleteDialog(id: Int) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(R.string.dns_crypt_custom_url_remove_dialog_title) - builder.setMessage(R.string.dns_crypt_url_remove_dialog_message) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.lbl_delete)) { _, _ -> - deleteEndpoint(id) - } - - builder.setNegativeButton(context.getString(R.string.lbl_cancel)) { _, _ -> } - val alertDialog: AlertDialog = builder.create() - alertDialog.setCancelable(true) - alertDialog.show() - } - - private fun showDialogExplanation(title: String, url: String, message: String?) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(title) - if (message == null) builder.setMessage(url) - else builder.setMessage(url + "\n\n" + cryptDesc(message)) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.dns_info_positive)) { - dialogInterface, - _ -> - dialogInterface.dismiss() - } - - builder.setNeutralButton(context.getString(R.string.dns_info_neutral)) { - _: DialogInterface, - _: Int -> - clipboardCopy(context, url, context.getString(R.string.copy_clipboard_label)) - Utilities.showToastUiCentered( - context, - context.getString(R.string.info_dialog_url_copy_toast_msg), - Toast.LENGTH_SHORT - ) - } - val alertDialog: AlertDialog = builder.create() - alertDialog.setCancelable(true) - alertDialog.show() - } - - private fun cryptDesc(message: String?): String { - if (message.isNullOrEmpty()) return "" - - return try { - // fixme: find a better way to handle this - if (message.contains("R.string.")) { - val m = message.substringAfter("R.string.") - val resId: Int = - context.resources.getIdentifier(m, "string", context.packageName) - context.getString(resId) - } else { - message - } - } catch (_: Exception) { - "" + val description = + if (endpoint.dnsCryptExplanation.isNullOrEmpty()) { + endpoint.dnsCryptURL + } else { + endpoint.dnsCryptURL + "\n\n" + + resolveDnsDescriptionText(context, endpoint.dnsCryptExplanation) + } + infoDialog = + DnsInfoDialogModel( + title = endpoint.dnsCryptName, + message = description, + copyValue = endpoint.dnsCryptURL + ) } - } - - private fun updateDnsCryptDetails(endpoint: DnsCryptEndpoint) { - io { + }, + onSelectionChange = { + launchDnsEndpointSelectionUpdate(scope, context, TAG) { endpoint.isSelected = true appConfig.handleDnscryptChanges(endpoint) } } - - private fun updateDnsStatus() { - io { - val state = VpnController.getDnsStatus(Backend.Preferred) - val status = UIUtils.getDnsStatusStringRes(state) - uiCtx { - b.dnsCryptEndpointListUrlExplanation.text = - context.getString(status).replaceFirstChar(Char::titlecase) - } - } - } - - private fun deleteEndpoint(id: Int) { - io { - appConfig.deleteDnscryptEndpoint(id) - uiCtx { - Utilities.showToastUiCentered( - context, - context.getString(R.string.dns_crypt_url_remove_success), - Toast.LENGTH_SHORT - ) + ) + + deleteDialog?.let { model -> + DnsDeleteDialog( + model = model, + onDismiss = { deleteDialog = null }, + onConfirm = { id -> + launchDnsEndpointDelete(scope, context, model.successRes) { + appConfig.deleteDnscryptEndpoint(id) } + deleteDialog = null } - } - - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } - } - - private fun ui(f: suspend () -> Unit): Job? { - return lifecycleOwner?.lifecycleScope?.launch(Dispatchers.Main) { f() } - } + ) + } - private fun io(f: suspend () -> Unit) { - lifecycleOwner?.lifecycleScope?.launch(Dispatchers.IO) { f() } - } + infoDialog?.let { model -> + DnsInfoDialog( + model = model, + onDismiss = { infoDialog = null } + ) } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/DnsCryptRelayEndpointAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/DnsCryptRelayEndpointAdapter.kt index f5660a660..027a16b68 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/DnsCryptRelayEndpointAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/DnsCryptRelayEndpointAdapter.kt @@ -16,243 +16,96 @@ limitations under the License. package com.celzero.bravedns.adapter -import android.content.Context -import android.content.DialogInterface -import android.view.LayoutInflater -import android.view.ViewGroup -import android.widget.Toast -import androidx.core.content.ContextCompat -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.R import com.celzero.bravedns.data.AppConfig import com.celzero.bravedns.database.DnsCryptRelayEndpoint -import com.celzero.bravedns.databinding.DnsCryptEndpointListItemBinding -import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.util.UIUtils -import com.celzero.bravedns.util.UIUtils.clipboardCopy -import com.celzero.bravedns.util.Utilities -import com.celzero.firestack.backend.Backend -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -class DnsCryptRelayEndpointAdapter( - private val context: Context, - val lifecycleOwner: LifecycleOwner, - private val appConfig: AppConfig -) : - PagingDataAdapter< - DnsCryptRelayEndpoint, - DnsCryptRelayEndpointAdapter.DnsCryptRelayEndpointViewHolder - >(DIFF_CALLBACK) { - - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - oldConnection: DnsCryptRelayEndpoint, - newConnection: DnsCryptRelayEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected == newConnection.isSelected) - } - - override fun areContentsTheSame( - oldConnection: DnsCryptRelayEndpoint, - newConnection: DnsCryptRelayEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected != newConnection.isSelected) - } - } - } - - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int - ): DnsCryptRelayEndpointViewHolder { - val itemBinding = - DnsCryptEndpointListItemBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - return DnsCryptRelayEndpointViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: DnsCryptRelayEndpointViewHolder, position: Int) { - val dnsCryptRelayEndpoint: DnsCryptRelayEndpoint = getItem(position) ?: return - holder.update(dnsCryptRelayEndpoint) - } - - inner class DnsCryptRelayEndpointViewHolder(private val b: DnsCryptEndpointListItemBinding) : - RecyclerView.ViewHolder(b.root) { - - fun update(endpoint: DnsCryptRelayEndpoint) { - displayDetails(endpoint) - setupClickListener(endpoint) - } - - private fun setupClickListener(endpoint: DnsCryptRelayEndpoint) { - b.root.setOnClickListener { - b.dnsCryptEndpointListActionImage.isChecked = - !b.dnsCryptEndpointListActionImage.isChecked - updateDNSCryptRelayDetails(endpoint, b.dnsCryptEndpointListActionImage.isChecked) - } - - b.dnsCryptEndpointListActionImage.setOnClickListener { - updateDNSCryptRelayDetails(endpoint, b.dnsCryptEndpointListActionImage.isChecked) - } - - b.dnsCryptEndpointListInfoImage.setOnClickListener { promptUser(endpoint) } +private const val TAG = "DnsCryptRelayEndpointAdapter" + +@Composable +fun RelayRow(endpoint: DnsCryptRelayEndpoint, appConfig: AppConfig) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + var isSelected by remember(endpoint.id) { mutableStateOf(endpoint.isSelected) } + val explanation = + rememberDnsStatusExplanation( + key = endpoint.id, + isSelected = isSelected, + smartDnsEnabled = appConfig.isSmartDnsEnabled(), + tag = TAG, + pollIntervalMs = 1500L, + requireTunnel = false, + selectedFallbackText = null + ) + var infoDialog by remember(endpoint.id) { mutableStateOf(null) } + var deleteDialog by remember(endpoint.id) { mutableStateOf(null) } + + val updateSelection: (Boolean) -> Unit = { checked -> + isSelected = checked + launchDnsEndpointSelectionUpdate(scope, context, TAG) { + endpoint.isSelected = checked + appConfig.handleDnsrelayChanges(endpoint) } + } - private fun displayDetails(endpoint: DnsCryptRelayEndpoint) { - b.dnsCryptEndpointListUrlName.text = endpoint.dnsCryptRelayName - if (endpoint.isSelected && !appConfig.isSmartDnsEnabled()) { - updateSelectedStatus() - } else { - b.dnsCryptEndpointListUrlExplanation.text = "" - } - - b.dnsCryptEndpointListActionImage.isChecked = endpoint.isSelected + DnsEndpointRow( + title = endpoint.dnsCryptRelayName, + supporting = explanation.ifEmpty { null }, + selected = isSelected, + action = if (endpoint.isDeletable()) DnsRowAction.Delete else DnsRowAction.Info, + selection = DnsRowSelection.Checkbox, + onActionClick = { if (endpoint.isDeletable()) { - b.dnsCryptEndpointListInfoImage.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_fab_uninstall) - ) + deleteDialog = + DnsDeleteDialogModel( + id = endpoint.id, + titleRes = R.string.dns_crypt_relay_remove_dialog_title, + messageRes = R.string.dns_crypt_relay_remove_dialog_message, + successRes = R.string.dns_crypt_relay_remove_success + ) } else { - b.dnsCryptEndpointListInfoImage.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_info) - ) - } - } - - private fun updateSelectedStatus() { - io { - // always use the id as Dnsx.Preffered as it is the primary dns id for now - val state = VpnController.getDnsStatus(Backend.Preferred) - val status = UIUtils.getDnsStatusStringRes(state) - uiCtx { - b.dnsCryptEndpointListUrlExplanation.text = - context.getString(status).replaceFirstChar(Char::titlecase) - } - } - } - - private fun promptUser(endpoint: DnsCryptRelayEndpoint) { - if (endpoint.isDeletable()) showDeleteDialog(endpoint.id) - else { - showDialogExplanation( - endpoint.dnsCryptRelayName, - endpoint.dnsCryptRelayURL, - endpoint.dnsCryptRelayExplanation - ) - } - } - - private fun showDialogExplanation(title: String, url: String, message: String?) { - val builder = MaterialAlertDialogBuilder(context, R.style.App_Dialog_NoDim) - builder.setTitle(title) - if (message != null) builder.setMessage(url + "\n\n" + relayDesc(message)) - else builder.setMessage(url) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.dns_info_positive)) { - dialogInterface, - _ -> - dialogInterface.dismiss() - } - - builder.setNeutralButton(context.getString(R.string.dns_info_neutral)) { - _: DialogInterface, - _: Int -> - clipboardCopy(context, url, context.getString(R.string.copy_clipboard_label)) - Utilities.showToastUiCentered( - context, - context.getString(R.string.info_dialog_url_copy_toast_msg), - Toast.LENGTH_SHORT - ) - } - builder.create().show() - } - - private fun relayDesc(message: String?): String { - if (message.isNullOrEmpty()) return "" - - return try { - // fixme: find a better way to handle this - if (message.contains("R.string.")) { - val m = message.substringAfter("R.string.") - val resId: Int = - context.resources.getIdentifier(m, "string", context.packageName) - context.getString(resId) - } else { - message - } - } catch (_: Exception) { - "" - } - } - - private fun showDeleteDialog(id: Int) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(R.string.dns_crypt_relay_remove_dialog_title) - builder.setMessage(R.string.dns_crypt_relay_remove_dialog_message) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.lbl_delete)) { _, _ -> - deleteEndpoint(id) - } - - builder.setNegativeButton(context.getString(R.string.lbl_cancel)) { _, _ -> } - builder.create().show() - } - - private fun updateDNSCryptRelayDetails( - endpoint: DnsCryptRelayEndpoint, - isSelected: Boolean - ) { - - io { - if (isSelected && !appConfig.isDnscryptRelaySelectable()) { - uiCtx { - Utilities.showToastUiCentered( - context, - context.getString(R.string.dns_crypt_relay_error_toast), - Toast.LENGTH_LONG - ) - b.dnsCryptEndpointListActionImage.isChecked = false + val description = + if (endpoint.dnsCryptRelayExplanation.isNullOrEmpty()) { + endpoint.dnsCryptRelayURL + } else { + endpoint.dnsCryptRelayURL + "\n\n" + + resolveDnsDescriptionText(context, endpoint.dnsCryptRelayExplanation) } - return@io - } - - endpoint.isSelected = isSelected - appConfig.handleDnsrelayChanges(endpoint) - } - } - - private fun deleteEndpoint(id: Int) { - io { - appConfig.deleteDnscryptRelayEndpoint(id) - uiCtx { - Utilities.showToastUiCentered( - context, - context.getString(R.string.dns_crypt_relay_remove_success), - Toast.LENGTH_SHORT + infoDialog = + DnsInfoDialogModel( + title = endpoint.dnsCryptRelayName, + message = description, + copyValue = endpoint.dnsCryptRelayURL ) + } + }, + onSelectionChange = updateSelection + ) + + deleteDialog?.let { model -> + DnsDeleteDialog( + model = model, + onDismiss = { deleteDialog = null }, + onConfirm = { id -> + launchDnsEndpointDelete(scope, context, model.successRes) { + appConfig.deleteDnscryptRelayEndpoint(id) } + deleteDialog = null } - } - - private fun io(f: suspend () -> Unit) { - lifecycleOwner.lifecycleScope.launch(Dispatchers.IO) { f() } - } + ) + } - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } - } + infoDialog?.let { model -> + DnsInfoDialog( + model = model, + onDismiss = { infoDialog = null } + ) } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/DnsEndpointRowComponents.kt b/app/src/full/java/com/celzero/bravedns/adapter/DnsEndpointRowComponents.kt new file mode 100644 index 000000000..1bd8bf2a9 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/adapter/DnsEndpointRowComponents.kt @@ -0,0 +1,170 @@ +/* +Copyright 2020 RethinkDNS and its authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package com.celzero.bravedns.adapter + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.DeleteOutline +import androidx.compose.material.icons.rounded.Edit +import androidx.compose.material.icons.rounded.MoreHoriz +import androidx.compose.material3.Checkbox +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +internal enum class DnsRowAction { + Info, + Edit, + Delete +} + +internal enum class DnsRowSelection { + Radio, + Checkbox +} + +@Composable +internal fun DnsEndpointRow( + title: String, + supporting: String?, + selected: Boolean, + action: DnsRowAction, + selection: DnsRowSelection = DnsRowSelection.Radio, + onActionClick: () -> Unit, + onSelectionChange: (Boolean) -> Unit +) { + Surface( + modifier = + Modifier + .fillMaxWidth() + .padding(vertical = 4.dp), + shape = RoundedCornerShape(16.dp), + color = + if (selected) { + MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.32f) + } else { + MaterialTheme.colorScheme.surfaceContainerLow + } + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .clickable { + onSelectionChange( + if (selection == DnsRowSelection.Radio) true else !selected + ) + } + .padding(horizontal = 12.dp, vertical = 10.dp), + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = title, + style = MaterialTheme.typography.bodyLarge + ) + if (!supporting.isNullOrEmpty()) { + Text( + text = supporting, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + DnsEndpointActionButton( + action = action, + onClick = onActionClick + ) + + when (selection) { + DnsRowSelection.Radio -> { + RadioButton( + selected = selected, + onClick = { onSelectionChange(true) } + ) + } + DnsRowSelection.Checkbox -> { + Checkbox( + checked = selected, + onCheckedChange = onSelectionChange + ) + } + } + } + } +} + +@Composable +private fun DnsEndpointActionButton( + action: DnsRowAction, + onClick: () -> Unit +) { + val containerColor = + when (action) { + DnsRowAction.Delete -> MaterialTheme.colorScheme.errorContainer + DnsRowAction.Edit -> MaterialTheme.colorScheme.tertiaryContainer + DnsRowAction.Info -> MaterialTheme.colorScheme.secondaryContainer + } + val contentColor = + when (action) { + DnsRowAction.Delete -> MaterialTheme.colorScheme.onErrorContainer + DnsRowAction.Edit -> MaterialTheme.colorScheme.onTertiaryContainer + DnsRowAction.Info -> MaterialTheme.colorScheme.onSecondaryContainer + } + val icon = + when (action) { + DnsRowAction.Delete -> Icons.Rounded.DeleteOutline + DnsRowAction.Edit -> Icons.Rounded.Edit + DnsRowAction.Info -> Icons.Rounded.MoreHoriz + } + + Surface( + shape = CircleShape, + color = containerColor, + modifier = Modifier.size(32.dp), + onClick = onClick + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = icon, + contentDescription = null, + tint = contentColor, + modifier = Modifier.size(18.dp) + ) + } + } +} diff --git a/app/src/full/java/com/celzero/bravedns/adapter/DnsEndpointShared.kt b/app/src/full/java/com/celzero/bravedns/adapter/DnsEndpointShared.kt new file mode 100644 index 000000000..5271a2277 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/adapter/DnsEndpointShared.kt @@ -0,0 +1,218 @@ +/* +Copyright 2026 RethinkDNS and its authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package com.celzero.bravedns.adapter + +import android.content.Context +import android.widget.Toast +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import com.celzero.bravedns.R +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkMultiActionDialog +import com.celzero.bravedns.util.UIUtils.clipboardCopy +import com.celzero.bravedns.util.UIUtils.getDnsStatusStringRes +import com.celzero.bravedns.util.Utilities +import com.celzero.firestack.backend.Backend +import io.github.aakira.napier.Napier +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +internal data class DnsInfoDialogModel( + val title: String, + val message: String, + val copyValue: String? = null, + val copyToastRes: Int = R.string.info_dialog_url_copy_toast_msg, + val confirmTextRes: Int = R.string.dns_info_positive, + val copyTextRes: Int = R.string.dns_info_neutral +) + +internal data class DnsDeleteDialogModel( + val id: Int, + val titleRes: Int, + val messageRes: Int, + val successRes: Int +) + +@Composable +internal fun DnsInfoDialog( + model: DnsInfoDialogModel, + onDismiss: () -> Unit +) { + val context = LocalContext.current + RethinkMultiActionDialog( + onDismissRequest = onDismiss, + title = model.title, + message = model.message, + primaryText = context.getString(model.confirmTextRes), + onPrimary = onDismiss, + secondaryText = + model.copyValue?.takeIf { it.isNotEmpty() }?.let { + context.getString(model.copyTextRes) + }, + onSecondary = { + val copyValue = model.copyValue + if (copyValue.isNullOrEmpty()) return@RethinkMultiActionDialog + clipboardCopy( + context, + copyValue, + context.getString(R.string.copy_clipboard_label) + ) + Utilities.showToastUiCentered( + context, + context.getString(model.copyToastRes), + Toast.LENGTH_SHORT + ) + } + ) +} + +@Composable +internal fun DnsDeleteDialog( + model: DnsDeleteDialogModel, + onDismiss: () -> Unit, + onConfirm: (Int) -> Unit +) { + val context = LocalContext.current + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = context.getString(model.titleRes), + message = context.getString(model.messageRes), + confirmText = context.getString(R.string.lbl_delete), + dismissText = context.getString(R.string.lbl_cancel), + isConfirmDestructive = true, + onConfirm = { onConfirm(model.id) }, + onDismiss = onDismiss + ) +} + +@Composable +internal fun rememberDnsStatusExplanation( + key: Any, + isSelected: Boolean, + smartDnsEnabled: Boolean, + tag: String, + pollIntervalMs: Long = 1000L, + requireTunnel: Boolean = true, + selectedFallbackText: ((Context) -> String)? = { + it.getString(R.string.rt_filter_parent_selected) + }, + statusTextMapper: (Context, Int) -> String = { context, statusRes -> + context.getString(statusRes).replaceFirstChar(Char::titlecase) + } +): String { + val context = LocalContext.current + var explanation by remember(key) { mutableStateOf("") } + + LaunchedEffect(key, isSelected, smartDnsEnabled) { + if (isSelected && !smartDnsEnabled && (!requireTunnel || VpnController.hasTunnel())) { + while (isActive) { + val status = + runCatching { + withContext(Dispatchers.IO) { + val state = VpnController.getDnsStatus(Backend.Preferred) + getDnsStatusStringRes(state) + } + }.getOrElse { + Napier.e("$tag failed to read dns status", it) + R.string.rt_filter_parent_selected + } + explanation = statusTextMapper(context, status) + delay(pollIntervalMs) + } + } else if (isSelected && selectedFallbackText != null) { + explanation = selectedFallbackText(context) + } else { + explanation = "" + } + } + + return explanation +} + +internal fun resolveDnsDescriptionText(context: Context, message: String?): String { + if (message.isNullOrEmpty()) return "" + + return try { + if (message.contains("R.string.")) { + val key = message.substringAfter("R.string.") + val resId = context.resources.getIdentifier(key, "string", context.packageName) + if (resId == 0) message else context.getString(resId) + } else { + message + } + } catch (_: Exception) { + "" + } +} + +internal fun launchDnsEndpointSelectionUpdate( + scope: CoroutineScope, + context: Context, + tag: String, + apply: suspend () -> Unit +) { + scope.launch(Dispatchers.IO) { + runCatching { apply() }.onFailure { + Napier.e("$tag failed to update endpoint", it) + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + context.getString(R.string.status_failing), + Toast.LENGTH_SHORT + ) + } + } + } +} + +internal fun launchDnsEndpointDelete( + scope: CoroutineScope, + context: Context, + successRes: Int, + apply: suspend () -> Unit +) { + scope.launch(Dispatchers.IO) { + runCatching { apply() }.onSuccess { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + context.getString(successRes), + Toast.LENGTH_SHORT + ) + } + }.onFailure { + Napier.e("dns endpoint delete failed", it) + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + context.getString(R.string.status_failing), + Toast.LENGTH_SHORT + ) + } + } + } +} diff --git a/app/src/full/java/com/celzero/bravedns/adapter/DnsLogAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/DnsLogAdapter.kt index 555204f9b..d61eb8880 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/DnsLogAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/DnsLogAdapter.kt @@ -14,524 +14,910 @@ See the License for the specific language governing permissions and limitations under the License. */ +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) + package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_DNS -import Logger.LOG_TAG_UI import android.content.Context import android.graphics.drawable.Drawable -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import androidx.core.content.ContextCompat -import androidx.fragment.app.FragmentActivity -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.animation.Crossfade +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.animation.core.tween +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.ripple +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.clipToBounds +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.draw.rotate +import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.layout.layout +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.zIndex import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade -import com.bumptech.glide.request.target.CustomViewTarget +import com.bumptech.glide.request.target.CustomTarget import com.bumptech.glide.request.transition.DrawableCrossFadeFactory import com.bumptech.glide.request.transition.Transition import com.celzero.bravedns.R -import com.celzero.bravedns.RethinkDnsApplication.Companion.DEBUG -import com.celzero.bravedns.adapter.DnsLogAdapter.DnsLogViewHolder import com.celzero.bravedns.database.DnsLog -import com.celzero.bravedns.databinding.ListItemDnsLogBinding import com.celzero.bravedns.glide.FavIconDownloader import com.celzero.bravedns.net.doh.Transaction import com.celzero.bravedns.service.ProxyManager -import com.celzero.bravedns.ui.bottomsheet.DnsBlocklistBottomSheet +import com.celzero.bravedns.ui.compose.rememberDrawablePainter import com.celzero.bravedns.util.Constants import com.celzero.bravedns.util.Constants.Companion.MAX_ENDPOINT -import com.celzero.bravedns.util.UIUtils.fetchColor -import com.celzero.bravedns.util.Utilities.getDefaultIcon +import com.celzero.bravedns.util.UIUtils import com.celzero.bravedns.util.Utilities.getIcon import com.celzero.firestack.backend.Backend -import com.google.gson.Gson +import io.github.aakira.napier.Napier +import kotlin.math.roundToInt + +private data class DnsRowPalette( + val status: Color, + val statusContainer: Color, + val statusLabel: String, + val surfaceCollapsed: Color, + val surfaceExpanded: Color, + val surfaceSubtle: Color, + val line: Color, + val primaryText: Color, + val secondaryText: Color, + val tagBg: Color, + val tagText: Color, +) + +@Composable +private fun dnsRowPalette(log: DnsLog): DnsRowPalette { + val scheme = MaterialTheme.colorScheme + val allowedGreen = Color(0xFF2FB36B) + val statusColor = when { + log.isBlocked -> scheme.error + determineMaybeBlocked(log) -> scheme.error.copy(alpha = 0.9f) + else -> allowedGreen + } -class DnsLogAdapter(val context: Context, val loadFavIcon: Boolean, val isRethinkDns: Boolean) : - PagingDataAdapter(DIFF_CALLBACK) { + val statusContainer = when { + log.isBlocked -> scheme.errorContainer.copy(alpha = 0.55f) + determineMaybeBlocked(log) -> scheme.errorContainer.copy(alpha = 0.48f) + else -> allowedGreen.copy(alpha = 0.18f) + } - companion object { - private const val TAG = "DnsLogAdapter" - private const val RTT_SHORT_THRESHOLD_MS = 10 // milliseconds + return DnsRowPalette( + status = statusColor, + statusContainer = statusContainer, + statusLabel = + if (log.isBlocked) { + stringResource(R.string.lbl_blocked) + } else { + stringResource(R.string.lbl_allowed) + }, + surfaceCollapsed = scheme.surfaceContainerLow, + surfaceExpanded = scheme.surfaceContainer, + surfaceSubtle = scheme.surfaceContainerHighest.copy(alpha = 0.32f), + line = scheme.outlineVariant.copy(alpha = 0.45f), + primaryText = scheme.onSurface, + secondaryText = scheme.onSurfaceVariant, + tagBg = scheme.surfaceContainerHighest.copy(alpha = 0.6f), + tagText = scheme.onSurfaceVariant, + ) +} - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { +@Composable +fun DnsLogRow( + log: DnsLog, + loadFavIcon: Boolean, + isRethinkDns: Boolean, + onShowBlocklist: (DnsLog) -> Unit, + index: Int = 0, + itemCount: Int = 1, +) { + val context = LocalContext.current + val palette = dnsRowPalette(log) + val dnsType = dnsTypeName(context, log, isRethinkDns) + val hint = unicodeHint(context, log, isRethinkDns) + val appLabel = log.appName.ifEmpty { + stringResource(R.string.network_log_app_name_unknown) + } - override fun areItemsTheSame(prev: DnsLog, curr: DnsLog) = - prev.id == curr.id + var appIcon by remember(log.packageName) { mutableStateOf(null) } + var favIcon by remember(log.queryStr) { mutableStateOf(null) } + var showFav by remember(log.queryStr, loadFavIcon) { mutableStateOf(false) } + var expanded by remember { mutableStateOf(false) } + var showDetails by remember { mutableStateOf(false) } + + val interactionSource = remember { MutableInteractionSource() } + val isPressed by interactionSource.collectIsPressedAsState() + + val rowScale by animateFloatAsState( + targetValue = if (isPressed) 0.988f else 1f, + animationSpec = spring( + stiffness = Spring.StiffnessMediumLow, + dampingRatio = Spring.DampingRatioNoBouncy + ), + label = "dnsRowScale" + ) + + val chevronAngle by animateFloatAsState( + targetValue = if (expanded) 90f else 0f, + animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing), + label = "dnsChevron" + ) + + val baseCardColor = if (expanded) palette.surfaceExpanded else palette.surfaceCollapsed + val pressedCardColor = lerp(baseCardColor, MaterialTheme.colorScheme.primaryContainer, 0.2f) + val cardColor by animateColorAsState( + targetValue = if (isPressed) pressedCardColor else baseCardColor, + animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing), + label = "dnsCardColor" + ) + + val shadowElevation by animateDpAsState( + targetValue = + when { + isPressed -> 3.dp + expanded -> 7.dp + else -> 1.dp + }, + animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing), + label = "dnsCardShadow" + ) + + val stripeAlpha by animateFloatAsState( + targetValue = if (expanded) 1f else 0.9f, + animationSpec = tween(durationMillis = 180, easing = FastOutSlowInEasing), + label = "dnsStripeAlpha" + ) + + val detailsProgress by animateFloatAsState( + targetValue = if (expanded) 1f else 0f, + animationSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing), + label = "dnsDetailsProgress", + finishedListener = { value -> + if (value == 0f) showDetails = false + } + ) - override fun areContentsTheSame(prev: DnsLog, curr: DnsLog): Boolean { - return prev == curr - } + LaunchedEffect(log.packageName) { + appIcon = + if (log.packageName.isEmpty() || log.packageName == Constants.EMPTY_PACKAGE_NAME) { + null + } else { + getIcon(context, log.packageName) } } - override fun onBindViewHolder(holder: DnsLogViewHolder, position: Int) { - val log: DnsLog = getItem(position) ?: return - - holder.clear() - holder.update(log) - holder.setTag(log) + LaunchedEffect(log.queryStr, loadFavIcon, log.groundedQuery()) { + showFav = false + favIcon = null } - override fun getItemViewType(position: Int): Int { - return R.layout.list_item_dns_log + LaunchedEffect(log.queryStr, loadFavIcon, log.groundedQuery()) { + if (!loadFavIcon || log.groundedQuery()) return@LaunchedEffect + displayFavIcon( + context = context, + log = log, + loadFavIcon = true, + onShowFlag = { showFav = false; favIcon = null }, + onShowFav = { d -> showFav = true; favIcon = d }, + ) } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DnsLogViewHolder { - val binding = ListItemDnsLogBinding.inflate(LayoutInflater.from(parent.context), parent, false) - return DnsLogViewHolder(binding) + LaunchedEffect(expanded) { + if (expanded) showDetails = true } - inner class DnsLogViewHolder(private val b: ListItemDnsLogBinding): RecyclerView.ViewHolder(b.root) { - fun clear() { - b.dnsWallTime.text = "" - b.dnsFlag.text = "" - b.dnsQuery.text = "" - b.dnsAppName.text = "" - b.dnsIps.text = "" - b.dnsAppIcon.setImageDrawable(null) - b.dnsTypeName.text = "" - b.dnsQueryType.text = "" - b.dnsUnicodeHint.text = "" - b.dnsStatusIndicator.visibility = View.INVISIBLE - b.dnsSummaryLl.visibility = View.GONE - } + val cardShape = ListItemDefaults.segmentedShapes(index = index, count = itemCount) + + Surface( + modifier = + Modifier + .fillMaxWidth() + .scale(rowScale) + .clip(cardShape.shape) + .clickable( + interactionSource = interactionSource, + indication = null, + onClick = { expanded = !expanded }, + ), + shape = cardShape.shape, + color = cardColor, + tonalElevation = if (expanded) 2.dp else 0.dp, + shadowElevation = shadowElevation, + border = + if (expanded) { + BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f)) + } else { + null + }, + ) { + Box( + modifier = + Modifier + .fillMaxWidth() + .height(IntrinsicSize.Min), + ) { + Column( + modifier = Modifier.fillMaxWidth(), + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(start = 26.dp, end = 12.dp, top = 12.dp, bottom = 11.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(10.dp), + ) { + AppIconSlot( + showFav = showFav, + favIcon = favIcon, + appIcon = appIcon, + statusColor = palette.statusContainer, + ) - fun setTag(log: DnsLog?) { - if (log == null) return + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(3.dp), + ) { + Text( + text = log.queryStr, + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.SemiBold, + fontSize = 13.sp, + color = palette.primaryText, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + letterSpacing = (-0.2).sp, + ) + Row( + horizontalArrangement = Arrangement.spacedBy(6.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = appLabel, + fontSize = 11.sp, + color = palette.secondaryText, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f, fill = false), + ) + DnsTypeTag(type = dnsType, bg = palette.tagBg, textColor = palette.tagText) + } + } - b.dnsWallTime.tag = log.time - b.root.tag = log.time - } + Column( + horizontalAlignment = Alignment.End, + verticalArrangement = Arrangement.spacedBy(5.dp), + ) { + StatusLabel(text = palette.statusLabel, color = palette.status) + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(4.dp), + ) { + Text( + text = log.wallTime(), + fontSize = 10.sp, + color = palette.secondaryText.copy(alpha = 0.92f), + ) + ChevronIcon(angle = chevronAngle, tint = palette.secondaryText) + } + } + } + + if (showDetails) { + Box( + modifier = + Modifier + .fillMaxWidth() + .accordionReveal(detailsProgress), + ) { + DetailPanel( + log = log, + dnsType = dnsType, + hint = hint, + statusColor = palette.status, + context = context, + panelColor = palette.surfaceSubtle, + dividerColor = palette.line, + textColor = palette.secondaryText, + onShowBlocklist = onShowBlocklist, + ) + } + } + } - fun update(log: DnsLog) { - displayTransactionDetails(log) - displayAppDetails(log) - displayLogEntryHint(log) - displayIcon(log) - displayUnicodeIfNeeded(log) - displayDnsType(log) - b.dnsParentLayout.setOnClickListener { openBottomSheet(log) } + StatusStripe( + color = palette.status.copy(alpha = stripeAlpha), + modifier = + Modifier + .align(Alignment.TopStart) + .fillMaxHeight() + .zIndex(1f), + ) } + } +} - private fun openBottomSheet(log: DnsLog) { - if (context !is FragmentActivity) { - Logger.w(LOG_TAG_UI, "$TAG err opening dns log btm sheet, no ctx to activity") - return +private fun Modifier.accordionReveal(progress: Float): Modifier { + val p = progress.coerceIn(0f, 1f) + return this + .graphicsLayer { alpha = p } + .clipToBounds() + .layout { measurable, constraints -> + val placeable = measurable.measure(constraints) + val h = (placeable.height * p).roundToInt() + layout(placeable.width, h) { + if (h > 0) placeable.place(0, 0) } - - val bottomSheetFragment = DnsBlocklistBottomSheet() - val bundle = Bundle() - bundle.putString(DnsBlocklistBottomSheet.INSTANCE_STATE_DNSLOGS, Gson().toJson(log)) - bottomSheetFragment.arguments = bundle - bottomSheetFragment.show(context.supportFragmentManager, bottomSheetFragment.tag) } +} +@Composable +private fun StatusStripe(color: Color, modifier: Modifier = Modifier) { + Box( + modifier = + modifier + .padding(start = 10.dp, top = 10.dp, bottom = 10.dp) + .width(5.dp) + .fillMaxHeight() + .clip(RoundedCornerShape(999.dp)) + .background( + brush = + Brush.verticalGradient( + colors = + listOf( + color, + color.copy(alpha = 0.38f), + ), + ), + ), + ) +} - private fun displayLogEntryHint(log: DnsLog) { - if (log.isBlocked) { - b.dnsStatusIndicator.visibility = View.VISIBLE - b.dnsStatusIndicator.setBackgroundColor( - ContextCompat.getColor(context, R.color.colorRed_A400) - ) - } else if (determineMaybeBlocked(log)) { - b.dnsStatusIndicator.visibility = View.VISIBLE - val color = fetchColor(context, R.attr.chipTextNeutral) - b.dnsStatusIndicator.setBackgroundColor(color) - } else { - b.dnsStatusIndicator.visibility = View.INVISIBLE +@Composable +private fun AppIconSlot( + showFav: Boolean, + favIcon: Drawable?, + appIcon: Drawable?, + statusColor: Color, +) { + val iconDrawable = if (showFav && favIcon != null) favIcon else appIcon + + Box(modifier = Modifier.size(36.dp), contentAlignment = Alignment.Center) { + if (iconDrawable != null) { + Crossfade(targetState = iconDrawable, animationSpec = tween(durationMillis = 180), label = "dnsIcon") { drawable -> + rememberDrawablePainter(drawable)?.let { painter -> + androidx.compose.foundation.Image( + painter = painter, + contentDescription = null, + modifier = + Modifier + .size(34.dp) + .clip(RoundedCornerShape(7.dp)), + ) + } } + } else { + Box( + modifier = + Modifier + .size(34.dp) + .clip(RoundedCornerShape(10.dp)) + .background(statusColor.copy(alpha = 0.5f)) + ) } + } +} - private fun determineMaybeBlocked(log: DnsLog): Boolean { - return log.upstreamBlock || log.blockLists.isNotEmpty() - } +@Composable +private fun DnsTypeTag(type: String, bg: Color, textColor: Color) { + Box( + modifier = + Modifier + .clip(RoundedCornerShape(5.dp)) + .background(bg) + .padding(horizontal = 6.dp, vertical = 0.dp), + ) { + Text( + text = type, + fontSize = 9.sp, + fontWeight = FontWeight.Bold, + color = textColor, + letterSpacing = 0.5.sp, + ) + } +} - private fun displayTransactionDetails(log: DnsLog) { - b.dnsWallTime.text = log.wallTime() +@Composable +private fun StatusLabel(text: String, color: Color) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(4.dp), + ) { + Box( + modifier = + Modifier + .size(5.dp) + .clip(CircleShape) + .background(color), + ) + Text( + text = text, + fontSize = 10.sp, + fontWeight = FontWeight.SemiBold, + color = color, + letterSpacing = 0.2.sp, + ) + } +} - b.dnsQuery.text = log.queryStr - b.dnsIps.text = log.responseIps.split(",").firstOrNull() ?: "" - b.dnsIps.visibility = View.VISIBLE - // marquee is not working for the textview, hence the workaround. - b.dnsIps.isSelected = true +@Composable +private fun ChevronIcon(angle: Float, tint: Color) { + Icon( + painter = painterResource(R.drawable.ic_right_arrow_small), + contentDescription = null, + tint = tint, + modifier = + Modifier + .size(10.dp) + .rotate(angle), + ) +} - b.dnsLatency.text = context.getString(R.string.dns_query_latency, log.latency.toString()) - b.dnsQueryType.text = log.typeName - } +@Composable +private fun DetailPanel( + log: DnsLog, + dnsType: String, + hint: String, + statusColor: Color, + context: Context, + panelColor: Color, + dividerColor: Color, + textColor: Color, + onShowBlocklist: (DnsLog) -> Unit, +) { + Column( + modifier = + Modifier + .fillMaxWidth() + .background(panelColor), + verticalArrangement = Arrangement.spacedBy(0.dp), + ) { + HorizontalDivider( + color = dividerColor, + thickness = 0.5.dp, + ) + + Column( + modifier = Modifier.padding(start = 26.dp, end = 14.dp, top = 10.dp, bottom = 14.dp), + verticalArrangement = Arrangement.spacedBy(0.dp), + ) { + DetailLatencyRow(latency = log.latency) + + Spacer(Modifier.height(8.dp)) + + DetailTextRow( + label = "Transport", + value = dnsType, + tint = textColor, + ) - private fun displayUnicodeIfNeeded(log: DnsLog) { - if (DEBUG) { - val msg = log.msg.split(";").firstOrNull() ?: "" - if (msg.isNotEmpty() && msg == Backend.OriginInternal) { - b.dnsUnicodeHint.text = context.getString( - R.string.ci_desc, - b.dnsUnicodeHint.text, - "🪃" - ) + val unknownLabel = context.getString(R.string.network_log_app_name_unknown) + val countryName = UIUtils.getCountryNameFromFlag(log.flag).trim() + val normalizedCountryName = countryName.takeUnless { it.isBlank() || it == "--" } + val normalizedFlag = log.flag.trim().takeUnless { it.isBlank() || it == "--" } + val countryDisplay = + when { + normalizedCountryName != null && normalizedFlag != null -> "$normalizedCountryName $normalizedFlag" + normalizedCountryName != null -> normalizedCountryName + normalizedFlag != null -> normalizedFlag + else -> unknownLabel } - } - - // no need to show Unicode hints for failed transactions as the hints are relevant only - // for complete transactions and can be misleading in case of failed transactions - if (Transaction.Status.COMPLETE.name != log.status) { - return - } + DetailTextRow( + label = "Country", + value = countryDisplay, + tint = textColor, + ) - // rtt -> show rocket if less than 20ms, treat it as rtt - if (isRoundTripShorter(log.latency, log.isBlocked)) { - b.dnsUnicodeHint.text = - context.getString( - R.string.ci_desc, - b.dnsUnicodeHint.text, - context.getString(R.string.symbol_rocket) - ) - } - // bunny in case rpid as present, key in case of proxy - // bunny and key indicate conn is proxied, so its enough to show one of them - if (containsRelayProxy(log.relayIP)) { - b.dnsUnicodeHint.text = - context.getString( - R.string.ci_desc, - b.dnsUnicodeHint.text, - context.getString(R.string.symbol_bunny) - ) - } else if (isConnectionProxied(log.proxyId)) { - b.dnsUnicodeHint.text = - context.getString( - R.string.ci_desc, - b.dnsUnicodeHint.text, - context.getString(R.string.symbol_key) - ) + if (log.responseIps.isNotBlank()) { + val ips = log.responseIps.split(",").map { it.trim() }.filter { it.isNotEmpty() } + DetailTextRow( + label = context.getString(R.string.response_ip_label).ifEmpty { "IP" }, + value = ips.joinToString(" · "), + mono = true, + tint = MaterialTheme.colorScheme.secondary, + ) } - // show star if RethinkDNS or RPN is used - if (isRethinkUsed(log)) { - b.dnsUnicodeHint.text = - context.getString( - R.string.ci_desc, - b.dnsUnicodeHint.text, - getRethinkUnicode(log) - ) - } else if (isGoosOrSystemUsed(log)) { - // show duck icon in case of system or goos transport - b.dnsUnicodeHint.text = - context.getString( - R.string.ci_desc, - b.dnsUnicodeHint.text, - context.getString(R.string.symbol_duck) - ) - } else if (isDefaultResolverUsed(log)) { - // show globe icon in case of default or bootstrap resolver - b.dnsUnicodeHint.text = - context.getString( - R.string.ci_desc, - b.dnsUnicodeHint.text, - context.getString(R.string.symbol_diamond) - ) - } else if (containsMultipleIPs(log)) { - b.dnsUnicodeHint.text = - context.getString( - R.string.ci_desc, - b.dnsUnicodeHint.text, - context.getString(R.string.symbol_heavy) - ) + if (log.serverIP.isNotBlank()) { + DetailTextRow( + label = context.getString(R.string.resolver_label).ifEmpty { "Resolver" }, + value = log.serverIP, + mono = true, + tint = textColor, + ) } - if (dnssecIndicatorRequired(log)) { - if (dnssecOk(log)) { - b.dnsUnicodeHint.text = - context.getString( - R.string.ci_desc, - b.dnsUnicodeHint.text, - context.getString(R.string.symbol_lock) - ) - } else { - b.dnsUnicodeHint.text = - context.getString( - R.string.ci_desc, - b.dnsUnicodeHint.text, - context.getString(R.string.symbol_unlock) - ) - } + if (log.dnssecOk || log.dnssecValid) { + val dnssecOkay = log.dnssecOk && log.dnssecValid + DetailTextRow( + label = "DNSSEC", + value = if (dnssecOkay) "✓ Valid" else "⚠ Unverified", + tint = if (dnssecOkay) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.tertiary, + ) } - if (b.dnsUnicodeHint.text.isEmpty() && b.dnsQueryType.text.isEmpty()) { - b.dnsSummaryLl.visibility = View.GONE - } else { - b.dnsSummaryLl.visibility = View.VISIBLE + if (hint.isNotEmpty()) { + DetailTextRow(label = "Flags", value = hint, tint = textColor) } - } - private fun dnssecIndicatorRequired(log: DnsLog): Boolean { - // dnssec indicator is shown only for complete transactions - if (log.status != Transaction.Status.COMPLETE.name) { - return false + if (log.blockLists.isNotEmpty()) { + Spacer(Modifier.height(4.dp)) + BlocklistRow(log = log, statusColor = statusColor, onShowBlocklist = onShowBlocklist) } - - return log.dnssecOk || log.dnssecValid } + } +} - private fun dnssecOk(log: DnsLog): Boolean { - // dnssec ok is true only when both dnssecOk and dnssecValid are true - return log.dnssecOk && log.dnssecValid +@Composable +private fun DetailLatencyRow(latency: Long) { + val scheme = MaterialTheme.colorScheme + val successGreen = Color(0xFF2FB36B) + val (barColor, label) = + when { + latency in 1..10 -> successGreen to "${latency}ms · fast" + latency in 11..50 -> scheme.tertiary to "${latency}ms · ok" + latency > 50 -> scheme.error to "${latency}ms · slow" + else -> scheme.onSurfaceVariant to "${latency}ms" } - - private fun isRoundTripShorter(rtt: Long, blocked: Boolean): Boolean { - return rtt in 1..RTT_SHORT_THRESHOLD_MS && !blocked + val fraction = (latency.toFloat() / 100f).coerceIn(0.04f, 1f) + + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { + Text( + text = "Latency", + fontSize = 10.sp, + color = scheme.onSurfaceVariant, + letterSpacing = 0.4.sp, + ) + Text( + text = label, + fontSize = 10.sp, + fontWeight = FontWeight.Medium, + color = barColor, + ) } - private fun containsRelayProxy(rpid: String): Boolean { - return rpid.isNotEmpty() + Box( + modifier = + Modifier + .fillMaxWidth() + .height(3.dp) + .clip(RoundedCornerShape(2.dp)) + .background(scheme.outlineVariant.copy(alpha = 0.35f)), + ) { + Box( + modifier = + Modifier + .fillMaxWidth(fraction) + .fillMaxHeight() + .clip(RoundedCornerShape(2.dp)) + .background( + Brush.horizontalGradient( + listOf(barColor.copy(alpha = 0.7f), barColor), + ), + ), + ) } + } +} - private fun isConnectionProxied(proxy: String?): Boolean { - if (proxy.isNullOrEmpty()) return false - - return ProxyManager.isNotLocalAndRpnProxy(proxy) - } +@Composable +private fun DetailTextRow( + label: String, + value: String, + mono: Boolean = false, + tint: Color, +) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(vertical = 4.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.Top, + ) { + Text( + text = label, + fontSize = 10.sp, + color = MaterialTheme.colorScheme.onSurfaceVariant, + letterSpacing = 0.4.sp, + modifier = Modifier.widthIn(min = 64.dp), + ) + Text( + text = value, + fontSize = 11.sp, + color = tint, + fontFamily = if (mono) FontFamily.Monospace else FontFamily.Default, + fontWeight = FontWeight.Medium, + textAlign = androidx.compose.ui.text.style.TextAlign.End, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f), + ) + } +} - private fun containsMultipleIPs(log: DnsLog): Boolean { - return log.responseIps.split(",").size > 1 +@Composable +private fun BlocklistRow(log: DnsLog, statusColor: Color, onShowBlocklist: (DnsLog) -> Unit) { + val scheme = MaterialTheme.colorScheme + val count = log.blockLists.split(",").filter { it.isNotEmpty() }.size + Row( + modifier = + Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(9.dp)) + .background(scheme.errorContainer.copy(alpha = 0.38f)) + .clickable( + interactionSource = remember { MutableInteractionSource() }, + indication = ripple(color = scheme.error.copy(alpha = 0.16f)), + onClick = { onShowBlocklist(log) }, + ) + .padding(horizontal = 10.dp, vertical = 7.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(6.dp), + ) { + Box( + modifier = + Modifier + .size(5.dp) + .clip(CircleShape) + .background(statusColor), + ) + Text( + text = "$count blocklist${if (count != 1) "s" else ""} matched", + fontSize = 11.sp, + color = scheme.error, + fontWeight = FontWeight.SemiBold, + ) } + Icon( + painter = painterResource(R.drawable.ic_right_arrow_small), + contentDescription = null, + tint = scheme.error.copy(alpha = 0.65f), + modifier = Modifier.size(10.dp), + ) + } +} - private fun isRethinkUsed(log: DnsLog): Boolean { - if (log.status != Transaction.Status.COMPLETE.name) { - return false - } +private fun determineMaybeBlocked(log: DnsLog): Boolean = + log.upstreamBlock || log.blockLists.isNotEmpty() - // now the rethink dns is added as preferred in the backend, instead of separate - // id, so match it with Preferred and BlockFree - return if (isRethinkDns) { - (log.resolverId.contains(Backend.Preferred) || - log.resolverId.contains(Backend.BlockFree)) - } else { - false - } +private fun unicodeHint(context: Context, log: DnsLog, isRethinkDns: Boolean): String { + var hint = "" + if (isRoundTripShorter(log.latency, log.isBlocked)) { + hint = context.getString(R.string.ci_desc, hint, context.getString(R.string.symbol_rocket)) + } + if (containsRelayProxy(log.relayIP)) { + hint = context.getString(R.string.ci_desc, hint, context.getString(R.string.symbol_bunny)) + } else if (isConnectionProxied(log.proxyId)) { + hint = context.getString(R.string.ci_desc, hint, context.getString(R.string.symbol_key)) + } + if (isRethinkUsed(log, isRethinkDns)) { + hint = context.getString(R.string.ci_desc, hint, getRethinkUnicode(context, log)) + } else if (isGoosOrSystemUsed(log)) { + hint = context.getString(R.string.ci_desc, hint, context.getString(R.string.symbol_duck)) + } else if (isDefaultResolverUsed(log)) { + hint = context.getString(R.string.ci_desc, hint, context.getString(R.string.symbol_diamond)) + } else if (containsMultipleIPs(log)) { + hint = context.getString(R.string.ci_desc, hint, context.getString(R.string.symbol_heavy)) + } + if (dnssecIndicatorRequired(log)) { + hint = if (dnssecOk(log)) { + context.getString(R.string.ci_desc, hint, context.getString(R.string.symbol_lock)) + } else { + context.getString(R.string.ci_desc, hint, context.getString(R.string.symbol_unlock)) } + } + return hint +} - private fun isGoosOrSystemUsed(log: DnsLog): Boolean { - if (log.status != Transaction.Status.COMPLETE.name) { - return false +private fun dnsTypeName(context: Context, log: DnsLog, isRethinkDns: Boolean): String = + when (Transaction.TransportType.fromOrdinal(log.dnsType)) { + Transaction.TransportType.DOH -> + if (isRethinkDns && isRethinkUsed(log, isRethinkDns)) { + context.getString(R.string.lbl_rdns) + } else { + context.getString(R.string.other_dns_list_tab1) } + Transaction.TransportType.DNS_CRYPT -> context.getString(R.string.lbl_dc_abbr) + Transaction.TransportType.DNS_PROXY -> context.getString(R.string.lbl_dp) + Transaction.TransportType.DOT -> context.getString(R.string.lbl_dot) + Transaction.TransportType.ODOH -> context.getString(R.string.lbl_odoh) + } - return log.resolverId.contains(Backend.Goos) || log.resolverId.contains(Backend.System) - } +private fun dnssecIndicatorRequired(log: DnsLog) = + log.status == Transaction.Status.COMPLETE.name && (log.dnssecOk || log.dnssecValid) - private fun isDefaultResolverUsed(log: DnsLog): Boolean { - if (log.status != Transaction.Status.COMPLETE.name) { - return false - } +private fun dnssecOk(log: DnsLog) = log.dnssecOk && log.dnssecValid - // ideally bootstrap will not be sent from go-tun, just in case check for it - return log.resolverId.contains(Backend.Default) || log.resolverId.contains(Backend.Bootstrap) - } +private fun isRoundTripShorter(rtt: Long, blocked: Boolean) = rtt in 1..10 && !blocked - private fun getRethinkUnicode(log: DnsLog): String { - // resolver check for rethink dns is done before calling this method - if (log.relayIP.endsWith(Backend.RPN) || log.relayIP == Backend.Auto) return context.getString( - R.string.symbol_sparkle - ) +private fun containsRelayProxy(rpid: String) = rpid.isNotEmpty() - return if (log.serverIP.contains(MAX_ENDPOINT)) { - context.getString(R.string.symbol_max) - } else { - context.getString(R.string.symbol_sky) - } - } +private fun isConnectionProxied(proxy: String?): Boolean { + if (proxy.isNullOrEmpty()) return false + return ProxyManager.isNotLocalAndRpnProxy(proxy) +} - private fun displayAppDetails(log: DnsLog) { - if (log.appName.isEmpty()) { - b.dnsAppName.text = context.getString(R.string.network_log_app_name_unknown).uppercase() - } else { - b.dnsAppName.text = log.appName - } - if (log.packageName.isEmpty() || log.packageName == Constants.EMPTY_PACKAGE_NAME) { - loadAppIcon(getDefaultIcon(context)) - } else { - loadAppIcon(getIcon(context, log.packageName)) - } - return - } +private fun containsMultipleIPs(log: DnsLog) = log.responseIps.split(",").size > 1 - private fun loadAppIcon(drawable: Drawable?) { - Glide.with(context) - .load(drawable) - .error(getDefaultIcon(context)) - .into(b.dnsAppIcon) - } +private fun isRethinkUsed(log: DnsLog, isRethinkDns: Boolean): Boolean { + if (log.status != Transaction.Status.COMPLETE.name) return false + return isRethinkDns && + (log.resolverId.contains(Backend.Preferred) || log.resolverId.contains(Backend.BlockFree)) +} - private fun displayIcon(log: DnsLog) { - b.dnsFlag.text = log.flag - b.dnsFlag.visibility = View.VISIBLE - b.dnsFavIcon.visibility = View.GONE - if (!loadFavIcon || log.groundedQuery()) { - clearFavIcon() - return - } +private fun isGoosOrSystemUsed(log: DnsLog): Boolean { + if (log.status != Transaction.Status.COMPLETE.name) return false + return log.resolverId.contains(Backend.Goos) || log.resolverId.contains(Backend.System) +} - // no need to check in glide cache if the value is available in failed cache - if ( - FavIconDownloader.isUrlAvailableInFailedCache(log.queryStr.dropLast(1)) != null - ) { - hideFavIcon() - showFlag() - } else { - // Glide will cache the icons against the urls. To extract the fav icon from the - // cache, first verify that the cache is available with the next dns url. - // If it is not available then glide will throw an error, do the duckduckgo - // url check in that case. - displayNextDnsFavIcon(log) - } - } +private fun isDefaultResolverUsed(log: DnsLog): Boolean { + if (log.status != Transaction.Status.COMPLETE.name) return false + return log.resolverId.contains(Backend.Default) || log.resolverId.contains(Backend.Bootstrap) +} - private fun displayDnsType(log: DnsLog) { - val type = Transaction.TransportType.fromOrdinal(log.dnsType) - when (type) { - Transaction.TransportType.DOH -> { - if (isRethinkDns && isRethinkUsed(log)) { - b.dnsTypeName.text = context.getString(R.string.lbl_rdns) - } else { - b.dnsTypeName.text = context.getString(R.string.other_dns_list_tab1) - } - } - Transaction.TransportType.DNS_CRYPT -> { - b.dnsTypeName.text = context.getString(R.string.lbl_dc_abbr) - } - Transaction.TransportType.DNS_PROXY -> { - b.dnsTypeName.text = context.getString(R.string.lbl_dp) - } - Transaction.TransportType.DOT -> { - b.dnsTypeName.text = context.getString(R.string.lbl_dot) - } - Transaction.TransportType.ODOH -> { - b.dnsTypeName.text = context.getString(R.string.lbl_odoh) - } - } - } +private fun getRethinkUnicode(context: Context, log: DnsLog): String { + if (log.relayIP.endsWith(Backend.RPN) || log.relayIP == Backend.Auto) { + return context.getString(R.string.symbol_sparkle) + } + return if (log.serverIP.contains(MAX_ENDPOINT)) { + context.getString(R.string.symbol_max) + } else { + context.getString(R.string.symbol_sky) + } +} - private fun clearFavIcon() { - Glide.with(context.applicationContext).clear(b.dnsFavIcon) - } +private fun displayFavIcon( + context: Context, + log: DnsLog, + loadFavIcon: Boolean, + onShowFlag: () -> Unit, + onShowFav: (Drawable) -> Unit, +) { + if (!loadFavIcon || log.groundedQuery()) { + onShowFlag() + return + } + if (FavIconDownloader.isUrlAvailableInFailedCache(log.queryStr.dropLast(1)) != null) { + onShowFlag() + return + } + displayNextDnsFavIcon(context, log, onShowFlag, onShowFav) +} - private fun displayNextDnsFavIcon(log: DnsLog) { - val trim = log.queryStr.dropLastWhile { it == '.' } - // url to check if the icon is cached from nextdns - val nextDnsUrl = FavIconDownloader.constructFavIcoUrlNextDns(trim) - // url to check if the icon is cached from duckduckgo - val duckduckGoUrl = FavIconDownloader.constructFavUrlDuckDuckGo(trim) - // subdomain to check if the icon is cached from duckduckgo - val duckduckgoDomainURL = FavIconDownloader.getDomainUrlFromFdqnDuckduckgo(trim) - try { - val factory = DrawableCrossFadeFactory.Builder().setCrossFadeEnabled(true).build() - Glide.with(context.applicationContext) - .load(nextDnsUrl) - .onlyRetrieveFromCache(true) - .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC) - .error( - // on error, check if the icon is stored in the name of duckduckgo url - displayDuckduckgoFavIcon(duckduckGoUrl, duckduckgoDomainURL) - ) - .transition(withCrossFade(factory)) - .into( - object : CustomViewTarget(b.dnsFavIcon) { - override fun onLoadFailed(errorDrawable: Drawable?) { - showFlag() - hideFavIcon() - } - - override fun onResourceReady( - resource: Drawable, - transition: Transition? - ) { - hideFlag() - showFavIcon(resource) - } - - override fun onResourceCleared(placeholder: Drawable?) { - hideFavIcon() - showFlag() - } - } - ) - } catch (_: Exception) { - Logger.d(LOG_TAG_DNS, "err loading icon, load flag instead") - displayDuckduckgoFavIcon(duckduckGoUrl, duckduckgoDomainURL) - } - } +private fun displayNextDnsFavIcon( + context: Context, + log: DnsLog, + onShowFlag: () -> Unit, + onShowFav: (Drawable) -> Unit, +) { + val trim = log.queryStr.dropLastWhile { it == '.' } + val nextDnsUrl = FavIconDownloader.constructFavIcoUrlNextDns(trim) + val duckduckGoUrl = FavIconDownloader.constructFavUrlDuckDuckGo(trim) + val duckDomainUrl = FavIconDownloader.getDomainUrlFromFdqnDuckduckgo(trim) + + try { + val factory = DrawableCrossFadeFactory.Builder().setCrossFadeEnabled(true).build() + Glide.with(context.applicationContext) + .load(nextDnsUrl) + .onlyRetrieveFromCache(true) + .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC) + .transition(withCrossFade(factory)) + .into( + object : CustomTarget() { + override fun onLoadFailed(e: Drawable?) = + displayDuckduckgoFavIcon( + context, + duckduckGoUrl, + duckDomainUrl, + onShowFlag, + onShowFav, + ) - /** - * Loads the fav icons from the cache, the icons are cached by favIconDownloader. On - * failure, will check if there is a icon for top level domain is available in cache. Else, - * will show the Flag. - * - * This method will be executed only when show fav icon setting is turned on. - */ - private fun displayDuckduckgoFavIcon(url: String, subDomainURL: String) { - try { - val factory = DrawableCrossFadeFactory.Builder().setCrossFadeEnabled(true).build() - Glide.with(context.applicationContext) - .load(url) - .onlyRetrieveFromCache(true) - .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC) - .error( - Glide.with(context.applicationContext) - .load(subDomainURL) - .onlyRetrieveFromCache(true) - ) - .transition(withCrossFade(factory)) - .into( - object : CustomViewTarget(b.dnsFavIcon) { - override fun onLoadFailed(errorDrawable: Drawable?) { - showFlag() - hideFavIcon() - } - - override fun onResourceReady( - resource: Drawable, - transition: Transition? - ) { - hideFlag() - showFavIcon(resource) - } - - override fun onResourceCleared(placeholder: Drawable?) { - hideFavIcon() - showFlag() - } - } - ) - } catch (_: Exception) { - Logger.d(LOG_TAG_DNS, "$TAG err loading icon, load flag instead") - showFlag() - hideFavIcon() - } - } + override fun onResourceReady(r: Drawable, t: Transition?) = onShowFav(r) - private fun showFavIcon(drawable: Drawable) { - b.dnsFavIcon.visibility = View.VISIBLE - b.dnsFavIcon.setImageDrawable(drawable) - } + override fun onLoadCleared(p: Drawable?) = onShowFlag() + }, + ) + } catch (_: Exception) { + Napier.d("err loading icon, load flag instead") + displayDuckduckgoFavIcon(context, duckduckGoUrl, duckDomainUrl, onShowFlag, onShowFav) + } +} - private fun hideFavIcon() { - b.dnsFavIcon.visibility = View.GONE - b.dnsFavIcon.setImageDrawable(null) - } +private fun displayDuckduckgoFavIcon( + context: Context, + url: String, + subDomainURL: String, + onShowFlag: () -> Unit, + onShowFav: (Drawable) -> Unit, +) { + try { + val factory = DrawableCrossFadeFactory.Builder().setCrossFadeEnabled(true).build() + Glide.with(context.applicationContext) + .load(url) + .onlyRetrieveFromCache(true) + .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC) + .error( + Glide.with(context.applicationContext).load(subDomainURL).onlyRetrieveFromCache(true), + ) + .transition(withCrossFade(factory)) + .into( + object : CustomTarget() { + override fun onLoadFailed(e: Drawable?) = onShowFlag() - private fun showFlag() { - b.dnsFlag.visibility = View.VISIBLE - } + override fun onResourceReady(r: Drawable, t: Transition?) = onShowFav(r) - private fun hideFlag() { - b.dnsFlag.visibility = View.GONE - } + override fun onLoadCleared(p: Drawable?) = onShowFlag() + }, + ) + } catch (_: Exception) { + Napier.d("err loading icon, load flag instead") + onShowFlag() } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/DnsProxyEndpointAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/DnsProxyEndpointAdapter.kt index deadb345f..ed424ec11 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/DnsProxyEndpointAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/DnsProxyEndpointAdapter.kt @@ -16,219 +16,118 @@ limitations under the License. package com.celzero.bravedns.adapter -import android.content.Context -import android.content.DialogInterface -import android.view.LayoutInflater -import android.view.ViewGroup -import android.widget.Toast -import androidx.appcompat.content.res.AppCompatResources -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.R import com.celzero.bravedns.data.AppConfig import com.celzero.bravedns.database.DnsProxyEndpoint -import com.celzero.bravedns.databinding.DnsProxyListItemBinding import com.celzero.bravedns.service.FirewallManager -import com.celzero.bravedns.util.UIUtils.clipboardCopy -import com.celzero.bravedns.util.Utilities -import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class DnsProxyEndpointAdapter( - private val context: Context, - val lifecycleOwner: LifecycleOwner, - private val appConfig: AppConfig -) : - PagingDataAdapter( - DIFF_CALLBACK - ) { +private const val TAG = "DnsProxyEndpointAdapter" - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - oldConnection: DnsProxyEndpoint, - newConnection: DnsProxyEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected == newConnection.isSelected) - } - - override fun areContentsTheSame( - oldConnection: DnsProxyEndpoint, - newConnection: DnsProxyEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected != newConnection.isSelected) - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DnsProxyEndpointViewHolder { - val itemBinding = - DnsProxyListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) - return DnsProxyEndpointViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: DnsProxyEndpointViewHolder, position: Int) { - val dnsProxyEndpoint: DnsProxyEndpoint = getItem(position) ?: return - holder.update(dnsProxyEndpoint) - } - - inner class DnsProxyEndpointViewHolder(private val b: DnsProxyListItemBinding) : - RecyclerView.ViewHolder(b.root) { - - fun update(endpoint: DnsProxyEndpoint) { - displayDetails(endpoint) - setupClickListeners(endpoint) - } - - private fun setupClickListeners(endpoint: DnsProxyEndpoint) { - b.root.setOnClickListener { updateDnsProxyDetails(endpoint) } +@Composable +fun DnsProxyEndpointRow(endpoint: DnsProxyEndpoint, appConfig: AppConfig) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + var explanation by remember(endpoint.id) { mutableStateOf("") } + var infoDialog by remember(endpoint.id) { mutableStateOf(null) } + var deleteDialog by remember(endpoint.id) { mutableStateOf(null) } - b.dnsProxyListActionImage.setOnClickListener { promptUser(endpoint) } - - b.dnsProxyListCheckImage.setOnClickListener { updateDnsProxyDetails(endpoint) } - - b.root.setOnClickListener { updateDnsProxyDetails(endpoint) } - - b.dnsProxyListActionImage.setOnClickListener { promptUser(endpoint) } - - b.dnsProxyListCheckImage.setOnClickListener { updateDnsProxyDetails(endpoint) } - } - - private fun displayDetails(endpoint: DnsProxyEndpoint) { - b.dnsProxyListUrlName.text = endpoint.proxyName - b.dnsProxyListCheckImage.isChecked = endpoint.isSelected - - io { - val appInfo = FirewallManager.getAppInfoByPackage(endpoint.proxyAppName) - uiCtx { - val appName = - if ( - endpoint.proxyName != - context.getString(R.string.cd_custom_dns_proxy_default_app) - ) { - appInfo?.appName - ?: context.getString(R.string.cd_custom_dns_proxy_default_app) - } else { - endpoint.proxyAppName - ?: context.getString(R.string.cd_custom_dns_proxy_default_app) - } - - b.dnsProxyListUrlExplanation.text = - endpoint.getExplanationText(context, appName) - } + LaunchedEffect(endpoint.id, endpoint.proxyName, endpoint.proxyAppName) { + val appName = + withContext(Dispatchers.IO) { + FirewallManager.getAppInfoByPackage(endpoint.proxyAppName)?.appName } - - if (endpoint.isDeletable()) { - b.dnsProxyListActionImage.setImageDrawable( - AppCompatResources.getDrawable(context, R.drawable.ic_fab_uninstall) - ) + val defaultName = context.getString(R.string.cd_custom_dns_proxy_default_app) + val resolvedAppName = + if (endpoint.proxyName != defaultName) { + appName ?: defaultName } else { - b.dnsProxyListActionImage.setImageDrawable( - AppCompatResources.getDrawable(context, R.drawable.ic_info) - ) + endpoint.proxyAppName ?: defaultName } - } + explanation = endpoint.getExplanationText(context, resolvedAppName) } - private fun promptUser(endpoint: DnsProxyEndpoint) { - if (endpoint.isDeletable()) showDeleteDialog(endpoint) - else { - io { - val app = FirewallManager.getAppInfoByPackage(endpoint.getPackageName())?.appName - uiCtx { - showDetailsDialog( - endpoint.proxyName, - endpoint.proxyIP, - endpoint.proxyPort.toString(), - app + DnsEndpointRow( + title = endpoint.proxyName, + supporting = explanation.ifEmpty { null }, + selected = endpoint.isSelected, + action = if (endpoint.isDeletable()) DnsRowAction.Delete else DnsRowAction.Info, + selection = DnsRowSelection.Radio, + onActionClick = { + if (endpoint.isDeletable()) { + deleteDialog = + DnsDeleteDialogModel( + id = endpoint.id, + titleRes = R.string.dns_proxy_remove_dialog_title, + messageRes = R.string.dns_proxy_remove_dialog_message, + successRes = R.string.dns_proxy_remove_success ) + } else { + scope.launch(Dispatchers.IO) { + val app = + FirewallManager.getAppInfoByPackage(endpoint.getPackageName())?.appName + val message = + if (!app.isNullOrEmpty()) { + context.getString( + R.string.dns_proxy_dialog_message, + app, + endpoint.proxyIP, + endpoint.proxyPort.toString() + ) + } else { + context.getString( + R.string.dns_proxy_dialog_message_no_app, + endpoint.proxyIP, + endpoint.proxyPort.toString() + ) + } + withContext(Dispatchers.Main) { + infoDialog = + DnsInfoDialogModel( + title = endpoint.proxyName, + message = message, + copyValue = endpoint.proxyIP, + copyToastRes = R.string.info_dialog_copy_toast_msg + ) + } } } - } - } - - private fun showDetailsDialog(title: String, ip: String?, port: String, app: String?) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(title) - - if (!app.isNullOrEmpty()) { - builder.setMessage(context.getString(R.string.dns_proxy_dialog_message, app, ip, port)) - } else { - builder.setMessage( - context.getString(R.string.dns_proxy_dialog_message_no_app, ip, port) - ) - } - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.dns_info_positive)) { - dialogInterface, - _ -> - dialogInterface.dismiss() - } - builder.setNeutralButton(context.getString(R.string.dns_info_neutral)) { - _: DialogInterface, - _: Int -> - if (ip != null) { - clipboardCopy(context, ip, context.getString(R.string.copy_clipboard_label)) - Utilities.showToastUiCentered( - context, - context.getString(R.string.info_dialog_copy_toast_msg), - Toast.LENGTH_SHORT - ) - } else { - // no op: Copy functionality is for the Ip of the endpoint, no operation needed - // when the ip is not available for endpoint. + }, + onSelectionChange = { + launchDnsEndpointSelectionUpdate(scope, context, TAG) { + endpoint.isSelected = true + appConfig.handleDnsProxyChanges(endpoint) } } - builder.create().show() - } - - private fun showDeleteDialog(dnsProxyEndpoint: DnsProxyEndpoint) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(R.string.dns_proxy_remove_dialog_title) - builder.setMessage(R.string.dns_proxy_remove_dialog_message) - - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.lbl_delete)) { _, _ -> - deleteProxyEndpoint(dnsProxyEndpoint.id) - } - - builder.setNegativeButton(context.getString(R.string.lbl_cancel)) { _, _ -> } - builder.create().show() - } - - private fun updateDnsProxyDetails(endpoint: DnsProxyEndpoint) { - io { - endpoint.isSelected = true - appConfig.handleDnsProxyChanges(endpoint) - } - } - - private fun deleteProxyEndpoint(id: Int) { - io { - appConfig.deleteDnsProxyEndpoint(id) - uiCtx { - Utilities.showToastUiCentered( - context, - context.getString(R.string.dns_proxy_remove_success), - Toast.LENGTH_SHORT - ) + ) + + deleteDialog?.let { model -> + DnsDeleteDialog( + model = model, + onDismiss = { deleteDialog = null }, + onConfirm = { id -> + launchDnsEndpointDelete(scope, context, model.successRes) { + appConfig.deleteDnsProxyEndpoint(id) + } + deleteDialog = null } - } - } - - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } + ) } - private fun io(f: suspend () -> Unit) { - lifecycleOwner.lifecycleScope.launch { withContext(Dispatchers.IO) { f() } } + infoDialog?.let { model -> + DnsInfoDialog( + model = model, + onDismiss = { infoDialog = null } + ) } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/DoTEndpointAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/DoTEndpointAdapter.kt index 7c5c330c1..c20b3796a 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/DoTEndpointAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/DoTEndpointAdapter.kt @@ -16,256 +16,99 @@ limitations under the License. package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_DNS -import android.content.Context -import android.content.DialogInterface -import android.view.LayoutInflater -import android.view.ViewGroup -import android.widget.Toast -import androidx.core.content.ContextCompat -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.findViewTreeLifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.R import com.celzero.bravedns.data.AppConfig import com.celzero.bravedns.database.DoTEndpoint -import com.celzero.bravedns.databinding.ListItemEndpointBinding -import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.util.UIUtils.clipboardCopy -import com.celzero.bravedns.util.UIUtils.getDnsStatusStringRes -import com.celzero.bravedns.util.Utilities -import com.celzero.firestack.backend.Backend -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -class DoTEndpointAdapter(private val context: Context, private val appConfig: AppConfig) : - PagingDataAdapter(DIFF_CALLBACK) { - - var lifecycleOwner: LifecycleOwner? = null - - companion object { - private const val ONE_SEC = 1000L - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - oldConnection: DoTEndpoint, - newConnection: DoTEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected == newConnection.isSelected) - } - - override fun areContentsTheSame( - oldConnection: DoTEndpoint, - newConnection: DoTEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected != newConnection.isSelected) - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DoTEndpointViewHolder { - val itemBinding = - ListItemEndpointBinding.inflate(LayoutInflater.from(parent.context), parent, false) - lifecycleOwner = parent.findViewTreeLifecycleOwner() - return DoTEndpointViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: DoTEndpointViewHolder, position: Int) { - val endpoint: DoTEndpoint = getItem(position) ?: return - holder.update(endpoint) - } - - inner class DoTEndpointViewHolder(private val b: ListItemEndpointBinding) : - RecyclerView.ViewHolder(b.root) { - private var statusCheckJob: Job? = null - - fun update(endpoint: DoTEndpoint) { - displayDetails(endpoint) - setupClickListeners(endpoint) - } - - private fun setupClickListeners(endpoint: DoTEndpoint) { - b.root.setOnClickListener { updateConnection(endpoint) } - b.endpointInfoImg.setOnClickListener { showExplanationOnImageClick(endpoint) } - b.endpointCheck.setOnClickListener { updateConnection(endpoint) } - } - - private fun displayDetails(endpoint: DoTEndpoint) { - if (endpoint.isSecure) { - b.endpointName.text = endpoint.name - } else { - b.endpointName.text = - context.getString( - R.string.ci_desc, - endpoint.name, - context.getString(R.string.lbl_insecure) - ) - } - b.endpointCheck.isChecked = endpoint.isSelected - - if (endpoint.isSelected && VpnController.hasTunnel() && !appConfig.isSmartDnsEnabled()) { - keepSelectedStatusUpdated() - } else if (endpoint.isSelected) { - b.endpointDesc.text = context.getString(R.string.rt_filter_parent_selected) - } else { - b.endpointDesc.text = "" - } - - // Shows either the info/delete icon for the DoH entries. - showIcon(endpoint) - } - - private fun keepSelectedStatusUpdated() { - statusCheckJob = ui { - while (true) { - updateSelectedStatus() - delay(ONE_SEC) - } - } - } - - private fun updateSelectedStatus() { - // if the view is not active then cancel the job - if ( - lifecycleOwner - ?.lifecycle - ?.currentState - ?.isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED) == false || - bindingAdapterPosition == RecyclerView.NO_POSITION - ) { - statusCheckJob?.cancel() - return - } - - updateDnsStatus() - } - - private fun updateDnsStatus() { - io { - val state = VpnController.getDnsStatus(Backend.Preferred) - val status = getDnsStatusStringRes(state) - uiCtx { - b.endpointDesc.text = context.getString(status).replaceFirstChar(Char::titlecase) - } - } +private const val TAG = "DoTEndpointAdapter" + +@Composable +fun DoTEndpointRow(endpoint: DoTEndpoint, appConfig: AppConfig) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val explanation = + rememberDnsStatusExplanation( + key = endpoint.id, + isSelected = endpoint.isSelected, + smartDnsEnabled = appConfig.isSmartDnsEnabled(), + tag = TAG + ) + var infoDialog by remember(endpoint.id) { mutableStateOf(null) } + var deleteDialog by remember(endpoint.id) { mutableStateOf(null) } + + val name = + if (endpoint.isSecure) { + endpoint.name + } else { + context.getString( + R.string.ci_desc, + endpoint.name, + context.getString(R.string.lbl_insecure) + ) } - private fun showIcon(endpoint: DoTEndpoint) { + DnsEndpointRow( + title = name, + supporting = explanation.ifEmpty { null }, + selected = endpoint.isSelected, + action = if (endpoint.isDeletable()) DnsRowAction.Delete else DnsRowAction.Info, + selection = DnsRowSelection.Radio, + onActionClick = { if (endpoint.isDeletable()) { - b.endpointInfoImg.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_fab_uninstall) - ) + deleteDialog = + DnsDeleteDialogModel( + id = endpoint.id, + titleRes = R.string.doh_custom_url_remove_dialog_title, + messageRes = R.string.dot_custom_url_remove_dialog_message, + successRes = R.string.doh_custom_url_remove_success + ) } else { - b.endpointInfoImg.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_info) - ) + val description = + if (endpoint.desc.isNullOrEmpty()) { + endpoint.url + } else { + endpoint.url + "\n\n" + resolveDnsDescriptionText(context, endpoint.desc) + } + infoDialog = + DnsInfoDialogModel( + title = endpoint.name, + message = description, + copyValue = endpoint.url + ) } - } - - private fun updateConnection(endpoint: DoTEndpoint) { - Logger.d( - LOG_TAG_DNS, - "on dot change - ${endpoint.name}, ${endpoint.url}, ${endpoint.isSelected}" - ) - io { + }, + onSelectionChange = { + launchDnsEndpointSelectionUpdate(scope, context, TAG) { endpoint.isSelected = true appConfig.handleDoTChanges(endpoint) } } + ) - private fun deleteEndpoint(id: Int) { - io { - appConfig.deleteDoTEndpoint(id) - uiCtx { - Utilities.showToastUiCentered( - context, - context.getString(R.string.doh_custom_url_remove_success), - Toast.LENGTH_SHORT - ) + deleteDialog?.let { model -> + DnsDeleteDialog( + model = model, + onDismiss = { deleteDialog = null }, + onConfirm = { id -> + launchDnsEndpointDelete(scope, context, model.successRes) { + appConfig.deleteDoTEndpoint(id) } + deleteDialog = null } - } - - private fun showExplanationOnImageClick(endpoint: DoTEndpoint) { - if (endpoint.isDeletable()) showDeleteDialog(endpoint.id) - else showDoTMetadataDialog(endpoint.name, endpoint.url, endpoint.desc) - } - - private fun showDoTMetadataDialog(title: String, url: String, message: String?) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(title) - builder.setMessage(url + "\n\n" + getDnsDesc(message)) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.dns_info_positive)) { - dialogInterface, - _ -> - dialogInterface.dismiss() - } - builder.setNeutralButton(context.getString(R.string.dns_info_neutral)) { - _: DialogInterface, - _: Int -> - clipboardCopy(context, url, context.getString(R.string.copy_clipboard_label)) - Utilities.showToastUiCentered( - context, - context.getString(R.string.info_dialog_url_copy_toast_msg), - Toast.LENGTH_SHORT - ) - } - builder.create().show() - } - - private fun getDnsDesc(message: String?): String { - if (message.isNullOrEmpty()) return "" - - return try { - if (message.contains("R.string.")) { - val m = message.substringAfter("R.string.") - val resId: Int = - context.resources.getIdentifier(m, "string", context.packageName) - context.getString(resId) - } else { - message - } - } catch (_: Exception) { - "" - } - } - - private fun showDeleteDialog(id: Int) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(R.string.dot_custom_url_remove_dialog_title) - builder.setMessage(R.string.dot_custom_url_remove_dialog_message) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.lbl_delete)) { _, _ -> - deleteEndpoint(id) - } - - builder.setNegativeButton(context.getString(R.string.lbl_cancel)) { _, _ -> - // no-op - } - builder.create().show() - } - - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } - } - - private fun ui(f: suspend () -> Unit): Job? { - return lifecycleOwner?.lifecycleScope?.launch { withContext(Dispatchers.Main) { f() } } - } + ) + } - private fun io(f: suspend () -> Unit) { - lifecycleOwner?.lifecycleScope?.launch { withContext(Dispatchers.IO) { f() } } - } + infoDialog?.let { model -> + DnsInfoDialog( + model = model, + onDismiss = { infoDialog = null } + ) } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/DohEndpointAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/DohEndpointAdapter.kt index 1622404d8..d931b7429 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/DohEndpointAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/DohEndpointAdapter.kt @@ -16,252 +16,99 @@ limitations under the License. package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_DNS -import android.content.Context -import android.content.DialogInterface -import android.view.LayoutInflater -import android.view.ViewGroup -import android.widget.Toast -import androidx.core.content.ContextCompat -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.findViewTreeLifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.R import com.celzero.bravedns.data.AppConfig import com.celzero.bravedns.database.DoHEndpoint -import com.celzero.bravedns.databinding.ListItemEndpointBinding -import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.util.UIUtils.clipboardCopy -import com.celzero.bravedns.util.UIUtils.getDnsStatusStringRes -import com.celzero.bravedns.util.Utilities -import com.celzero.firestack.backend.Backend -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -class DohEndpointAdapter(private val context: Context, private val appConfig: AppConfig) : - PagingDataAdapter(DIFF_CALLBACK) { - - var lifecycleOwner: LifecycleOwner? = null - - companion object { - private const val ONE_SEC = 1000L - private const val TAG = "DohEndpointAdapter" - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - oldConnection: DoHEndpoint, - newConnection: DoHEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected == newConnection.isSelected) - } - - override fun areContentsTheSame( - oldConnection: DoHEndpoint, - newConnection: DoHEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected != newConnection.isSelected) - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DoHEndpointViewHolder { - val itemBinding = - ListItemEndpointBinding.inflate(LayoutInflater.from(parent.context), parent, false) - lifecycleOwner = parent.findViewTreeLifecycleOwner() - return DoHEndpointViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: DoHEndpointViewHolder, position: Int) { - val doHEndpoint: DoHEndpoint = getItem(position) ?: return - holder.update(doHEndpoint) - } - - inner class DoHEndpointViewHolder(private val b: ListItemEndpointBinding) : - RecyclerView.ViewHolder(b.root) { - private var statusCheckJob: Job? = null - - fun update(endpoint: DoHEndpoint) { - displayDetails(endpoint) - setupClickListeners(endpoint) - } - - private fun setupClickListeners(endpoint: DoHEndpoint) { - b.root.setOnClickListener { updateConnection(endpoint) } - b.endpointInfoImg.setOnClickListener { showExplanationOnImageClick(endpoint) } - b.endpointCheck.setOnClickListener { updateConnection(endpoint) } - } - - private fun displayDetails(endpoint: DoHEndpoint) { - if (endpoint.isSecure) { - b.endpointName.text = endpoint.dohName - } else { - b.endpointName.text = - context.getString( - R.string.ci_desc, - endpoint.dohName, - context.getString(R.string.lbl_insecure) - ) - } - b.endpointCheck.isChecked = endpoint.isSelected - if (endpoint.isSelected && VpnController.hasTunnel() && !appConfig.isSmartDnsEnabled()) { - keepSelectedStatusUpdated() - } else if (endpoint.isSelected) { - b.endpointDesc.text = context.getString(R.string.rt_filter_parent_selected) - } else { - b.endpointDesc.text = "" - } - - // Shows either the info/delete icon for the DoH entries. - showIcon(endpoint) - } - - private fun keepSelectedStatusUpdated() { - statusCheckJob = ui { - while (true) { - updateSelectedStatus() - delay(ONE_SEC) - } - } - } - - private fun updateSelectedStatus() { - // if the view is not active then cancel the job - if ( - lifecycleOwner - ?.lifecycle - ?.currentState - ?.isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED) == false || - bindingAdapterPosition == RecyclerView.NO_POSITION - ) { - statusCheckJob?.cancel() - return - } - - updateDnsStatus() - } - - private fun updateDnsStatus() { - io { - // always use the id as Dnsx.Preffered as it is the primary dns id for now - val state = VpnController.getDnsStatus(Backend.Preferred) - val status = getDnsStatusStringRes(state) - uiCtx { - b.endpointDesc.text = - context.getString(status).replaceFirstChar(Char::titlecase) - } - } - } - - private fun showIcon(endpoint: DoHEndpoint) { +private const val TAG = "DohEndpointAdapter" + +@Composable +fun DoHEndpointRow(endpoint: DoHEndpoint, appConfig: AppConfig) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val explanation = + rememberDnsStatusExplanation( + key = endpoint.id, + isSelected = endpoint.isSelected, + smartDnsEnabled = appConfig.isSmartDnsEnabled(), + tag = TAG + ) + var infoDialog by remember(endpoint.id) { mutableStateOf(null) } + var deleteDialog by remember(endpoint.id) { mutableStateOf(null) } + + val name = + if (endpoint.isSecure) { + endpoint.dohName + } else { + context.getString( + R.string.ci_desc, + endpoint.dohName, + context.getString(R.string.lbl_insecure) + ) + } + DnsEndpointRow( + title = name, + supporting = explanation.ifEmpty { null }, + selected = endpoint.isSelected, + action = if (endpoint.isDeletable()) DnsRowAction.Delete else DnsRowAction.Info, + selection = DnsRowSelection.Radio, + onActionClick = { if (endpoint.isDeletable()) { - b.endpointInfoImg.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_fab_uninstall) - ) + deleteDialog = + DnsDeleteDialogModel( + id = endpoint.id, + titleRes = R.string.doh_custom_url_remove_dialog_title, + messageRes = R.string.doh_custom_url_remove_dialog_message, + successRes = R.string.doh_custom_url_remove_success + ) } else { - b.endpointInfoImg.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_info) - ) + val description = + if (endpoint.dohExplanation.isNullOrEmpty()) { + endpoint.dohURL + } else { + endpoint.dohURL + "\n\n" + + resolveDnsDescriptionText(context, endpoint.dohExplanation) + } + infoDialog = + DnsInfoDialogModel( + title = endpoint.dohName, + message = description, + copyValue = endpoint.dohURL + ) } - } - - private fun updateConnection(endpoint: DoHEndpoint) { - Logger.d(LOG_TAG_DNS, "$TAG update doh; ${endpoint.dohName}, ${endpoint.dohURL}, ${endpoint.isSelected}") - io { + }, + onSelectionChange = { + launchDnsEndpointSelectionUpdate(scope, context, TAG) { endpoint.isSelected = true appConfig.handleDoHChanges(endpoint) } } + ) - private fun deleteEndpoint(id: Int) { - io { - Logger.i(LOG_TAG_DNS, "$TAG delete endpoint; $id") - appConfig.deleteDohEndpoint(id) - uiCtx { - Utilities.showToastUiCentered( - context, - context.getString(R.string.doh_custom_url_remove_success), - Toast.LENGTH_SHORT - ) - } - } - } - - private fun showExplanationOnImageClick(endpoint: DoHEndpoint) { - if (endpoint.isDeletable()) showDeleteDnsDialog(endpoint.id) - else showDohMetadataDialog(endpoint.dohName, endpoint.dohURL, endpoint.dohExplanation) - } - - private fun showDohMetadataDialog(title: String, url: String, message: String?) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(title) - builder.setMessage(url + "\n\n" + getDnsDesc(message)) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.dns_info_positive)) { dialogInterface, _ -> - dialogInterface.dismiss() - } - builder.setNeutralButton(context.getString(R.string.dns_info_neutral)) { _: DialogInterface, _: Int -> - clipboardCopy(context, url, context.getString(R.string.copy_clipboard_label)) - Utilities.showToastUiCentered( - context, - context.getString(R.string.info_dialog_url_copy_toast_msg), - Toast.LENGTH_SHORT - ) - } - builder.create().show() - } - - private fun getDnsDesc(message: String?): String { - if (message.isNullOrEmpty()) return "" - - return try { - if (message.contains("R.string.")) { - val m = message.substringAfter("R.string.") - val resId: Int = - context.resources.getIdentifier(m, "string", context.packageName) - context.getString(resId) - } else { - message + deleteDialog?.let { model -> + DnsDeleteDialog( + model = model, + onDismiss = { deleteDialog = null }, + onConfirm = { id -> + launchDnsEndpointDelete(scope, context, model.successRes) { + appConfig.deleteDohEndpoint(id) } - } catch (_: Exception) { - "" - } - } - - private fun showDeleteDnsDialog(id: Int) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(R.string.doh_custom_url_remove_dialog_title) - builder.setMessage(R.string.doh_custom_url_remove_dialog_message) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.lbl_delete)) { _, _ -> - deleteEndpoint(id) - } - - builder.setNegativeButton(context.getString(R.string.lbl_cancel)) { _, _ -> - // no-op + deleteDialog = null } - builder.create().show() - } - - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } - } - - private fun ui(f: suspend () -> Unit): Job? { - return lifecycleOwner?.lifecycleScope?.launch { withContext(Dispatchers.Main) { f() } } - } + ) + } - private fun io(f: suspend () -> Unit) { - lifecycleOwner?.lifecycleScope?.launch { withContext(Dispatchers.IO) { f() } } - } + infoDialog?.let { model -> + DnsInfoDialog( + model = model, + onDismiss = { infoDialog = null } + ) } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/DomainConnectionsAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/DomainConnectionsAdapter.kt index c76385dd0..5e0a44d77 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/DomainConnectionsAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/DomainConnectionsAdapter.kt @@ -15,163 +15,106 @@ */ package com.celzero.bravedns.adapter -import android.content.Context import android.content.Intent -import android.graphics.drawable.Drawable -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.R import com.celzero.bravedns.data.AppConnection -import com.celzero.bravedns.databinding.ListItemStatisticsSummaryBinding import com.celzero.bravedns.service.FirewallManager -import com.celzero.bravedns.ui.activity.AppInfoActivity -import com.celzero.bravedns.ui.activity.DomainConnectionsActivity -import com.celzero.bravedns.ui.activity.NetworkLogsActivity +import com.celzero.bravedns.ui.HomeScreenActivity +import com.celzero.bravedns.ui.compose.statistics.StatisticsSummaryItem import com.celzero.bravedns.util.Constants import com.celzero.bravedns.util.Utilities import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class DomainConnectionsAdapter(private val context: Context, private val type: DomainConnectionsActivity.InputType) : - PagingDataAdapter( - DIFF_CALLBACK - ) { - - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - oldConnection: AppConnection, - newConnection: AppConnection - ): Boolean { - return (oldConnection == newConnection) - } - - override fun areContentsTheSame( - oldConnection: AppConnection, - newConnection: AppConnection - ): Boolean { - return (oldConnection == newConnection) - } - } +@Composable +fun ConnectionRow(dc: AppConnection) { + val context = LocalContext.current + val fallbackName = if (dc.appOrDnsName.isNullOrEmpty()) { + context.getString(R.string.network_log_app_name_unnamed, "(${dc.uid})") + } else { + dc.appOrDnsName } - - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int - ): DomainConnectionsViewHolder { - val itemBinding = - ListItemStatisticsSummaryBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false + val totalUsageText = if (dc.downloadBytes != null && dc.uploadBytes != null) { + val download = + context.getString( + R.string.symbol_download, + Utilities.humanReadableByteCount(dc.downloadBytes, true) ) - return DomainConnectionsViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: DomainConnectionsViewHolder, position: Int) { - val appNetworkActivity = getItem(position) ?: return - holder.bind(appNetworkActivity) + val upload = + context.getString( + R.string.symbol_upload, + Utilities.humanReadableByteCount(dc.uploadBytes, true) + ) + context.getString(R.string.two_argument, upload, download) + } else { + null } - inner class DomainConnectionsViewHolder(private val b: ListItemStatisticsSummaryBinding) : - RecyclerView.ViewHolder(b.root) { + val scope = rememberCoroutineScope() + var title by remember(dc.uid, dc.appOrDnsName) { mutableStateOf(fallbackName.orEmpty()) } + var icon by remember(dc.uid) { mutableStateOf(Utilities.getDefaultIcon(context)) } + var isUnknown by remember(dc.uid) { mutableStateOf(true) } - fun bind(dc: AppConnection) { - io { + LaunchedEffect(dc.uid, dc.appOrDnsName) { + val resolved = + withContext(Dispatchers.IO) { val appInfo = FirewallManager.getAppInfoByUid(dc.uid) - uiCtx { - if (dc.appOrDnsName.isNullOrEmpty()) { - b.ssDataUsage.text = appInfo?.appName ?: context.getString( - R.string.network_log_app_name_unnamed, - "(${dc.uid})" - ) - } else { - b.ssDataUsage.text = dc.appOrDnsName - } - b.ssIcon.visibility = View.VISIBLE - b.ssFlag.visibility = View.GONE - loadAppIcon( - Utilities.getIcon( - context, - appInfo?.packageName.orEmpty(), - appInfo?.appName.orEmpty() - ) - ) - } - } - if (dc.downloadBytes == null || dc.uploadBytes == null) { - return - } - - val download = - context.getString( - R.string.symbol_download, - Utilities.humanReadableByteCount(dc.downloadBytes, true) - ) - val upload = - context.getString( - R.string.symbol_upload, - Utilities.humanReadableByteCount(dc.uploadBytes, true) - ) - val total = context.getString(R.string.two_argument, upload, download) - b.ssName.text = total - b.ssCount.text = dc.count.toString() - - b.ssProgress.visibility = View.GONE - - b.ssContainer.setOnClickListener { - io { - if (isUnknownApp(dc)) { - uiCtx { - val intent = Intent(context, NetworkLogsActivity::class.java) - intent.putExtra(Constants.VIEW_PAGER_SCREEN_TO_LOAD, NetworkLogsActivity.Tabs.NETWORK_LOGS.screen) - intent.putExtra(Constants.SEARCH_QUERY, dc.appOrDnsName) - context.startActivity(intent) - } - } else { - uiCtx { - val intent = Intent(context, AppInfoActivity::class.java) - intent.putExtra(AppInfoActivity.INTENT_UID, dc.uid) - context.startActivity(intent) - } - } + val displayName = if (dc.appOrDnsName.isNullOrEmpty()) { + appInfo?.appName ?: fallbackName.orEmpty() + } else { + dc.appOrDnsName } + val resolvedIcon = + Utilities.getIcon( + context, + appInfo?.packageName ?: "", + appInfo?.appName ?: "" + ) ?: Utilities.getDefaultIcon(context) + Triple(appInfo == null, displayName, resolvedIcon) } - } - - private suspend fun isUnknownApp(appConnection: AppConnection): Boolean { - val appInfo = FirewallManager.getAppInfoByUid(appConnection.uid) - return appInfo == null - } + isUnknown = resolved.first + title = resolved.second + icon = resolved.third + } - private fun loadAppIcon(drawable: Drawable?) { - ui { - Glide.with(context) - .load(drawable) - .error(Utilities.getDefaultIcon(context)) - .into(b.ssIcon) + val onClick = { + scope.launch(Dispatchers.IO) { + if (isUnknown) { + // Navigate to network logs via HomeScreenActivity + val intent = Intent(context, HomeScreenActivity::class.java) + intent.putExtra(HomeScreenActivity.EXTRA_NAV_TARGET, HomeScreenActivity.NAV_TARGET_NETWORK_LOGS) + intent.putExtra(Constants.SEARCH_QUERY, dc.appOrDnsName) + withContext(Dispatchers.Main) { context.startActivity(intent) } + } else { + val intent = Intent(context, HomeScreenActivity::class.java) + intent.putExtra(HomeScreenActivity.EXTRA_NAV_TARGET, HomeScreenActivity.NAV_TARGET_APP_INFO) + intent.putExtra(HomeScreenActivity.EXTRA_APP_INFO_UID, dc.uid) + withContext(Dispatchers.Main) { context.startActivity(intent) } } } + Unit } - private fun io(f: suspend () -> Unit) { - (context as LifecycleOwner).lifecycleScope.launch(Dispatchers.IO) { f() } - } - - private fun ui(f: suspend () -> Unit) { - (context as LifecycleOwner).lifecycleScope.launch(Dispatchers.Main) { f() } - } - - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } - } + StatisticsSummaryItem( + title = title, + subtitle = totalUsageText, + countText = dc.count.toString(), + iconDrawable = icon, + flagText = null, + showProgress = false, + progress = 0f, + progressColor = Color.Transparent, + showIndicator = true, + onClick = onClick + ) } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/EventsAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/EventsAdapter.kt index 5ae92cf35..c556c82c5 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/EventsAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/EventsAdapter.kt @@ -15,184 +15,398 @@ */ package com.celzero.bravedns.adapter -import android.animation.ObjectAnimator import android.content.ClipData import android.content.ClipboardManager import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.view.animation.AccelerateDecelerateInterpolator import android.widget.Toast -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.tween +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.CheckCircle +import androidx.compose.material.icons.filled.Error +import androidx.compose.material.icons.filled.Info +import androidx.compose.material.icons.filled.Warning +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp import com.celzero.bravedns.R import com.celzero.bravedns.database.Event +import com.celzero.bravedns.database.EventSource import com.celzero.bravedns.database.Severity -import com.celzero.bravedns.databinding.ItemEventBinding import java.text.SimpleDateFormat import java.util.Date import java.util.Locale -class EventsAdapter(private val context: Context) : - PagingDataAdapter(EventDiffCallback()) { +fun copyEventToClipboard(context: Context, text: String) { + val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + val clip = ClipData.newPlainText("Event Message", text) + clipboard.setPrimaryClip(clip) + Toast.makeText(context, "Copied to clipboard", Toast.LENGTH_SHORT).show() +} - companion object { - private const val ANIMATION_DURATION = 300L - private const val ROTATION_EXPANDED = 180f - private const val ROTATION_COLLAPSED = 0f - } +@Composable +fun EventCard( + event: Event, + onCopy: (String) -> Unit, + query: String = "", + position: EventCardPosition = EventCardPosition.Single +) { + val hasDetails = !event.details.isNullOrBlank() + var expanded by remember(event.id) { mutableStateOf(false) } + val interactionSource = remember { MutableInteractionSource() } + val isPressed by interactionSource.collectIsPressedAsState() + val scale by animateFloatAsState( + targetValue = if (isPressed) 0.985f else 1f, + animationSpec = tween(durationMillis = 120), + label = "event_card_scale" + ) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EventViewHolder { - val binding = ItemEventBinding.inflate(LayoutInflater.from(parent.context), parent, false) - return EventViewHolder(binding) + val accent = event.severity.toAccentColor() + val timestampText = remember(event.timestamp) { formatEventTimestamp(event.timestamp) } + val highlightColor = MaterialTheme.colorScheme.primary + val highlightedMessage = remember(event.message, query, highlightColor) { + buildHighlightedText(event.message, query, highlightColor) } - - override fun onBindViewHolder(holder: EventViewHolder, position: Int) { - val event = getItem(position) - if (event != null) { - holder.bind(event) - } + val highlightedDetails = remember(event.details, query, highlightColor) { + buildHighlightedText(event.details.orEmpty(), query, highlightColor) } - inner class EventViewHolder(private val binding: ItemEventBinding) : - RecyclerView.ViewHolder(binding.root) { + val shape = eventShapeFor(position) - private var isExpanded = false + Surface( + shape = shape, + color = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 0.dp, + modifier = Modifier + .fillMaxWidth() + .scale(scale) + .combinedClickable( + interactionSource = interactionSource, + indication = null, + onClick = { + if (hasDetails) { + expanded = !expanded + } + }, + onLongClick = { onCopy(event.toClipboardText()) } + ) + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 10.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp) + ) { + EventSeverityIcon( + severity = event.severity, + accentColor = accent, + modifier = Modifier.size(40.dp) + ) - fun bind(event: Event) { - // Set tag for scroll header - binding.root.tag = event.timestamp + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Text( + text = highlightedMessage, + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f) + ) + Text( + text = timestampText, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f) + ) + } - // Reset expansion state for recycled views - isExpanded = false - binding.detailsContainer.visibility = View.GONE - binding.expandIcon.rotation = ROTATION_COLLAPSED + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(6.dp) + ) { + CompactEventBadge( + text = event.severity.name, + containerColor = accent.copy(alpha = 0.14f), + contentColor = accent + ) + CompactEventBadge( + text = event.source.toDisplayLabel(), + containerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.5f), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ) + CompactEventBadge( + text = event.eventType.name.toDisplayLabel(), + containerColor = MaterialTheme.colorScheme.surfaceContainerHighest, + contentColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f) + ) + if (event.userAction) { + CompactEventBadge( + text = "User", + containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.45f), + contentColor = MaterialTheme.colorScheme.primary + ) + } + } - // Set severity indicator color and icon - setSeverityIndicator(event.severity) + AnimatedVisibility(visible = expanded && hasDetails) { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + HorizontalDivider( + thickness = 1.dp, + color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f), + modifier = Modifier.padding(top = 4.dp) + ) + Text( + text = highlightedDetails, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 8, + overflow = TextOverflow.Ellipsis + ) + } + } + } - // Set event type - binding.eventTypeChip.text = event.eventType.name.replace("_", " ") + IconButton( + onClick = { onCopy(event.toClipboardText()) }, + modifier = Modifier.size(32.dp) + ) { + Icon( + painter = painterResource(id = R.drawable.ic_copy), + contentDescription = "Copy", + tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f), + modifier = Modifier.size(16.dp) + ) + } + } + } +} - // Set severity badge - binding.severityBadge.text = event.severity.name - setSeverityBadgeColor(event.severity) +enum class EventCardPosition { + First, + Middle, + Last, + Single +} - // Set timestamp - binding.timestampText.text = formatTimestamp(event.timestamp) +private fun eventShapeFor(position: EventCardPosition): RoundedCornerShape { + return when (position) { + EventCardPosition.First -> + RoundedCornerShape( + topStart = 18.dp, + topEnd = 18.dp, + bottomStart = 10.dp, + bottomEnd = 10.dp + ) + EventCardPosition.Middle -> RoundedCornerShape(10.dp) + EventCardPosition.Last -> + RoundedCornerShape( + topStart = 10.dp, + topEnd = 10.dp, + bottomStart = 18.dp, + bottomEnd = 18.dp + ) + EventCardPosition.Single -> RoundedCornerShape(18.dp) + } +} - // Set source - binding.sourceText.text = event.source.name +@Composable +private fun EventSeverityIcon( + severity: Severity, + accentColor: Color, + modifier: Modifier = Modifier +) { + val icon = when (severity) { + Severity.LOW -> Icons.Filled.CheckCircle + Severity.MEDIUM -> Icons.Filled.Info + Severity.HIGH -> Icons.Filled.Warning + Severity.CRITICAL -> Icons.Filled.Error + } - // Show user action indicator if applicable - binding.userActionIcon.visibility = if (event.userAction) View.VISIBLE else View.GONE + Surface( + shape = RoundedCornerShape(12.dp), + color = accentColor.copy(alpha = 0.12f), + modifier = modifier + ) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { + Icon( + imageVector = icon, + contentDescription = severity.name, + tint = accentColor, + modifier = Modifier.size(22.dp) + ) + } + } +} - // Set message - binding.messageText.text = event.message +@Composable +private fun CompactEventBadge( + text: String, + containerColor: Color, + contentColor: Color +) { + Surface( + shape = RoundedCornerShape(8.dp), + color = containerColor + ) { + Text( + text = text, + style = MaterialTheme.typography.labelSmall, + fontWeight = FontWeight.Medium, + color = contentColor, + modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp), + maxLines = 1 + ) + } +} - // Handle details - if (!event.details.isNullOrBlank()) { - binding.detailsText.text = event.details - // Make card clickable to expand - binding.root.setOnClickListener { - toggleExpansion() - } - } else { - binding.root.setOnClickListener(null) - binding.expandIcon.visibility = View.GONE - } +@Composable +private fun EventBadge( + text: String, + containerColor: Color, + contentColor: Color +) { + Surface( + shape = RoundedCornerShape(10.dp), + color = containerColor + ) { + Text( + text = text, + style = MaterialTheme.typography.labelSmall, + fontWeight = FontWeight.SemiBold, + color = contentColor, + modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), + maxLines = 1 + ) + } +} - // Long press to copy message - binding.root.setOnLongClickListener { - copyToClipboard(event.message) - true - } +private fun Event.toClipboardText(): String { + return buildString { + append(message) + details?.takeIf { it.isNotBlank() }?.let { + append("\n\n") + append(it) } + } +} - private fun setSeverityIndicator(severity: Severity) { - val color = when (severity) { - Severity.LOW -> 0xFF4CAF50.toInt() // Green - Severity.MEDIUM -> 0xFFFFC107.toInt() // Amber/Yellow - Severity.HIGH -> 0xFFFF9800.toInt() // Orange - Severity.CRITICAL -> 0xFFF44336.toInt() // Red - } - binding.severityIndicator.setBackgroundColor(color) - - val iconRes = when (severity) { - Severity.LOW -> R.drawable.ic_tick_normal - Severity.MEDIUM -> R.drawable.ic_app_info_accent - Severity.HIGH -> R.drawable.ic_block_accent - Severity.CRITICAL -> R.drawable.ic_block - } - binding.severityIcon.setImageResource(iconRes) - binding.severityIcon.setColorFilter(color) - } +private fun EventSource.toDisplayLabel(): String { + return name.toDisplayLabel() +} - private fun setSeverityBadgeColor(severity: Severity) { - val color = when (severity) { - Severity.LOW -> 0xFF4CAF50.toInt() // Green - Severity.MEDIUM -> 0xFFFFC107.toInt() // Amber/Yellow - Severity.HIGH -> 0xFFFF9800.toInt() // Orange - Severity.CRITICAL -> 0xFFF44336.toInt() // Red - } - binding.severityBadge.setBackgroundColor(color) - } +private fun String.toDisplayLabel(): String { + return lowercase(Locale.getDefault()) + .replace('_', ' ') + .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() } +} - private fun formatTimestamp(timestamp: Long): String { - val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) - return sdf.format(Date(timestamp)) - } +private fun Severity.toAccentColor(): Color { + return when (this) { + Severity.LOW -> Color(0xFF2E7D32) + Severity.MEDIUM -> Color(0xFFAD7F00) + Severity.HIGH -> Color(0xFFB85C00) + Severity.CRITICAL -> Color(0xFFB3261E) + } +} - private fun toggleExpansion() { - isExpanded = !isExpanded +private fun formatEventTimestamp(timestamp: Long): String { + val formatter = SimpleDateFormat("dd MMM, HH:mm:ss", Locale.getDefault()) + return formatter.format(Date(timestamp)) +} - // Animate expand icon rotation - val rotation = if (isExpanded) ROTATION_EXPANDED else ROTATION_COLLAPSED - ObjectAnimator.ofFloat(binding.expandIcon, "rotation", rotation).apply { - duration = ANIMATION_DURATION - interpolator = AccelerateDecelerateInterpolator() - start() - } +private fun buildHighlightedText( + text: String, + query: String, + highlightColor: Color +): AnnotatedString { + if (text.isBlank() || query.isBlank()) return AnnotatedString(text) - // Animate details container visibility - if (isExpanded) { - binding.detailsContainer.visibility = View.VISIBLE - binding.detailsContainer.alpha = 0f - binding.detailsContainer.animate() - .alpha(1f) - .setDuration(ANIMATION_DURATION) - .setInterpolator(AccelerateDecelerateInterpolator()) - .start() - } else { - binding.detailsContainer.animate() - .alpha(0f) - .setDuration(ANIMATION_DURATION) - .setInterpolator(AccelerateDecelerateInterpolator()) - .withEndAction { - binding.detailsContainer.visibility = View.GONE - } - .start() - } - } + val ranges = mutableListOf>() + val tokens = query.split(Regex("\\s+")).map { it.trim() }.filter { it.isNotBlank() }.distinct() - private fun copyToClipboard(text: String) { - val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - val clip = ClipData.newPlainText("Event Message", text) - clipboard.setPrimaryClip(clip) - Toast.makeText(context, "Copied to clipboard", Toast.LENGTH_SHORT).show() + tokens.forEach { token -> + var startIndex = 0 + while (startIndex < text.length) { + val index = text.indexOf(token, startIndex = startIndex, ignoreCase = true) + if (index < 0) break + ranges += index to (index + token.length) + startIndex = index + token.length } } - class EventDiffCallback : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: Event, newItem: Event): Boolean { - return oldItem.id == newItem.id + if (ranges.isEmpty()) return AnnotatedString(text) + + val merged = ranges + .sortedBy { it.first } + .fold(mutableListOf>()) { acc, range -> + if (acc.isEmpty()) { + acc += range + return@fold acc + } + val last = acc.last() + if (range.first <= last.second) { + acc[acc.lastIndex] = last.first to maxOf(last.second, range.second) + } else { + acc += range + } + acc } - override fun areContentsTheSame(oldItem: Event, newItem: Event): Boolean { - return oldItem == newItem + return buildAnnotatedString { + append(text) + merged.forEach { (start, end) -> + addStyle( + style = SpanStyle(color = highlightColor, fontWeight = FontWeight.Bold), + start = start, + end = end + ) } } } - diff --git a/app/src/full/java/com/celzero/bravedns/adapter/FirewallAppListAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/FirewallAppListAdapter.kt index dbc9b5e6b..7e4785394 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/FirewallAppListAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/FirewallAppListAdapter.kt @@ -16,487 +16,886 @@ package com.celzero.bravedns.adapter import android.content.Context -import android.content.DialogInterface import android.content.Intent import android.content.pm.PackageManager import android.graphics.drawable.Drawable -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ArrayAdapter -import android.widget.ImageView -import androidx.appcompat.app.AlertDialog -import androidx.core.content.ContextCompat -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide +import android.util.LruCache +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.FastOutLinearInEasing +import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.animation.core.tween +import androidx.compose.animation.core.updateTransition +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.MobileOff +import androidx.compose.material.icons.rounded.PhoneAndroid +import androidx.compose.material.icons.rounded.Wifi +import androidx.compose.material.icons.rounded.WifiOff +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextDecoration +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.R import com.celzero.bravedns.database.AppInfo import com.celzero.bravedns.database.EventSource import com.celzero.bravedns.database.EventType import com.celzero.bravedns.database.Severity -import com.celzero.bravedns.databinding.ListItemFirewallAppBinding import com.celzero.bravedns.service.EventLogger import com.celzero.bravedns.service.FirewallManager import com.celzero.bravedns.service.FirewallManager.updateFirewallStatus import com.celzero.bravedns.service.ProxyManager import com.celzero.bravedns.service.ProxyManager.ID_NONE -import com.celzero.bravedns.ui.activity.AppInfoActivity -import com.celzero.bravedns.ui.activity.AppInfoActivity.Companion.INTENT_UID +import com.celzero.bravedns.ui.HomeScreenActivity +import com.celzero.bravedns.ui.compose.apps.DiagonalWipeIcon import com.celzero.bravedns.util.Utilities import com.celzero.bravedns.util.Utilities.getIcon -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView.SectionedAdapter +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext -import java.util.concurrent.TimeUnit - -class FirewallAppListAdapter( - private val context: Context, - private val lifecycleOwner: LifecycleOwner, - private val eventLogger: EventLogger -) : PagingDataAdapter(DIFF_CALLBACK), SectionedAdapter { - - private val packageManager: PackageManager = context.packageManager - // private val systemAppColor: Int by lazy { UIUtils.fetchColor(context, R.attr.textColorAccentBad) } - // private val userAppColor: Int by lazy { UIUtils.fetchColor(context, R.attr.primaryTextColor) } - - companion object { - private const val ALPHA_FULL = 1f - private const val ALPHA_DISABLED = 0.4f - - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - newConnection: AppInfo, - oldConnection: AppInfo - ): Boolean { - return oldConnection.uid == newConnection.uid && - oldConnection.packageName == newConnection.packageName - } +import androidx.compose.ui.res.stringResource - override fun areContentsTheSame( - oldConnection: AppInfo, - newConnection: AppInfo - ): Boolean { - return oldConnection == newConnection - } - } - } +enum class FirewallRowPosition { + First, + Middle, + Last, + Single +} - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AppListViewHolder { - val itemBinding = - ListItemFirewallAppBinding.inflate(LayoutInflater.from(parent.context), parent, false) - return AppListViewHolder(itemBinding) +@Composable +fun FirewallAppRow( + appInfo: AppInfo, + eventLogger: EventLogger, + searchQuery: String = "", + rowPosition: FirewallRowPosition = FirewallRowPosition.Single, + onAppClick: ((Int) -> Unit)? = null +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + var dialogState by remember(appInfo.uid) { mutableStateOf(null) } + val packageManager = context.packageManager + var appStatus by remember(appInfo.uid, appInfo.firewallStatus) { + mutableStateOf(FirewallManager.FirewallStatus.getStatus(appInfo.firewallStatus)) } - - override fun onBindViewHolder(holder: AppListViewHolder, position: Int) { - val appInfo: AppInfo = getItem(position) ?: return - holder.update(appInfo) + var connStatus by remember(appInfo.uid, appInfo.connectionStatus) { + mutableStateOf(FirewallManager.ConnectionStatus.getStatus(appInfo.connectionStatus)) + } + var appIcon by + remember(appInfo.packageName) { + mutableStateOf(FirewallAppIconCache.get(appInfo.packageName)) + } + var proxyEnabled by remember(appInfo.uid) { mutableStateOf(false) } + val isSelfApp = appInfo.packageName == context.packageName + val tombstoned = appInfo.tombstoneTs > 0 + val nameAlpha = if (appInfo.hasInternetPermission(packageManager)) 1f else 0.4f + + LaunchedEffect(appInfo.uid, appInfo.firewallStatus, appInfo.connectionStatus) { + appStatus = FirewallManager.FirewallStatus.getStatus(appInfo.firewallStatus) + connStatus = FirewallManager.ConnectionStatus.getStatus(appInfo.connectionStatus) } - inner class AppListViewHolder(private val b: ListItemFirewallAppBinding) : - RecyclerView.ViewHolder(b.root) { + LaunchedEffect(appInfo.uid, appInfo.packageName, appInfo.appName, appInfo.isProxyExcluded) { + if (appIcon == null) { + val icon = + withContext(Dispatchers.IO) { + getIcon(context, appInfo.packageName, appInfo.appName) + } + appIcon = icon + FirewallAppIconCache.put(appInfo.packageName, icon) + } + val proxyId = ProxyManager.getProxyIdForApp(appInfo.uid) + proxyEnabled = !appInfo.isProxyExcluded && proxyId.isNotEmpty() && proxyId != ID_NONE + } - fun update(appInfo: AppInfo) { - displayDetails(appInfo) - setupClickListeners(appInfo) + val hasDataUsage = appInfo.uploadBytes > 0L || appInfo.downloadBytes > 0L + val dataUsageText = if (hasDataUsage) buildDataUsageText(context, appInfo) else "" + val interactionSource = remember { MutableInteractionSource() } + val isPressed by interactionSource.collectIsPressedAsState() + val scale by animateFloatAsState( + targetValue = if (isPressed) 0.97f else 1f, + animationSpec = spring(stiffness = Spring.StiffnessMedium), + label = "rowScale" + ) + val highlightedAppName = + buildHighlightedText( + text = appInfo.appName, + query = searchQuery, + highlightColor = MaterialTheme.colorScheme.primary + ) + val statusText = + if (isSelfApp) { + "" + } else { + getFirewallText(context, appStatus, connStatus) } + val statusColor = getStatusColor(appStatus, connStatus) + val accentColor by animateColorAsState( + targetValue = statusColor, + animationSpec = spring(stiffness = Spring.StiffnessLow), + label = "accentColor" + ) + val wifiIcon = wifiIconRes(appStatus, connStatus, isSelfApp) + val mobileIcon = mobileIconRes(appStatus, connStatus, isSelfApp) + val wifiBlocked = wifiIcon == R.drawable.ic_firewall_wifi_off + val mobileBlocked = mobileIcon == R.drawable.ic_firewall_data_off + val wifiTint = + if (wifiBlocked) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + } + val mobileTint = + if (mobileBlocked) { + MaterialTheme.colorScheme.error + } else { + MaterialTheme.colorScheme.onSurfaceVariant + } + val wifiCircleMotion = rememberBlockCircleMotion(blocked = wifiBlocked, labelPrefix = "wifi") + val mobileCircleMotion = rememberBlockCircleMotion(blocked = mobileBlocked, labelPrefix = "mobile") + + val shape = rowShapeFor(rowPosition) + + Surface( + modifier = Modifier + .fillMaxWidth() + .scale(scale) + .clip(shape) + .clickable( + interactionSource = interactionSource, + indication = null, + onClick = { + onAppClick?.invoke(appInfo.uid) ?: openAppDetailActivity(context, appInfo.uid) + } + ), + shape = shape, + color = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 0.dp + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding( + horizontal = Dimensions.spacingMd, + vertical = 9.dp + ), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + val iconPainter = + rememberDrawablePainter(appIcon) + ?: rememberDrawablePainter(Utilities.getDefaultIcon(context)) + iconPainter?.let { painter -> + Image( + painter = painter, + contentDescription = null, + modifier = Modifier + .size(36.dp) + .clip(RoundedCornerShape(10.dp)) + ) + } - private fun displayDetails(appInfo: AppInfo) { - io { - val appStatus = FirewallManager.appStatus(appInfo.uid) - val connStatus = FirewallManager.connectionStatus(appInfo.uid) - uiCtx { - b.firewallAppLabelTv.text = appInfo.appName - // setting the appname with different color for system and user apps - // causes conflict with the firewall status like blocked and isolated - // so removing the color change for now - /* if (appInfo.isSystemApp) { - b.firewallAppLabelTv.setTextColor(systemAppColor) - } else { - b.firewallAppLabelTv.setTextColor(userAppColor) - } */ - b.firewallAppToggleOther.text = getFirewallText(appStatus, connStatus) - displayIcon( - getIcon(context, appInfo.packageName, appInfo.appName), b.firewallAppIconIv) - // set the alpha based on internet permission - if (appInfo.hasInternetPermission(packageManager)) { - b.firewallAppLabelTv.alpha = ALPHA_FULL - b.firewallAppIconIv.alpha = ALPHA_FULL - } else { - b.firewallAppLabelTv.alpha = ALPHA_DISABLED - b.firewallAppIconIv.alpha = ALPHA_DISABLED + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingXs), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = highlightedAppName, + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = nameAlpha), + textDecoration = if (tombstoned) TextDecoration.LineThrough else null, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f) + ) + if (statusText.isNotBlank()) { + Surface( + shape = RoundedCornerShape(Dimensions.buttonCornerRadius), + color = accentColor.copy(alpha = 0.12f) + ) { + Text( + text = statusText, + style = MaterialTheme.typography.labelSmall, + fontWeight = FontWeight.SemiBold, + color = accentColor, + modifier = Modifier.padding( + horizontal = 6.dp, + vertical = 2.dp + ) + ) + } } - b.firewallAppToggleWifi.visibility = View.VISIBLE - b.firewallAppToggleMobileData.visibility = View.VISIBLE - // strike through the app name if the app is tombstoned - if (appInfo.tombstoneTs > 0) { - b.firewallAppLabelTv.paint.isStrikeThruText = true - b.firewallAppLabelTv.alpha = ALPHA_DISABLED - b.firewallAppIconIv.alpha = ALPHA_DISABLED - } else { - b.firewallAppLabelTv.paint.isStrikeThruText = false + } + Row( + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingXs), + verticalAlignment = Alignment.CenterVertically + ) { + if (proxyEnabled) { + Surface( + shape = RoundedCornerShape(Dimensions.buttonCornerRadius), + color = MaterialTheme.colorScheme.tertiaryContainer.copy(alpha = 0.75f) + ) { + Text( + text = "Proxy", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onTertiaryContainer, + modifier = Modifier.padding( + horizontal = 6.dp, + vertical = 1.dp + ) + ) + } } - displayConnectionStatus(appStatus, connStatus) - displayDataUsage(appInfo) - maybeDisplayProxyStatus(appInfo) } - } - } - - private fun displayDataUsage(appInfo: AppInfo) { - val u = Utilities.humanReadableByteCount(appInfo.uploadBytes, true) - val uploadBytes = context.getString(R.string.symbol_upload, u) - val d = Utilities.humanReadableByteCount(appInfo.downloadBytes, true) - val downloadBytes = context.getString(R.string.symbol_download, d) - b.firewallAppDataUsage.text = - context.getString(R.string.two_argument, uploadBytes, downloadBytes) - } - - private fun maybeDisplayProxyStatus(appInfo: AppInfo) { - if (appInfo.isProxyExcluded) { - return + if (hasDataUsage) { + Text( + text = dataUsageText, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy( + alpha = Dimensions.Opacity.MEDIUM + ) + ) + } } - // show key icon in drawable right of b.firewallAppDataUsage - val proxy = ProxyManager.getProxyIdForApp(appInfo.uid) - if (proxy.isEmpty() || (proxy.size == 1 && proxy[0] == ID_NONE)) { - return + if (wifiIcon != null) { + Box( + modifier = Modifier.size(34.dp), + contentAlignment = Alignment.Center + ) { + Box( + modifier = + Modifier + .fillMaxSize() + .graphicsLayer { + alpha = wifiCircleMotion.alpha + scaleX = wifiCircleMotion.scale + scaleY = wifiCircleMotion.scale + } + .clip(CircleShape) + .background(MaterialTheme.colorScheme.errorContainer) + ) + IconButton( + onClick = { + handleWifiToggle( + scope = scope, + eventLogger = eventLogger, + appInfo = appInfo, + onShowDialog = { packageList -> + dialogState = + FirewallAppDialogState( + packageList, + appInfo, + isWifi = true + ) + }, + onStatusUpdated = { newAppStatus, newConnStatus -> + appStatus = newAppStatus + connStatus = newConnStatus + } + ) + }, + modifier = Modifier.fillMaxSize().clip(CircleShape) + ) { + DiagonalWipeIcon( + blocked = wifiBlocked, + allowedIcon = Icons.Rounded.Wifi, + blockedIcon = Icons.Rounded.WifiOff, + allowedTint = MaterialTheme.colorScheme.onSurfaceVariant, + blockedTint = wifiTint, + contentDescription = stringResource(R.string.firewall_rule_block_unmetered), + modifier = Modifier.size(16.dp) + ) + } + } } - b.firewallAppLabelTv.append(context.getString(R.string.symbol_key)) - } - private fun getFirewallText( - aStat: FirewallManager.FirewallStatus, - cStat: FirewallManager.ConnectionStatus - ): String { - return when (aStat) { - FirewallManager.FirewallStatus.NONE -> - when (cStat) { - FirewallManager.ConnectionStatus.ALLOW -> - context.getString(R.string.firewall_status_allow) - FirewallManager.ConnectionStatus.METERED -> - context.getString(R.string.firewall_status_block_metered) - FirewallManager.ConnectionStatus.UNMETERED -> - context.getString(R.string.firewall_status_block_unmetered) - FirewallManager.ConnectionStatus.BOTH -> - context.getString(R.string.firewall_status_blocked) + if (mobileIcon != null) { + Box( + modifier = Modifier.size(34.dp), + contentAlignment = Alignment.Center + ) { + Box( + modifier = + Modifier + .fillMaxSize() + .graphicsLayer { + alpha = mobileCircleMotion.alpha + scaleX = mobileCircleMotion.scale + scaleY = mobileCircleMotion.scale + } + .clip(CircleShape) + .background(MaterialTheme.colorScheme.errorContainer) + ) + IconButton( + onClick = { + handleMobileToggle( + scope = scope, + eventLogger = eventLogger, + appInfo = appInfo, + onShowDialog = { packageList -> + dialogState = + FirewallAppDialogState( + packageList, + appInfo, + isWifi = false + ) + }, + onStatusUpdated = { newAppStatus, newConnStatus -> + appStatus = newAppStatus + connStatus = newConnStatus + } + ) + }, + modifier = Modifier.fillMaxSize().clip(CircleShape) + ) { + DiagonalWipeIcon( + blocked = mobileBlocked, + allowedIcon = Icons.Rounded.PhoneAndroid, + blockedIcon = Icons.Rounded.MobileOff, + allowedTint = MaterialTheme.colorScheme.onSurfaceVariant, + blockedTint = mobileTint, + contentDescription = stringResource(R.string.lbl_mobile_data), + modifier = Modifier.size(16.dp) + ) } - FirewallManager.FirewallStatus.EXCLUDE -> - context.getString(R.string.firewall_status_excluded) - FirewallManager.FirewallStatus.ISOLATE -> - context.getString(R.string.firewall_status_isolate) - FirewallManager.FirewallStatus.BYPASS_UNIVERSAL -> - context.getString(R.string.firewall_status_whitelisted) - FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL -> - context.getString(R.string.firewall_status_bypass_dns_firewall) - FirewallManager.FirewallStatus.UNTRACKED -> - context.getString(R.string.firewall_status_unknown) + } } } + } - private fun displayConnectionStatus( - firewallStatus: FirewallManager.FirewallStatus, - connStatus: FirewallManager.ConnectionStatus - ) { - when (firewallStatus) { - FirewallManager.FirewallStatus.NONE -> { - when (connStatus) { - FirewallManager.ConnectionStatus.ALLOW -> { - showWifiEnabled() - showMobileDataEnabled() - } - FirewallManager.ConnectionStatus.UNMETERED -> { - showWifiDisabled() - showMobileDataEnabled() - } - FirewallManager.ConnectionStatus.METERED -> { - showWifiEnabled() - showMobileDataDisabled() - } - FirewallManager.ConnectionStatus.BOTH -> { - showWifiDisabled() - showMobileDataDisabled() - } + dialogState?.let { state -> + val count = state.packageList.count() + RethinkConfirmDialog( + onDismissRequest = { dialogState = null }, + title = + stringResource( + R.string.ctbs_block_other_apps, + state.appInfo.appName, + count.toString() + ), + text = { + Column(verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs)) { + state.packageList.forEach { name -> + Text(text = name, style = MaterialTheme.typography.bodyMedium) } } - FirewallManager.FirewallStatus.EXCLUDE -> { - showMobileDataUnused() - showWifiUnused() - } - FirewallManager.FirewallStatus.BYPASS_UNIVERSAL -> { - showMobileDataUnused() - showWifiUnused() - } - FirewallManager.FirewallStatus.ISOLATE -> { - showMobileDataUnused() - showWifiUnused() - } - FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL -> { - showMobileDataUnused() - showWifiUnused() - } - else -> { - showWifiEnabled() - showMobileDataEnabled() + }, + confirmText = stringResource(R.string.lbl_proceed), + dismissText = stringResource(R.string.ctbs_dialog_negative_btn), + onConfirm = { + scope.launch(Dispatchers.IO) { + val updatedConnStatus = + if (state.isWifi) { + toggleWifi(eventLogger, state.appInfo) + } else { + toggleMobileData(eventLogger, state.appInfo) + } + withContext(Dispatchers.Main) { + appStatus = FirewallManager.FirewallStatus.NONE + connStatus = updatedConnStatus + } } + dialogState = null + }, + onDismiss = { dialogState = null } + ) + } +} + +@Composable +private fun getStatusColor( + appStatus: FirewallManager.FirewallStatus, + connStatus: FirewallManager.ConnectionStatus +): Color { + return when (appStatus) { + FirewallManager.FirewallStatus.NONE -> + when (connStatus) { + FirewallManager.ConnectionStatus.ALLOW -> MaterialTheme.colorScheme.primary + FirewallManager.ConnectionStatus.METERED -> MaterialTheme.colorScheme.error + FirewallManager.ConnectionStatus.UNMETERED -> MaterialTheme.colorScheme.error + FirewallManager.ConnectionStatus.BOTH -> MaterialTheme.colorScheme.error } - } - private fun showMobileDataDisabled() { - b.firewallAppToggleMobileData.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_firewall_data_off)) - } + FirewallManager.FirewallStatus.EXCLUDE -> MaterialTheme.colorScheme.tertiary + FirewallManager.FirewallStatus.ISOLATE -> MaterialTheme.colorScheme.error + FirewallManager.FirewallStatus.BYPASS_UNIVERSAL -> MaterialTheme.colorScheme.tertiary + FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL -> MaterialTheme.colorScheme.tertiary + FirewallManager.FirewallStatus.UNTRACKED -> MaterialTheme.colorScheme.onSurfaceVariant + } +} - private fun showMobileDataEnabled() { - b.firewallAppToggleMobileData.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_firewall_data_on)) - } +private data class FirewallAppDialogState( + val packageList: List, + val appInfo: AppInfo, + val isWifi: Boolean +) + +private data class BlockCircleMotion( + val alpha: Float, + val scale: Float +) + +@Composable +private fun rememberBlockCircleMotion(blocked: Boolean, labelPrefix: String): BlockCircleMotion { + val transition = updateTransition(targetState = blocked, label = "${labelPrefix}BlockCircle") + + val alpha by transition.animateFloat( + transitionSpec = { + if (false isTransitioningTo true) { + tween(durationMillis = 240, easing = FastOutSlowInEasing) + } else { + tween(durationMillis = 170, easing = FastOutLinearInEasing) + } + }, + label = "${labelPrefix}BlockCircleAlpha" + ) { isBlocked -> + if (isBlocked) 0.44f else 0f + } - private fun showWifiDisabled() { - b.firewallAppToggleWifi.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_firewall_wifi_off)) - } + val scale by transition.animateFloat( + transitionSpec = { + if (false isTransitioningTo true) { + spring( + dampingRatio = 0.80f, + stiffness = 620f + ) + } else { + tween(durationMillis = 190, easing = FastOutLinearInEasing) + } + }, + label = "${labelPrefix}BlockCircleScale" + ) { isBlocked -> + if (isBlocked) 1f else 0.72f + } - private fun showWifiEnabled() { - b.firewallAppToggleWifi.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_firewall_wifi_on)) - } + return BlockCircleMotion(alpha = alpha, scale = scale) +} - private fun showMobileDataUnused() { - b.firewallAppToggleMobileData.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_firewall_data_on_grey)) - } +private fun buildDataUsageText(context: Context, appInfo: AppInfo): String { + val u = Utilities.humanReadableByteCount(appInfo.uploadBytes, true) + val uploadBytes = context.getString(R.string.symbol_upload, u) + val d = Utilities.humanReadableByteCount(appInfo.downloadBytes, true) + val downloadBytes = context.getString(R.string.symbol_download, d) + return context.getString(R.string.two_argument, uploadBytes, downloadBytes) +} - private fun showWifiUnused() { - b.firewallAppToggleWifi.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_firewall_wifi_on_grey)) - } +private fun getFirewallText( + context: Context, + aStat: FirewallManager.FirewallStatus, + cStat: FirewallManager.ConnectionStatus +): String { + return when (aStat) { + FirewallManager.FirewallStatus.NONE -> + when (cStat) { + FirewallManager.ConnectionStatus.ALLOW -> "" + FirewallManager.ConnectionStatus.METERED -> + context.getString(R.string.lbl_blocked) + + FirewallManager.ConnectionStatus.UNMETERED -> + context.getString(R.string.lbl_blocked) + + FirewallManager.ConnectionStatus.BOTH -> + context.getString(R.string.lbl_blocked) + } + + FirewallManager.FirewallStatus.EXCLUDE -> + context.getString(R.string.fapps_firewall_filter_excluded) + + FirewallManager.FirewallStatus.ISOLATE -> + context.getString(R.string.fapps_firewall_filter_isolate) + + FirewallManager.FirewallStatus.BYPASS_UNIVERSAL -> + context.getString(R.string.fapps_firewall_filter_bypass_universal) + + FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL -> + context.getString(R.string.fapps_firewall_filter_bypass_universal) + + FirewallManager.FirewallStatus.UNTRACKED -> + context.getString(R.string.network_log_app_name_unknown) + } +} - private fun displayIcon(drawable: Drawable?, mIconImageView: ImageView) { - ui { - Glide.with(context) - .load(drawable) - .error(Utilities.getDefaultIcon(context)) - .into(mIconImageView) +private fun wifiIconRes( + firewallStatus: FirewallManager.FirewallStatus, + connStatus: FirewallManager.ConnectionStatus, + isSelfApp: Boolean +): Int? { + if (isSelfApp) return null + return when (firewallStatus) { + FirewallManager.FirewallStatus.NONE -> + when (connStatus) { + FirewallManager.ConnectionStatus.ALLOW -> R.drawable.ic_firewall_wifi_on + FirewallManager.ConnectionStatus.UNMETERED -> R.drawable.ic_firewall_wifi_off + FirewallManager.ConnectionStatus.METERED -> R.drawable.ic_firewall_wifi_on + FirewallManager.ConnectionStatus.BOTH -> R.drawable.ic_firewall_wifi_off } - } - private fun setupClickListeners(appInfo: AppInfo) { + FirewallManager.FirewallStatus.EXCLUDE, + FirewallManager.FirewallStatus.BYPASS_UNIVERSAL, + FirewallManager.FirewallStatus.ISOLATE, + FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL -> + R.drawable.ic_firewall_wifi_on_grey + + else -> R.drawable.ic_firewall_wifi_on + } +} - b.firewallAppTextLl.setOnClickListener { - enableAfterDelay(TimeUnit.SECONDS.toMillis(1L), b.firewallAppTextLl) - openAppDetailActivity(appInfo.uid) +private fun mobileIconRes( + firewallStatus: FirewallManager.FirewallStatus, + connStatus: FirewallManager.ConnectionStatus, + isSelfApp: Boolean +): Int? { + if (isSelfApp) return null + return when (firewallStatus) { + FirewallManager.FirewallStatus.NONE -> + when (connStatus) { + FirewallManager.ConnectionStatus.ALLOW -> R.drawable.ic_firewall_data_on + FirewallManager.ConnectionStatus.UNMETERED -> R.drawable.ic_firewall_data_on + FirewallManager.ConnectionStatus.METERED -> R.drawable.ic_firewall_data_off + FirewallManager.ConnectionStatus.BOTH -> R.drawable.ic_firewall_data_off } - b.firewallAppIconIv.setOnClickListener { - enableAfterDelay(TimeUnit.SECONDS.toMillis(1L), b.firewallAppIconIv) - openAppDetailActivity(appInfo.uid) + FirewallManager.FirewallStatus.EXCLUDE, + FirewallManager.FirewallStatus.BYPASS_UNIVERSAL, + FirewallManager.FirewallStatus.ISOLATE, + FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL -> + R.drawable.ic_firewall_data_on_grey + + else -> R.drawable.ic_firewall_data_on + } +} + +private fun handleWifiToggle( + scope: CoroutineScope, + eventLogger: EventLogger, + appInfo: AppInfo, + onShowDialog: (List) -> Unit, + onStatusUpdated: (FirewallManager.FirewallStatus, FirewallManager.ConnectionStatus) -> Unit +) { + scope.launch(Dispatchers.IO) { + val appNames = FirewallManager.getAppNamesByUid(appInfo.uid) + if (appNames.count() > 1) { + withContext(Dispatchers.Main) { + onShowDialog(appNames) } + return@launch + } + val updatedConnStatus = toggleWifi(eventLogger, appInfo) + withContext(Dispatchers.Main) { + onStatusUpdated(FirewallManager.FirewallStatus.NONE, updatedConnStatus) + } + } +} - b.firewallAppDetailsLl.setOnClickListener { - enableAfterDelay(TimeUnit.SECONDS.toMillis(1L), b.firewallAppIconIv) - openAppDetailActivity(appInfo.uid) +private fun handleMobileToggle( + scope: CoroutineScope, + eventLogger: EventLogger, + appInfo: AppInfo, + onShowDialog: (List) -> Unit, + onStatusUpdated: (FirewallManager.FirewallStatus, FirewallManager.ConnectionStatus) -> Unit +) { + scope.launch(Dispatchers.IO) { + val appNames = FirewallManager.getAppNamesByUid(appInfo.uid) + if (appNames.count() > 1) { + withContext(Dispatchers.Main) { + onShowDialog(appNames) } + return@launch + } + val updatedConnStatus = toggleMobileData(eventLogger, appInfo) + withContext(Dispatchers.Main) { + onStatusUpdated(FirewallManager.FirewallStatus.NONE, updatedConnStatus) + } + } +} - b.firewallAppToggleWifi.setOnClickListener { - enableAfterDelay(TimeUnit.SECONDS.toMillis(1L), b.firewallAppToggleWifi) - io { - val appNames = FirewallManager.getAppNamesByUid(appInfo.uid) - val connStatus = FirewallManager.connectionStatus(appInfo.uid) - uiCtx { - if (appNames.count() > 1) { - showDialog(appNames, appInfo, isWifi = true, connStatus) - return@uiCtx - } - ioCtx { toggleWifi(appInfo, connStatus) } - } - } +private suspend fun toggleMobileData( + eventLogger: EventLogger, + appInfo: AppInfo +): FirewallManager.ConnectionStatus { + return FirewallToggleLock.withLock { + val connStatus = FirewallManager.connectionStatus(appInfo.uid) + val updatedConnStatus = nextConnStatusForMobileToggle(connStatus) + when (connStatus) { + FirewallManager.ConnectionStatus.METERED -> { + updateFirewallStatus( + appInfo.uid, + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.ALLOW + ) } - b.firewallAppToggleMobileData.setOnClickListener { - enableAfterDelay(TimeUnit.SECONDS.toMillis(1L), b.firewallAppToggleMobileData) - io { - val appNames = FirewallManager.getAppNamesByUid(appInfo.uid) - val connStatus = FirewallManager.connectionStatus(appInfo.uid) - uiCtx { - if (appNames.count() > 1) { - showDialog(appNames, appInfo, isWifi = false, connStatus) - return@uiCtx - } - ioCtx { toggleMobileData(appInfo, connStatus) } - } - } + FirewallManager.ConnectionStatus.UNMETERED -> { + updateFirewallStatus( + appInfo.uid, + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.BOTH + ) } - } - private suspend fun toggleMobileData( - appInfo: AppInfo, - connStatus: FirewallManager.ConnectionStatus - ) { - if (appInfo.packageName == context.packageName) { - return + FirewallManager.ConnectionStatus.BOTH -> { + updateFirewallStatus( + appInfo.uid, + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.UNMETERED + ) } - when (connStatus) { - FirewallManager.ConnectionStatus.METERED -> { - updateFirewallStatus( - appInfo.uid, - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.ALLOW) - } - FirewallManager.ConnectionStatus.UNMETERED -> { - updateFirewallStatus( - appInfo.uid, - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.BOTH) - } - FirewallManager.ConnectionStatus.BOTH -> { - updateFirewallStatus( - appInfo.uid, - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.UNMETERED) - } - FirewallManager.ConnectionStatus.ALLOW -> { - updateFirewallStatus( - appInfo.uid, - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.METERED) - } + + FirewallManager.ConnectionStatus.ALLOW -> { + updateFirewallStatus( + appInfo.uid, + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.METERED + ) } - logEvent("UID: ${appInfo.uid}, App: ${appInfo.appName}, New FW status: ${FirewallManager.connectionStatus(appInfo.uid)}") } + logEvent( + eventLogger, + "UID: ${appInfo.uid}, App: ${appInfo.appName}, New FW status: ${ + FirewallManager.connectionStatus( + appInfo.uid + ) + }" + ) + updatedConnStatus + } +} - private suspend fun toggleWifi( - appInfo: AppInfo, - connStatus: FirewallManager.ConnectionStatus - ) { - when (connStatus) { - FirewallManager.ConnectionStatus.METERED -> { - updateFirewallStatus( - appInfo.uid, - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.BOTH) - } - FirewallManager.ConnectionStatus.UNMETERED -> { - updateFirewallStatus( - appInfo.uid, - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.ALLOW) - } - FirewallManager.ConnectionStatus.BOTH -> { - updateFirewallStatus( - appInfo.uid, - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.METERED) - } - FirewallManager.ConnectionStatus.ALLOW -> { - updateFirewallStatus( - appInfo.uid, - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.UNMETERED) - } +private suspend fun toggleWifi( + eventLogger: EventLogger, + appInfo: AppInfo +): FirewallManager.ConnectionStatus { + return FirewallToggleLock.withLock { + val connStatus = FirewallManager.connectionStatus(appInfo.uid) + val updatedConnStatus = nextConnStatusForWifiToggle(connStatus) + when (connStatus) { + FirewallManager.ConnectionStatus.METERED -> { + updateFirewallStatus( + appInfo.uid, + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.BOTH + ) + } + + FirewallManager.ConnectionStatus.UNMETERED -> { + updateFirewallStatus( + appInfo.uid, + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.ALLOW + ) + } + + FirewallManager.ConnectionStatus.BOTH -> { + updateFirewallStatus( + appInfo.uid, + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.METERED + ) } - logEvent("UID: ${appInfo.uid}, App: ${appInfo.appName}, New FW status: ${FirewallManager.connectionStatus(appInfo.uid)}") - } - private fun openAppDetailActivity(uid: Int) { - val intent = Intent(context, AppInfoActivity::class.java) - intent.putExtra(INTENT_UID, uid) - context.startActivity(intent) + FirewallManager.ConnectionStatus.ALLOW -> { + updateFirewallStatus( + appInfo.uid, + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.UNMETERED + ) + } } + logEvent( + eventLogger, + "UID: ${appInfo.uid}, App: ${appInfo.appName}, New FW status: ${ + FirewallManager.connectionStatus( + appInfo.uid + ) + }" + ) + updatedConnStatus + } +} - private fun showDialog( - packageList: List, - appInfo: AppInfo, - isWifi: Boolean, - connStatus: FirewallManager.ConnectionStatus - ) { +private fun nextConnStatusForMobileToggle( + connStatus: FirewallManager.ConnectionStatus +): FirewallManager.ConnectionStatus { + return when (connStatus) { + FirewallManager.ConnectionStatus.METERED -> FirewallManager.ConnectionStatus.ALLOW + FirewallManager.ConnectionStatus.UNMETERED -> FirewallManager.ConnectionStatus.BOTH + FirewallManager.ConnectionStatus.BOTH -> FirewallManager.ConnectionStatus.UNMETERED + FirewallManager.ConnectionStatus.ALLOW -> FirewallManager.ConnectionStatus.METERED + } +} - val builderSingle = MaterialAlertDialogBuilder(context) - - builderSingle.setIcon(R.drawable.ic_firewall_block_grey) - val count = packageList.count() - builderSingle.setTitle( - context.getString( - R.string.ctbs_block_other_apps, appInfo.appName, count.toString())) - - val arrayAdapter = - ArrayAdapter(context, android.R.layout.simple_list_item_activated_1) - arrayAdapter.addAll(packageList) - builderSingle.setCancelable(false) - - builderSingle.setItems(packageList.toTypedArray(), null) - - builderSingle - .setPositiveButton(context.getString(R.string.lbl_proceed)) { - _: DialogInterface, - _: Int -> - io { - if (isWifi) { - toggleWifi(appInfo, connStatus) - return@io - } +private fun nextConnStatusForWifiToggle( + connStatus: FirewallManager.ConnectionStatus +): FirewallManager.ConnectionStatus { + return when (connStatus) { + FirewallManager.ConnectionStatus.METERED -> FirewallManager.ConnectionStatus.BOTH + FirewallManager.ConnectionStatus.UNMETERED -> FirewallManager.ConnectionStatus.ALLOW + FirewallManager.ConnectionStatus.BOTH -> FirewallManager.ConnectionStatus.METERED + FirewallManager.ConnectionStatus.ALLOW -> FirewallManager.ConnectionStatus.UNMETERED + } +} - toggleMobileData(appInfo, connStatus) - } - } - .setNeutralButton(context.getString(R.string.ctbs_dialog_negative_btn)) { - _: DialogInterface, - _: Int -> - } +private fun openAppDetailActivity(context: Context, uid: Int) { + val intent = Intent(context, HomeScreenActivity::class.java) + intent.putExtra(HomeScreenActivity.EXTRA_NAV_TARGET, HomeScreenActivity.NAV_TARGET_APP_INFO) + intent.putExtra(HomeScreenActivity.EXTRA_APP_INFO_UID, uid) + context.startActivity(intent) +} - val alertDialog: AlertDialog = builderSingle.create() - alertDialog.listView.setOnItemClickListener { _, _, _, _ -> } - alertDialog.show() +private fun logEvent(eventLogger: EventLogger, details: String) { + eventLogger.log( + EventType.FW_RULE_MODIFIED, + Severity.LOW, + "App list, rule change", + EventSource.UI, + false, + details + ) +} + +private fun buildHighlightedText( + text: String, + query: String, + highlightColor: Color +): AnnotatedString { + val normalizedQuery = query.trim() + if (normalizedQuery.isBlank() || text.isBlank()) return AnnotatedString(text) + + val terms = + normalizedQuery + .split(Regex("\\s+")) + .map { it.trim() } + .filter { it.isNotBlank() } + .distinct() + if (terms.isEmpty()) return AnnotatedString(text) + + val normalizedText = text.lowercase() + val ranges = mutableListOf() + + terms.forEach { term -> + val normalizedTerm = term.lowercase() + var from = 0 + while (from < normalizedText.length) { + val start = normalizedText.indexOf(normalizedTerm, from) + if (start == -1) break + ranges.add(start until (start + normalizedTerm.length)) + from = start + normalizedTerm.length } } - private fun enableAfterDelay(delay: Long, vararg views: View) { - for (v in views) v.isEnabled = false + if (ranges.isEmpty()) return AnnotatedString(text) - Utilities.delay(delay, lifecycleOwner.lifecycleScope) { - for (v in views) v.isEnabled = true + val mergedRanges = ranges.sortedBy { it.first }.fold(mutableListOf()) { acc, range -> + val last = acc.lastOrNull() + if (last == null || range.first > last.last + 1) { + acc.add(range) + } else { + acc[acc.lastIndex] = last.first..maxOf(last.last, range.last) } + acc } - private fun logEvent(details: String) { - eventLogger.log(EventType.FW_RULE_MODIFIED, Severity.LOW, "App list, rule change", EventSource.UI, false, details) + return buildAnnotatedString { + append(text) + mergedRanges.forEach { range -> + addStyle( + style = SpanStyle(color = highlightColor), + start = range.first, + end = range.last + 1 + ) + } } +} - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } +private fun rowShapeFor(position: FirewallRowPosition): RoundedCornerShape { + return when (position) { + FirewallRowPosition.First -> + RoundedCornerShape( + topStart = 18.dp, + topEnd = 18.dp, + bottomStart = 10.dp, + bottomEnd = 10.dp + ) + + FirewallRowPosition.Middle -> RoundedCornerShape(10.dp) + FirewallRowPosition.Last -> + RoundedCornerShape( + topStart = 10.dp, + topEnd = 10.dp, + bottomStart = 18.dp, + bottomEnd = 18.dp + ) + + FirewallRowPosition.Single -> RoundedCornerShape(18.dp) } +} - private fun ui(f: suspend () -> Unit) { - lifecycleOwner.lifecycleScope.launch { withContext(Dispatchers.Main) { f() } } - } +private object FirewallAppIconCache { + private const val CACHE_SIZE = 256 + private val cache = LruCache(CACHE_SIZE) - private fun io(f: suspend () -> Unit) { - lifecycleOwner.lifecycleScope.launch { withContext(Dispatchers.IO) { f() } } - } + fun get(packageName: String): Drawable? = cache.get(packageName) - private suspend fun ioCtx(f: suspend () -> Unit) { - withContext(Dispatchers.IO) { f() } + fun put(packageName: String, icon: Drawable?) { + if (packageName.isBlank() || icon == null) return + cache.put(packageName, icon) } +} - override fun getSectionName(position: Int): String { - // Check if position is valid to prevent IndexOutOfBoundsException - if (position !in 0.. withLock(block: suspend () -> T): T { + return mutex.withLock { block() } } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/LocalAdvancedViewAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/LocalAdvancedViewAdapter.kt index 4818c3782..37601f674 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/LocalAdvancedViewAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/LocalAdvancedViewAdapter.kt @@ -15,190 +15,28 @@ */ package com.celzero.bravedns.adapter -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.celzero.bravedns.R +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.database.RethinkLocalFileTag -import com.celzero.bravedns.databinding.ListItemRethinkBlocklistAdvBinding -import com.celzero.bravedns.service.RethinkBlocklistManager -import com.celzero.bravedns.ui.fragment.RethinkBlocklistFragment -import com.celzero.bravedns.util.UIUtils.fetchColor import com.celzero.bravedns.util.UIUtils.openUrl -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -class LocalAdvancedViewAdapter(val context: Context) : - PagingDataAdapter( - DIFF_CALLBACK - ) { - - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - - override fun areItemsTheSame( - oldConnection: RethinkLocalFileTag, - newConnection: RethinkLocalFileTag - ): Boolean { - return oldConnection == newConnection - } - - override fun areContentsTheSame( - oldConnection: RethinkLocalFileTag, - newConnection: RethinkLocalFileTag - ): Boolean { - return oldConnection == newConnection - } - } - } - - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int - ): RethinkLocalFileTagViewHolder { - val itemBinding = - ListItemRethinkBlocklistAdvBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - return RethinkLocalFileTagViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: RethinkLocalFileTagViewHolder, position: Int) { - val filetag: RethinkLocalFileTag = getItem(position) ?: return - - holder.update(filetag, position) - } - - inner class RethinkLocalFileTagViewHolder(private val b: ListItemRethinkBlocklistAdvBinding) : - RecyclerView.ViewHolder(b.root) { - - fun update(filetag: RethinkLocalFileTag, position: Int) { - b.root.tag = getGroupName(filetag.group) - displayHeaderIfNeeded(filetag, position) - displayMetaData(filetag) - - b.crpCheckBox.setOnClickListener { toggleCheckbox(b.crpCheckBox.isChecked, filetag) } - - b.crpCard.setOnClickListener { toggleCheckbox(!b.crpCheckBox.isChecked, filetag) } - - b.crpDescEntriesTv.setOnClickListener { openUrl(context, filetag.url[0]) } - } - - private fun displayMetaData(filetag: RethinkLocalFileTag) { - b.crpLabelTv.text = filetag.vname - if (filetag.subg.isEmpty()) { - b.crpDescGroupTv.text = filetag.group - } else { - b.crpDescGroupTv.text = filetag.subg - } - - setEntries(filetag) - b.crpCheckBox.isChecked = filetag.isSelected - setCardBackground(filetag.isSelected) - } - - private fun setEntries(filetag: RethinkLocalFileTag) { - b.crpDescEntriesTv.text = - context.getString(R.string.dc_entries, filetag.entries.toString()) - - if (filetag.level.isNullOrEmpty()) return - - val level = filetag.level?.get(0) ?: return - when (level) { - 0 -> { - val color = fetchColor(context, R.attr.chipTextPositive) - val bgColor = fetchColor(context, R.attr.chipBgColorPositive) - b.crpDescEntriesTv.setTextColor(color) - b.crpDescEntriesTv.chipBackgroundColor = ColorStateList.valueOf(bgColor) - } - 1 -> { - val color = fetchColor(context, R.attr.chipTextNeutral) - val bgColor = fetchColor(context, R.attr.chipBgColorNeutral) - b.crpDescEntriesTv.setTextColor(color) - b.crpDescEntriesTv.chipBackgroundColor = ColorStateList.valueOf(bgColor) - } - 2 -> { - val color = fetchColor(context, R.attr.chipTextNegative) - val bgColor = fetchColor(context, R.attr.chipBgColorNegative) - b.crpDescEntriesTv.setTextColor(color) - b.crpDescEntriesTv.chipBackgroundColor = ColorStateList.valueOf(bgColor) - } - else -> { - /* no-op */ - } - } - } - - // handle the group name (filetag.json) - private fun getGroupName(group: String): String { - return if (group.equals(RethinkBlocklistManager.PARENTAL_CONTROL.name, true)) { - context.getString(RethinkBlocklistManager.PARENTAL_CONTROL.label) - } else if (group.equals(RethinkBlocklistManager.SECURITY.name, true)) { - context.getString(RethinkBlocklistManager.SECURITY.label) - } else if (group.equals(RethinkBlocklistManager.PRIVACY.name, true)) { - context.getString(RethinkBlocklistManager.PRIVACY.label) - } else { - "" - } - } - - private fun setCardBackground(isSelected: Boolean) { - if (isSelected) { - b.crpCard.setCardBackgroundColor(fetchColor(context, R.attr.selectedCardBg)) - } else { - b.crpCard.setCardBackgroundColor(fetchColor(context, R.attr.background)) - } - } - - private fun toggleCheckbox(isSelected: Boolean, filetag: RethinkLocalFileTag) { - b.crpCheckBox.isChecked = isSelected - setCardBackground(isSelected) - setFileTag(filetag, isSelected) - } - - private fun setFileTag(filetag: RethinkLocalFileTag, selected: Boolean) { - io { - filetag.isSelected = selected - RethinkBlocklistManager.updateFiletagLocal(filetag) - val list = RethinkBlocklistManager.getSelectedFileTagsLocal().toSet() - RethinkBlocklistFragment.updateFileTagList(list) - } - } - - private fun displayHeaderIfNeeded(filetag: RethinkLocalFileTag, position: Int) { - if (position == 0 || getItem(position - 1)?.group != filetag.group) { - b.crpTitleLl.visibility = View.VISIBLE - b.crpBlocktypeHeadingTv.text = getGroupName(filetag.group) - b.crpBlocktypeDescTv.text = getTitleDesc(filetag.group) - return - } - - b.crpTitleLl.visibility = View.GONE - } - - private fun getTitleDesc(title: String): String { - return if (title.equals(RethinkBlocklistManager.PARENTAL_CONTROL.name, true)) { - context.getString(RethinkBlocklistManager.PARENTAL_CONTROL.desc) - } else if (title.equals(RethinkBlocklistManager.SECURITY.name, true)) { - context.getString(RethinkBlocklistManager.SECURITY.desc) - } else if (title.equals(RethinkBlocklistManager.PRIVACY.name, true)) { - context.getString(RethinkBlocklistManager.PRIVACY.desc) - } else { - "" - } - } - - private fun io(f: suspend () -> Unit) { - CoroutineScope(Dispatchers.IO).launch { f() } - } - } +@Composable +fun LocalAdvancedBlocklistRow( + filetag: RethinkLocalFileTag, + showHeader: Boolean, + onToggle: (Boolean) -> Unit +) { + val context = LocalContext.current + BlocklistAdvancedRow( + group = filetag.group, + subGroup = filetag.subg, + name = filetag.vname, + entries = filetag.entries, + level = filetag.level?.firstOrNull(), + entryUrl = filetag.url.firstOrNull(), + isSelected = filetag.isSelected, + showHeader = showHeader, + onToggle = onToggle, + onEntryClick = { url -> openUrl(context, url) } + ) } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/LocalSimpleViewAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/LocalSimpleViewAdapter.kt index 5d4dea1e7..41dfd5872 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/LocalSimpleViewAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/LocalSimpleViewAdapter.kt @@ -15,185 +15,25 @@ */ package com.celzero.bravedns.adapter -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.cardview.widget.CardView -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.celzero.bravedns.R +import androidx.compose.runtime.Composable import com.celzero.bravedns.database.LocalBlocklistPacksMap -import com.celzero.bravedns.databinding.ListItemRethinkBlocklistSimpleBinding -import com.celzero.bravedns.service.RethinkBlocklistManager -import com.celzero.bravedns.ui.fragment.RethinkBlocklistFragment -import com.celzero.bravedns.util.UIUtils.fetchColor -import com.celzero.bravedns.util.UIUtils.fetchToggleBtnColors -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch - -class LocalSimpleViewAdapter(val context: Context) : - PagingDataAdapter( - DIFF_CALLBACK - ) { - - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - - override fun areItemsTheSame( - oldConnection: LocalBlocklistPacksMap, - newConnection: LocalBlocklistPacksMap - ): Boolean { - return oldConnection == newConnection - } - - override fun areContentsTheSame( - oldConnection: LocalBlocklistPacksMap, - newConnection: LocalBlocklistPacksMap - ): Boolean { - return oldConnection == newConnection - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RethinkSimpleViewHolder { - val itemBinding = - ListItemRethinkBlocklistSimpleBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - return RethinkSimpleViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: RethinkSimpleViewHolder, position: Int) { - val map: LocalBlocklistPacksMap = getItem(position) ?: return - - holder.update(map, position) - } - - inner class RethinkSimpleViewHolder(private val b: ListItemRethinkBlocklistSimpleBinding) : - RecyclerView.ViewHolder(b.root) { - - fun update(map: LocalBlocklistPacksMap, position: Int) { - b.root.tag = getGroupName(map.group) - displayMetaData(map, position) - setupClickListener(map) - } - - private fun setupClickListener(map: LocalBlocklistPacksMap) { - b.crpCheckBox.setOnClickListener { toggleCheckbox(b.crpCheckBox.isChecked, map) } - - b.crpCard.setOnClickListener { toggleCheckbox(!b.crpCheckBox.isChecked, map) } - } - - private fun setCardBackground(card: CardView, isSelected: Boolean) { - if (isSelected) { - card.setCardBackgroundColor(fetchColor(context, R.attr.selectedCardBg)) - } else { - card.setCardBackgroundColor(fetchColor(context, R.attr.background)) - } - } - - private fun toggleCheckbox(isSelected: Boolean, map: LocalBlocklistPacksMap) { - b.crpCheckBox.isChecked = isSelected - setCardBackground(b.crpCard, isSelected) - setFileTag(map.blocklistIds.toMutableList(), if (isSelected) 1 else 0) - } - - private fun setFileTag(tagIds: MutableList, selected: Int) { - io { - RethinkBlocklistManager.updateFiletagsLocal(tagIds.toSet(), selected) - val selectedTags = RethinkBlocklistManager.getSelectedFileTagsLocal().toSet() - RethinkBlocklistFragment.updateFileTagList(selectedTags) - ui { notifyDataSetChanged() } - } - } - - private fun displayMetaData(map: LocalBlocklistPacksMap, position: Int) { - setCardBackground(b.crpCard, false) - - // check to show the title and desc, as of now these values are predefined so checking - // with those pre defined values. - if (position == 0 || getItem(position - 1)?.group != map.group) { - b.crpTitleLl.visibility = View.VISIBLE - b.crpBlocktypeHeadingTv.text = getGroupName(map.group) - b.crpBlocktypeDescTv.text = getTitleDesc(map.group) - } else { - b.crpTitleLl.visibility = View.GONE - } - - b.crpLabelTv.text = map.pack.replaceFirstChar(Char::titlecase) - b.crpDescGroupTv.text = - context.getString( - R.string.rsv_blocklist_count_text, - map.blocklistIds.size.toString() - ) - - val selectedTags = RethinkBlocklistFragment.getSelectedFileTags() - // enable the check box if the stamp contains all the values - b.crpCheckBox.isChecked = selectedTags.containsAll(map.blocklistIds) - setCardBackground(b.crpCard, b.crpCheckBox.isChecked) - - // show level indicator - showLevelIndicator(b.crpLevelIndicator, map.level) - } - - private fun showLevelIndicator(mIconIndicator: TextView, level: Int) { - when (level) { - 0 -> { - val color = fetchToggleBtnColors(context, R.color.firewallNoRuleToggleBtnBg) - mIconIndicator.setBackgroundColor(color) - } - 1 -> { - val color = fetchToggleBtnColors(context, R.color.firewallWhiteListToggleBtnTxt) - mIconIndicator.setBackgroundColor(color) - } - 2 -> { - val color = fetchToggleBtnColors(context, R.color.firewallBlockToggleBtnTxt) - mIconIndicator.setBackgroundColor(color) - } - else -> { - /* no-op */ - } - } - } - - private fun getTitleDesc(title: String): String { - return if (title.equals(RethinkBlocklistManager.PARENTAL_CONTROL.name, true)) { - context.getString(RethinkBlocklistManager.PARENTAL_CONTROL.desc) - } else if (title.equals(RethinkBlocklistManager.SECURITY.name, true)) { - context.getString(RethinkBlocklistManager.SECURITY.desc) - } else if (title.equals(RethinkBlocklistManager.PRIVACY.name, true)) { - context.getString(RethinkBlocklistManager.PRIVACY.desc) - } else { - "" - } - } - - // handle the group name (filetag.json) - private fun getGroupName(group: String): String { - return if (group.equals(RethinkBlocklistManager.PARENTAL_CONTROL.name, true)) { - context.getString(RethinkBlocklistManager.PARENTAL_CONTROL.label) - } else if (group.equals(RethinkBlocklistManager.SECURITY.name, true)) { - context.getString(RethinkBlocklistManager.SECURITY.label) - } else if (group.equals(RethinkBlocklistManager.PRIVACY.name, true)) { - context.getString(RethinkBlocklistManager.PRIVACY.label) - } else { - "" - } - } - - private fun io(f: suspend () -> Unit) { - CoroutineScope(Dispatchers.IO).launch { f() } - } - - private fun ui(f: () -> Unit) { - CoroutineScope(Dispatchers.Main).launch { f() } - } - } +import com.celzero.bravedns.ui.rethink.RethinkBlocklistState + +@Composable +fun LocalSimpleBlocklistRow( + map: LocalBlocklistPacksMap, + showHeader: Boolean, + onToggle: (Boolean) -> Unit +) { + val selectedTags = RethinkBlocklistState.getSelectedFileTags() + val isSelected = selectedTags.containsAll(map.blocklistIds) + + BlocklistSimpleRow( + group = map.group, + pack = map.pack, + blocklistCount = map.blocklistIds.size, + isSelected = isSelected, + showHeader = showHeader, + onToggle = onToggle + ) } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/ODoHEndpointAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/ODoHEndpointAdapter.kt index 2b6e0da7f..73439ed4b 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/ODoHEndpointAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/ODoHEndpointAdapter.kt @@ -16,260 +16,84 @@ limitations under the License. package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_DNS -import android.content.Context -import android.content.DialogInterface -import android.view.LayoutInflater -import android.view.ViewGroup -import android.widget.Toast -import androidx.core.content.ContextCompat -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.findViewTreeLifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.R import com.celzero.bravedns.data.AppConfig import com.celzero.bravedns.database.ODoHEndpoint -import com.celzero.bravedns.databinding.ListItemEndpointBinding -import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.util.UIUtils.clipboardCopy -import com.celzero.bravedns.util.UIUtils.getDnsStatusStringRes -import com.celzero.bravedns.util.Utilities -import com.celzero.firestack.backend.Backend -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -class ODoHEndpointAdapter(private val context: Context, private val appConfig: AppConfig) : - PagingDataAdapter(DIFF_CALLBACK) { - - var lifecycleOwner: LifecycleOwner? = null - - companion object { - private const val ONE_SEC = 1000L - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - oldConnection: ODoHEndpoint, - newConnection: ODoHEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected == newConnection.isSelected) - } - - override fun areContentsTheSame( - oldConnection: ODoHEndpoint, - newConnection: ODoHEndpoint - ): Boolean { - return (oldConnection.id == newConnection.id && - oldConnection.isSelected != newConnection.isSelected) - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ODoHEndpointViewHolder { - val itemBinding = - ListItemEndpointBinding.inflate(LayoutInflater.from(parent.context), parent, false) - lifecycleOwner = parent.findViewTreeLifecycleOwner() - return ODoHEndpointViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: ODoHEndpointViewHolder, position: Int) { - val endpoint: ODoHEndpoint = getItem(position) ?: return - holder.update(endpoint) - } - - inner class ODoHEndpointViewHolder(private val b: ListItemEndpointBinding) : - RecyclerView.ViewHolder(b.root) { - private var statusCheckJob: Job? = null - - fun update(endpoint: ODoHEndpoint) { - displayDetails(endpoint) - setupClickListeners(endpoint) - } - - private fun setupClickListeners(endpoint: ODoHEndpoint) { - b.root.setOnClickListener { updateConnection(endpoint) } - b.endpointInfoImg.setOnClickListener { showExplanationOnImageClick(endpoint) } - b.endpointCheck.setOnClickListener { updateConnection(endpoint) } - } - - private fun displayDetails(endpoint: ODoHEndpoint) { - b.endpointName.text = endpoint.name - b.endpointCheck.isChecked = endpoint.isSelected - - if (endpoint.isSelected && VpnController.hasTunnel() && !appConfig.isSmartDnsEnabled()) { - keepSelectedStatusUpdated() - } else if (endpoint.isSelected) { - b.endpointDesc.text = context.getString(R.string.rt_filter_parent_selected) - } else { - b.endpointDesc.text = "" - } - - // Shows either the info/delete icon for the DoH entries. - showIcon(endpoint) - } - - private fun keepSelectedStatusUpdated() { - statusCheckJob = ui { - while (true) { - updateSelectedStatus() - delay(ONE_SEC) - } - } - } - - private fun updateSelectedStatus() { - // if the view is not active then cancel the job - if ( - lifecycleOwner - ?.lifecycle - ?.currentState - ?.isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED) == false || - bindingAdapterPosition == RecyclerView.NO_POSITION - ) { - statusCheckJob?.cancel() - return - } - - updateDnsStatus() - - } - - private fun updateDnsStatus() { - io { - // always use the id as Dnsx.Preffered as it is the primary dns id for now - val state = VpnController.getDnsStatus(Backend.Preferred) - val status = getDnsStatusStringRes(state) - uiCtx { - b.endpointDesc.text = context.getString(status).replaceFirstChar(Char::titlecase) - } - } - } - - private fun showIcon(endpoint: ODoHEndpoint) { +private const val TAG = "ODoHEndpointAdapter" + +@Composable +fun ODoHEndpointRow(endpoint: ODoHEndpoint, appConfig: AppConfig) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val explanation = + rememberDnsStatusExplanation( + key = endpoint.id, + isSelected = endpoint.isSelected, + smartDnsEnabled = appConfig.isSmartDnsEnabled(), + tag = TAG + ) + var infoDialog by remember(endpoint.id) { mutableStateOf(null) } + var deleteDialog by remember(endpoint.id) { mutableStateOf(null) } + + DnsEndpointRow( + title = endpoint.name, + supporting = explanation.ifEmpty { null }, + selected = endpoint.isSelected, + action = if (endpoint.isDeletable()) DnsRowAction.Delete else DnsRowAction.Info, + selection = DnsRowSelection.Radio, + onActionClick = { if (endpoint.isDeletable()) { - b.endpointInfoImg.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_fab_uninstall) - ) + deleteDialog = + DnsDeleteDialogModel( + id = endpoint.id, + titleRes = R.string.dot_custom_url_remove_dialog_title, + messageRes = R.string.dot_custom_url_remove_dialog_message, + successRes = R.string.doh_custom_url_remove_success + ) } else { - b.endpointInfoImg.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_info) - ) + infoDialog = + DnsInfoDialogModel( + title = endpoint.name, + message = + endpoint.proxy + "\n\n" + endpoint.resolver + "\n\n" + + resolveDnsDescriptionText(context, endpoint.desc), + copyValue = endpoint.resolver + ) } - } - - private fun updateConnection(endpoint: ODoHEndpoint) { - Logger.d( - LOG_TAG_DNS, - "on-ODoH change ${endpoint.name}, ${endpoint.proxy}, ${endpoint.resolver}, ${endpoint.isSelected}" - ) - io { + }, + onSelectionChange = { + launchDnsEndpointSelectionUpdate(scope, context, TAG) { endpoint.isSelected = true appConfig.handleODoHChanges(endpoint) } } + ) - private fun deleteEndpoint(id: Int) { - io { - appConfig.deleteODoHEndpoint(id) - uiCtx { - Utilities.showToastUiCentered( - context, - context.getString(R.string.doh_custom_url_remove_success), - Toast.LENGTH_SHORT - ) - } - } - } - - private fun showExplanationOnImageClick(endpoint: ODoHEndpoint) { - if (endpoint.isDeletable()) showDeleteDialog(endpoint.id) - else - showDoTMetadataDialog( - endpoint.name, - endpoint.proxy, - endpoint.resolver, - endpoint.desc - ) - } - - private fun showDoTMetadataDialog( - title: String, - proxy: String, - resolver: String, - message: String? - ) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(title) - builder.setMessage(proxy + "\n\n" + resolver + "\n\n" + getDnsDesc(message)) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.dns_info_positive)) { - dialogInterface, - _ -> - dialogInterface.dismiss() - } - builder.setNeutralButton(context.getString(R.string.dns_info_neutral)) { - _: DialogInterface, - _: Int -> - clipboardCopy(context, resolver, context.getString(R.string.copy_clipboard_label)) - Utilities.showToastUiCentered( - context, - context.getString(R.string.info_dialog_url_copy_toast_msg), - Toast.LENGTH_SHORT - ) - } - builder.create().show() - } - - private fun getDnsDesc(message: String?): String { - if (message.isNullOrEmpty()) return "" - - return try { - if (message.contains("R.string.")) { - val m = message.substringAfter("R.string.") - val resId: Int = - context.resources.getIdentifier(m, "string", context.packageName) - context.getString(resId) - } else { - message + deleteDialog?.let { model -> + DnsDeleteDialog( + model = model, + onDismiss = { deleteDialog = null }, + onConfirm = { id -> + launchDnsEndpointDelete(scope, context, model.successRes) { + appConfig.deleteODoHEndpoint(id) } - } catch (_: Exception) { - "" - } - } - - private fun showDeleteDialog(id: Int) { - val builder = MaterialAlertDialogBuilder(context) - builder.setTitle(R.string.dot_custom_url_remove_dialog_title) - builder.setMessage(R.string.dot_custom_url_remove_dialog_message) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.lbl_delete)) { _, _ -> - deleteEndpoint(id) - } - - builder.setNegativeButton(context.getString(R.string.lbl_cancel)) { _, _ -> - // no-op + deleteDialog = null } - builder.create().show() - } - - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } - } - - private fun ui(f: suspend () -> Unit): Job? { - return lifecycleOwner?.lifecycleScope?.launch { withContext(Dispatchers.Main) { f() } } - } + ) + } - private fun io(f: suspend () -> Unit) { - lifecycleOwner?.lifecycleScope?.launch { withContext(Dispatchers.IO) { f() } } - } + infoDialog?.let { model -> + DnsInfoDialog( + model = model, + onDismiss = { infoDialog = null } + ) } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/OneWgConfigAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/OneWgConfigAdapter.kt index 1cd2f01bc..ad21374ee 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/OneWgConfigAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/OneWgConfigAdapter.kt @@ -15,28 +15,48 @@ */ package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_PROXY import android.content.Context import android.content.Intent import android.text.format.DateUtils -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup import android.widget.Toast -import androidx.core.view.isVisible -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.findViewTreeLifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.ui.platform.LocalContext +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.AssistChip +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Checkbox +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.compose.LocalLifecycleOwner import com.celzero.bravedns.R import com.celzero.bravedns.database.EventSource import com.celzero.bravedns.database.EventType import com.celzero.bravedns.database.Severity import com.celzero.bravedns.database.WgConfigFiles -import com.celzero.bravedns.databinding.ListItemWgOneInterfaceBinding import com.celzero.bravedns.net.doh.Transaction import com.celzero.bravedns.service.EventLogger import com.celzero.bravedns.service.ProxyManager @@ -47,470 +67,530 @@ import com.celzero.bravedns.service.WireguardManager.ERR_CODE_VPN_NOT_ACTIVE import com.celzero.bravedns.service.WireguardManager.ERR_CODE_VPN_NOT_FULL import com.celzero.bravedns.service.WireguardManager.ERR_CODE_WG_INVALID import com.celzero.bravedns.service.WireguardManager.WG_UPTIME_THRESHOLD -import com.celzero.bravedns.ui.activity.WgConfigDetailActivity -import com.celzero.bravedns.ui.activity.WgConfigDetailActivity.Companion.INTENT_EXTRA_WG_TYPE -import com.celzero.bravedns.ui.activity.WgConfigEditorActivity.Companion.INTENT_EXTRA_WG_ID +import com.celzero.bravedns.ui.compose.wireguard.WgType import com.celzero.bravedns.util.UIUtils -import com.celzero.bravedns.util.UIUtils.fetchColor import com.celzero.bravedns.util.Utilities import com.celzero.firestack.backend.RouterStats +import io.github.aakira.napier.Napier import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job import kotlinx.coroutines.delay +import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import androidx.compose.ui.res.stringResource -class OneWgConfigAdapter(private val context: Context, private val listener: DnsStatusListener, private val eventLogger: EventLogger) : - PagingDataAdapter(DIFF_CALLBACK) { - private var lifecycleOwner: LifecycleOwner? = null +private const val DELAY_MS = 1500L - interface DnsStatusListener { - fun onDnsStatusChanged() +data class ProtocolChips( + val ipv4: Boolean = false, + val ipv6: Boolean = false, + val splitTunnel: Boolean = false +) { + fun hasAny(): Boolean { + return ipv4 || ipv6 || splitTunnel } +} - companion object { - private const val DELAY_MS = 1500L - private const val TAG = "OneWgCfgAdapter" - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - - override fun areItemsTheSame( - oldConnection: WgConfigFiles, - newConnection: WgConfigFiles - ): Boolean { - return oldConnection == newConnection - } - - override fun areContentsTheSame( - oldConnection: WgConfigFiles, - newConnection: WgConfigFiles - ): Boolean { - return oldConnection == newConnection - } - } +data class OneWgUiState( + val isActive: Boolean, + val statusText: String, + val appsText: String, + val showAppsCount: Boolean, + val showActiveLayout: Boolean, + val uptimeText: String, + val rxtxText: String, + val strokeColor: Color, + val strokeWidth: Dp +) + +@Composable +fun OneWgConfigRow( + config: WgConfigFiles, + eventLogger: EventLogger, + onDnsStatusChanged: () -> Unit, + onConfigDetailClick: (Int, WgType) -> Unit +) { + val context = LocalContext.current + val lifecycleOwner = androidx.lifecycle.compose.LocalLifecycleOwner.current + val scope = rememberCoroutineScope() + var isChecked by remember(config.id, config.isActive) { + mutableStateOf(config.isActive && VpnController.hasTunnel()) } - - override fun onBindViewHolder(holder: WgInterfaceViewHolder, position: Int) { - val wgConfigFiles: WgConfigFiles = getItem(position) ?: return - holder.update(wgConfigFiles) + var statusText by remember(config.id) { + mutableStateOf(context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase)) } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WgInterfaceViewHolder { - val itemBinding = - ListItemWgOneInterfaceBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - if (lifecycleOwner == null) { - lifecycleOwner = parent.findViewTreeLifecycleOwner() - } - return WgInterfaceViewHolder(itemBinding) - } - - override fun onViewDetachedFromWindow(holder: WgInterfaceViewHolder) { - super.onViewDetachedFromWindow(holder) - holder.cancelJobIfAny() - } - - inner class WgInterfaceViewHolder(private val b: ListItemWgOneInterfaceBinding) : - RecyclerView.ViewHolder(b.root) { - private var job: Job? = null - - fun update(config: WgConfigFiles) { - b.interfaceNameText.text = config.name - b.interfaceNameText.isSelected = true - b.interfaceIdText.text = context.getString(R.string.single_argument_parenthesis, config.id.toString()) - val isWgActive = config.isActive && VpnController.hasTunnel() - b.oneWgCheck.isChecked = isWgActive - setupClickListeners(config) - if (isWgActive) { - keepStatusUpdated(config) - } else { - cancelJobIfAny() - disableInterface() - } - } - - fun cancelJobIfAny() { - if (job?.isActive == true) { - job?.cancel() + var appsText by remember(config.id) { mutableStateOf("") } + var showAppsCount by remember(config.id) { mutableStateOf(false) } + var showActiveLayout by remember(config.id) { mutableStateOf(false) } + var uptimeText by remember(config.id) { mutableStateOf("") } + var rxtxText by remember(config.id) { mutableStateOf("") } + val errorColor = MaterialTheme.colorScheme.error + val onSurfaceVariantColor = MaterialTheme.colorScheme.onSurfaceVariant + val tertiaryColor = MaterialTheme.colorScheme.tertiary + var strokeColor by remember(config.id, errorColor) { mutableStateOf(errorColor) } + var strokeWidth by remember(config.id) { mutableStateOf(0.dp) } + var protocolChips by remember(config.id) { mutableStateOf(ProtocolChips()) } + var inProgress by remember(config.id) { mutableStateOf(false) } + + LaunchedEffect(config.id, config.isActive) { + protocolChips = withContext(Dispatchers.IO) { computeProtocolChips(config) } + while (isActive) { + if (!lifecycleOwner.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) { + delay(DELAY_MS) + continue } - } - - private fun keepStatusUpdated(config: WgConfigFiles) { - job = io { - while (true) { - updateStatus(config) - delay(DELAY_MS) + val uiState = + withContext(Dispatchers.IO) { + computeOneWgStatusUi( + context = context, + config = config, + errorColor = errorColor, + onSurfaceVariantColor = onSurfaceVariantColor, + tertiaryColor = tertiaryColor + ) } - } + isChecked = uiState.isActive + statusText = uiState.statusText + appsText = uiState.appsText + showAppsCount = uiState.showAppsCount + showActiveLayout = uiState.showActiveLayout + uptimeText = uiState.uptimeText + rxtxText = uiState.rxtxText + strokeColor = uiState.strokeColor + strokeWidth = uiState.strokeWidth + delay(DELAY_MS) } + } - private fun updateProtocolChip(pair: Pair) { - if (b.protocolInfoChipGroup.isVisible) return - - if (!pair.first && !pair.second) { - b.protocolInfoChipGroup.visibility = View.GONE - return - } - b.protocolInfoChipGroup.visibility = View.VISIBLE - if (pair.first) { - b.protocolInfoChipIpv4.visibility = View.VISIBLE - } else { - b.protocolInfoChipIpv4.visibility = View.GONE - } - if (pair.second) { - b.protocolInfoChipIpv6.visibility = View.VISIBLE - } else { - b.protocolInfoChipIpv6.visibility = View.GONE - } + Card( + modifier = + Modifier + .fillMaxWidth() + .padding(vertical = 4.dp) + .clickable { launchOneWgConfigDetail(context, config.id, onConfigDetailClick) }, + shape = RoundedCornerShape(18.dp), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceContainerLow + ), + border = if (strokeWidth > 0.dp) { + BorderStroke(strokeWidth, strokeColor) + } else { + BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f)) } + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(14.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + Column(modifier = Modifier.weight(1f)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + text = config.name, + style = MaterialTheme.typography.titleMedium + ) + Spacer(modifier = Modifier.width(6.dp)) + Text( + text = + context.getString( + R.string.single_argument_parenthesis, + config.id.toString() + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f) + ) + } + if (isChecked && protocolChips.hasAny()) { + Row( + modifier = Modifier.padding(top = 6.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp) + ) { + if (protocolChips.ipv4) { + WgChip(text = stringResource(R.string.settings_ip_text_ipv4)) + } + if (protocolChips.ipv6) { + WgChip(text = context.getString(R.string.settings_ip_text_ipv6)) + } + if (protocolChips.splitTunnel) { + WgChip(text = context.getString(R.string.lbl_split)) + } + } + } + } - private fun updateSplitTunnelChip(isSplitTunnel: Boolean) { - if (isSplitTunnel) { - b.chipSplitTunnel.visibility = View.VISIBLE - } else { - b.chipSplitTunnel.visibility = View.GONE + Checkbox( + checked = isChecked, + onCheckedChange = { checked -> + if (inProgress) return@Checkbox + inProgress = true + scope.launch(Dispatchers.IO) { + val success = + if (checked) { + enableOneWgIfPossible(context, config, onDnsStatusChanged, eventLogger) + } else { + disableOneWgIfPossible(context, config, onDnsStatusChanged, eventLogger) + } + withContext(Dispatchers.Main) { + isChecked = if (checked) success else !success + inProgress = false + } + } + } + ) } - } - private suspend fun updateStatus(config: WgConfigFiles) { - // if the view is not active then cancel the job - if ( - lifecycleOwner - ?.lifecycle - ?.currentState - ?.isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED) == false - ) { - job?.cancel() - return - } + Text( + text = statusText, + style = MaterialTheme.typography.bodySmall, + fontStyle = FontStyle.Italic, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f), + modifier = Modifier.padding(top = 4.dp) + ) - if (config.isActive && !VpnController.hasTunnel()) { - // Fix: disableInterface() modifies UI, must run on main thread - uiCtx { disableInterface() } - return + if (showAppsCount) { + Text( + text = appsText, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.padding(top = 4.dp) + ) } - val id = ProxyManager.ID_WG_BASE + config.id - val statusPair = VpnController.getProxyStatusById(id) - val pair = VpnController.getSupportedIpVersion(id) - val c = WireguardManager.getConfigById(config.id) - val stats = VpnController.getProxyStats(id) - val dnsStatusId = VpnController.getDnsStatus(ProxyManager.ID_WG_BASE + config.id) - val isSplitTunnel = - if (c?.getPeers()?.isNotEmpty() == true) { - VpnController.isSplitTunnelProxy(id, pair) - } else { - false + if (showActiveLayout) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = uptimeText, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.weight(1f) + ) + Text( + text = rxtxText, + style = MaterialTheme.typography.bodySmall + ) } - uiCtx { - updateStatusUi(config, statusPair, dnsStatusId, stats) - updateProtocolChip(pair) - updateSplitTunnelChip(isSplitTunnel) } } + } +} - private fun isDnsError(statusId: Long?): Boolean { - if (statusId == null) return true - - val s = Transaction.Status.fromId(statusId) - return s == Transaction.Status.BAD_QUERY || s == Transaction.Status.BAD_RESPONSE || s == Transaction.Status.NO_RESPONSE || s == Transaction.Status.SEND_FAIL || s == Transaction.Status.CLIENT_ERROR || s == Transaction.Status.INTERNAL_ERROR || s == Transaction.Status.TRANSPORT_ERROR +suspend fun computeProtocolChips(config: WgConfigFiles): ProtocolChips { + val id = ProxyManager.ID_WG_BASE + config.id + val pair = VpnController.getSupportedIpVersion(id) + val cfg = WireguardManager.getConfigById(config.id) + val splitTunnel = + if (cfg?.getPeers()?.isNotEmpty() == true) { + VpnController.isSplitTunnelProxy(id, pair) + } else { + false } + return ProtocolChips( + ipv4 = pair.first, + ipv6 = pair.second, + splitTunnel = splitTunnel + ) +} - private fun updateStatusUi(config: WgConfigFiles, statusPair: Pair, dnsStatusId: Long?, stats: RouterStats?) { - if (config.isActive && VpnController.hasTunnel()) { - b.interfaceDetailCard.strokeWidth = 2 - b.oneWgCheck.isChecked = true - b.interfaceAppsCount.visibility = View.VISIBLE - b.interfaceAppsCount.text = context.getString(R.string.one_wg_apps_added) - - if (dnsStatusId != null) { - // check for dns failure cases and update the UI - if (isDnsError(dnsStatusId)) { - b.interfaceDetailCard.strokeColor = fetchColor(context, R.attr.chipTextNegative) - b.interfaceStatus.text = - context.getString(R.string.status_failing).replaceFirstChar(Char::titlecase) - } else { - // if dns status is not failing, then update the proxy status - updateProxyStatusUi(statusPair, stats) - } - } else { - // in one wg mode, if dns status should be available, this is a fallback case - updateProxyStatusUi(statusPair, stats) - } +suspend fun computeOneWgStatusUi( + context: Context, + config: WgConfigFiles, + errorColor: Color, + onSurfaceVariantColor: Color, + tertiaryColor: Color +): OneWgUiState { + if (config.isActive && !VpnController.hasTunnel()) { + return OneWgUiState( + isActive = false, + statusText = context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase), + appsText = "", + showAppsCount = false, + showActiveLayout = false, + uptimeText = "", + rxtxText = "", + strokeColor = errorColor, + strokeWidth = 0.dp + ) + } - b.interfaceActiveLayout.visibility = View.VISIBLE - val rxtx = getRxTx(stats) - val time = getUpTime(stats) - - if (time.isNotEmpty()) { - val t = context.getString(R.string.logs_card_duration, time) - b.interfaceActiveUptime.text = - context.getString( - R.string.two_argument_space, - context.getString(R.string.lbl_active), - t - ) - } else { - b.interfaceActiveUptime.text = context.getString(R.string.lbl_active) - } - b.interfaceActiveRxTx.text = rxtx - } else { - disableInterface() - } + if (!config.isActive || !VpnController.hasTunnel()) { + return OneWgUiState( + isActive = false, + statusText = context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase), + appsText = "", + showAppsCount = false, + showActiveLayout = false, + uptimeText = "", + rxtxText = "", + strokeColor = errorColor, + strokeWidth = 0.dp + ) + } + + val id = ProxyManager.ID_WG_BASE + config.id + val statusPair = VpnController.getProxyStatusById(id) + val stats = VpnController.getProxyStats(id) + val dnsStatusId = VpnController.getDnsStatus(id) + val statusText = + if (dnsStatusId != null && isOneWgDnsError(dnsStatusId)) { + context.getString(R.string.status_failing).replaceFirstChar(Char::titlecase) + } else { + getOneWgStatusText( + context, + UIUtils.ProxyStatus.entries.find { it.id == statusPair.first }, + getOneWgHandshakeTime(stats).toString(), + stats, + statusPair.second + ) } - private fun getStrokeColorForStatus(status: UIUtils.ProxyStatus?, stats: RouterStats?): Int{ - val now = System.currentTimeMillis() - val lastOk = stats?.lastOK ?: 0L - val since = stats?.since ?: 0L - val isFailing = now - since > WG_UPTIME_THRESHOLD && lastOk == 0L - return when (status) { - UIUtils.ProxyStatus.TOK -> if (isFailing) R.attr.chipTextNeutral else R.attr.accentGood - UIUtils.ProxyStatus.TUP, UIUtils.ProxyStatus.TZZ, UIUtils.ProxyStatus.TNT -> R.attr.chipTextNeutral - else -> R.attr.chipTextNegative // TKO, TEND - } + val strokeColor = + if (dnsStatusId != null && isOneWgDnsError(dnsStatusId)) { + errorColor + } else { + val status = + UIUtils.ProxyStatus.entries.find { it.id == statusPair.first } + getOneWgStrokeColorForStatus( + status = status, + stats = stats, + errorColor = errorColor, + onSurfaceVariantColor = onSurfaceVariantColor, + tertiaryColor = tertiaryColor + ) } - private fun getStatusText( - status: UIUtils.ProxyStatus?, - handshakeTime: String? = null, - stats: RouterStats?, - errMsg: String? = null - ): String { - if (status == null) { - val txt = if (errMsg != null) { - context.getString(R.string.status_waiting) + " ($errMsg)" - } else { - context.getString(R.string.status_waiting) - } - return txt.replaceFirstChar(Char::titlecase) - } + val rxtx = getOneWgRxTx(context, stats) + val time = getOneWgUpTime(stats) + val uptimeText = + if (time.isNotEmpty()) { + val t = context.getString(R.string.logs_card_duration, time) + context.getString( + R.string.two_argument_space, + context.getString(R.string.lbl_active), + t + ) + } else { + context.getString(R.string.lbl_active) + } - val now = System.currentTimeMillis() - val lastOk = stats?.lastOK ?: 0L - val since = stats?.since ?: 0L - if (now - since > WG_UPTIME_THRESHOLD && lastOk == 0L) { - return context.getString(R.string.status_failing).replaceFirstChar(Char::titlecase) - } + return OneWgUiState( + isActive = true, + statusText = statusText, + appsText = context.getString(R.string.one_wg_apps_added), + showAppsCount = true, + showActiveLayout = true, + uptimeText = uptimeText, + rxtxText = rxtx, + strokeColor = strokeColor, + strokeWidth = 2.dp + ) +} - val baseText = context.getString(UIUtils.getProxyStatusStringRes(status.id)) - .replaceFirstChar(Char::titlecase) +private fun isOneWgDnsError(statusId: Long?): Boolean { + if (statusId == null) return true + val s = Transaction.Status.fromId(statusId) + return s == Transaction.Status.BAD_QUERY || + s == Transaction.Status.BAD_RESPONSE || + s == Transaction.Status.NO_RESPONSE || + s == Transaction.Status.SEND_FAIL || + s == Transaction.Status.CLIENT_ERROR || + s == Transaction.Status.INTERNAL_ERROR || + s == Transaction.Status.TRANSPORT_ERROR +} - return if (stats?.lastOK != 0L && handshakeTime != null) { - context.getString(R.string.about_version_install_source, baseText, handshakeTime) +private fun getOneWgStrokeColorForStatus( + status: UIUtils.ProxyStatus?, + stats: RouterStats?, + errorColor: Color, + onSurfaceVariantColor: Color, + tertiaryColor: Color +): Color { + val now = System.currentTimeMillis() + val lastOk = stats?.lastOK ?: 0L + val since = stats?.since ?: 0L + val isFailing = now - since > WG_UPTIME_THRESHOLD && lastOk == 0L + return when (status) { + UIUtils.ProxyStatus.TOK -> + if (isFailing) { + onSurfaceVariantColor } else { - baseText + tertiaryColor } - } + UIUtils.ProxyStatus.TUP, + UIUtils.ProxyStatus.TZZ, + UIUtils.ProxyStatus.TNT -> onSurfaceVariantColor + else -> errorColor + } +} - private fun updateProxyStatusUi(statusPair: Pair, stats: RouterStats?) { - val status = - UIUtils.ProxyStatus.entries.find { it.id == statusPair.first } // Convert to enum +private fun getOneWgStatusText( + context: Context, + status: UIUtils.ProxyStatus?, + handshakeTime: String? = null, + stats: RouterStats?, + errMsg: String? = null +): String { + if (status == null) { + val txt = + if (errMsg != null) { + context.getString(R.string.status_waiting) + " ($errMsg)" + } else { + context.getString(R.string.status_waiting) + } + return txt.replaceFirstChar(Char::titlecase) + } - val handshakeTime = getHandshakeTime(stats).toString() + val now = System.currentTimeMillis() + val lastOk = stats?.lastOK ?: 0L + val since = stats?.since ?: 0L + if (now - since > WG_UPTIME_THRESHOLD && lastOk == 0L) { + return context.getString(R.string.status_failing).replaceFirstChar(Char::titlecase) + } - val strokeColor = getStrokeColorForStatus(status, stats) - b.interfaceDetailCard.strokeColor = fetchColor(context, strokeColor) - val statusText = getStatusText(status, handshakeTime, stats, statusPair.second) - b.interfaceStatus.text = statusText - } + val baseText = + context.getString(UIUtils.getProxyStatusStringRes(status.id)) + .replaceFirstChar(Char::titlecase) + return if (stats?.lastOK != 0L && handshakeTime != null) { + context.getString(R.string.about_version_install_source, baseText, handshakeTime) + } else { + baseText + } +} - private fun disableInterface() { - b.interfaceDetailCard.strokeWidth = 0 - b.protocolInfoChipGroup.visibility = View.GONE - b.interfaceAppsCount.visibility = View.GONE - b.oneWgCheck.isChecked = false - b.interfaceActiveLayout.visibility = View.GONE - b.interfaceStatus.text = - context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase) - } +private fun getOneWgUpTime(stats: RouterStats?): CharSequence { + if (stats == null) return "" + if (stats.since <= 0L) return "" + val now = System.currentTimeMillis() + return DateUtils.getRelativeTimeSpanString( + stats.since, + now, + DateUtils.MINUTE_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE + ) +} - private fun getUpTime(stats: RouterStats?): CharSequence { - if (stats == null) { - return "" - } - if (stats.since <= 0L) { - return "" - } - val now = System.currentTimeMillis() - // returns a string describing 'time' as a time relative to 'now' - return DateUtils.getRelativeTimeSpanString( - stats.since, - now, - DateUtils.MINUTE_IN_MILLIS, - DateUtils.FORMAT_ABBREV_RELATIVE - ) - } +private fun getOneWgRxTx(context: Context, stats: RouterStats?): String { + if (stats == null) return "" + val rx = + context.getString( + R.string.symbol_download, + Utilities.humanReadableByteCount(stats.rx, true) + ) + val tx = + context.getString( + R.string.symbol_upload, + Utilities.humanReadableByteCount(stats.tx, true) + ) + return context.getString(R.string.two_argument_space, tx, rx) +} - private fun getRxTx(stats: RouterStats?): String { - if (stats == null) return "" - val rx = - context.getString( - R.string.symbol_download, - Utilities.humanReadableByteCount(stats.rx, true) - ) - val tx = - context.getString( - R.string.symbol_upload, - Utilities.humanReadableByteCount(stats.tx, true) - ) - return context.getString(R.string.two_argument_space, tx, rx) - } +private fun getOneWgHandshakeTime(stats: RouterStats?): CharSequence { + if (stats == null) return "" + if (stats.lastOK == 0L) return "" + val now = System.currentTimeMillis() + return DateUtils.getRelativeTimeSpanString( + stats.lastOK, + now, + DateUtils.MINUTE_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE + ) +} - private fun getHandshakeTime(stats: RouterStats?): CharSequence { - if (stats == null) { - return "" - } - if (stats.lastOK == 0L) { - return "" - } - val now = System.currentTimeMillis() - // returns a string describing 'time' as a time relative to 'now' - return DateUtils.getRelativeTimeSpanString( - stats.lastOK, - now, - DateUtils.MINUTE_IN_MILLIS, - DateUtils.FORMAT_ABBREV_RELATIVE +suspend fun enableOneWgIfPossible(context: Context, config: WgConfigFiles, onDnsStatusChanged: () -> Unit, eventLogger: EventLogger): Boolean { + if (!VpnController.hasTunnel()) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + ERR_CODE_VPN_NOT_ACTIVE + + context.getString(R.string.settings_socks5_vpn_disabled_error), + Toast.LENGTH_LONG ) } + return false + } - fun setupClickListeners(config: WgConfigFiles) { - b.interfaceDetailCard.setOnClickListener { launchConfigDetail(config.id) } - - b.oneWgCheck.setOnClickListener { - val isChecked = b.oneWgCheck.isChecked - io { - if (isChecked) { - enableWgIfPossible(config) - } else { - disableWgIfPossible(config) - } - } - } + if (!WireguardManager.canEnableProxy()) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + ERR_CODE_VPN_NOT_FULL + context.getString(R.string.wireguard_enabled_failure), + Toast.LENGTH_LONG + ) } + return false + } - private suspend fun enableWgIfPossible(config: WgConfigFiles) { - if (!VpnController.hasTunnel()) { - Logger.i(LOG_TAG_PROXY, "$TAG VPN not active, cannot enable WireGuard") - uiCtx { - Utilities.showToastUiCentered( - context, - ERR_CODE_VPN_NOT_ACTIVE + - context.getString(R.string.settings_socks5_vpn_disabled_error), - Toast.LENGTH_LONG - ) - // reset the check box - b.oneWgCheck.isChecked = false - } - return - } - - if (!WireguardManager.canEnableProxy()) { - Logger.i(LOG_TAG_PROXY, "not in DNS+Firewall mode, cannot enable WireGuard") - uiCtx { - // reset the check box - b.oneWgCheck.isChecked = false - Utilities.showToastUiCentered( - context, - ERR_CODE_VPN_NOT_FULL + - context.getString(R.string.wireguard_enabled_failure), - Toast.LENGTH_LONG - ) - } - return - } - - if (WireguardManager.isAnyOtherOneWgEnabled(config.id)) { - Logger.i(LOG_TAG_PROXY, "another WireGuard is already enabled") - uiCtx { - // reset the check box - b.oneWgCheck.isChecked = false - Utilities.showToastUiCentered( - context, - ERR_CODE_OTHER_WG_ACTIVE + - context.getString(R.string.wireguard_enabled_failure), - Toast.LENGTH_LONG - ) - } - return - } - - if (!WireguardManager.isValidConfig(config.id)) { - Logger.i(LOG_TAG_PROXY, "invalid WireGuard config") - uiCtx { - // reset the check box - b.oneWgCheck.isChecked = false - Utilities.showToastUiCentered( - context, - ERR_CODE_WG_INVALID + context.getString(R.string.wireguard_enabled_failure), - Toast.LENGTH_LONG - ) - } - return - } - - Logger.i(LOG_TAG_PROXY, "enabling WireGuard, id: ${config.id}") - WireguardManager.updateOneWireGuardConfig(config.id, owg = true) - config.oneWireGuard = true - WireguardManager.enableConfig(config.toImmutable()) - uiCtx { listener.onDnsStatusChanged() } - logEvent("One-WireGuard enabled", "WG ID: ${config.id}") + if (WireguardManager.isAnyOtherOneWgEnabled(config.id)) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + ERR_CODE_OTHER_WG_ACTIVE + context.getString(R.string.wireguard_enabled_failure), + Toast.LENGTH_LONG + ) } + return false + } - private suspend fun disableWgIfPossible(config: WgConfigFiles) { - if (!VpnController.hasTunnel()) { - Logger.i(LOG_TAG_PROXY, "VPN not active, cannot disable WireGuard") - uiCtx { - // reset the check box - b.oneWgCheck.isChecked = true - Utilities.showToastUiCentered( - context, - ERR_CODE_VPN_NOT_ACTIVE + - context.getString(R.string.settings_socks5_vpn_disabled_error), - Toast.LENGTH_LONG - ) - } - return - } - - Logger.i(LOG_TAG_PROXY, "disabling WireGuard, id: ${config.id}") - WireguardManager.updateOneWireGuardConfig(config.id, owg = false) - config.oneWireGuard = false - WireguardManager.disableConfig(config.toImmutable()) - uiCtx { listener.onDnsStatusChanged() } - logEvent("One-WireGuard disabled", "WG ID: ${config.id}") + if (!WireguardManager.isValidConfig(config.id)) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + ERR_CODE_WG_INVALID + context.getString(R.string.wireguard_enabled_failure), + Toast.LENGTH_LONG + ) } + return false + } - private fun launchConfigDetail(id: Int) { - if (!VpnController.hasTunnel()) { - Utilities.showToastUiCentered( - context, - context.getString(R.string.ssv_toast_start_rethink), - Toast.LENGTH_SHORT - ) - return - } + WireguardManager.updateOneWireGuardConfig(config.id, owg = true) + config.oneWireGuard = true + WireguardManager.enableConfig(config.toImmutable()) + withContext(Dispatchers.Main) { onDnsStatusChanged() } + logOneWgEvent(eventLogger, "One-WireGuard enabled", "WG ID: ${config.id}") + return true +} - val intent = Intent(context, WgConfigDetailActivity::class.java) - intent.putExtra(INTENT_EXTRA_WG_ID, id) - intent.putExtra(INTENT_EXTRA_WG_TYPE, WgConfigDetailActivity.WgType.ONE_WG.value) - context.startActivity(intent) +suspend fun disableOneWgIfPossible(context: Context, config: WgConfigFiles, onDnsStatusChanged: () -> Unit, eventLogger: EventLogger): Boolean { + if (!VpnController.hasTunnel()) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + ERR_CODE_VPN_NOT_ACTIVE + + context.getString(R.string.settings_socks5_vpn_disabled_error), + Toast.LENGTH_LONG + ) } + return false } - private fun logEvent(msg: String, details: String) { - eventLogger.log(EventType.PROXY_SWITCH, Severity.LOW, msg, EventSource.UI, false, details) - } + WireguardManager.updateOneWireGuardConfig(config.id, owg = false) + config.oneWireGuard = false + WireguardManager.disableConfig(config.toImmutable()) + withContext(Dispatchers.Main) { onDnsStatusChanged() } + logOneWgEvent(eventLogger, "One-WireGuard disabled", "WG ID: ${config.id}") + return true +} - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } +private fun launchOneWgConfigDetail(context: Context, id: Int, onConfigDetailClick: (Int, WgType) -> Unit) { + if (!VpnController.hasTunnel()) { + Utilities.showToastUiCentered( + context, + context.getString(R.string.ssv_toast_start_rethink), + Toast.LENGTH_SHORT + ) + return } - private fun io(f: suspend () -> Unit): Job? { - return lifecycleOwner?.lifecycleScope?.launch(Dispatchers.IO) { f() } - } + onConfigDetailClick(id, WgType.ONE_WG) +} + +private fun logOneWgEvent(eventLogger: EventLogger, msg: String, details: String) { + eventLogger.log(EventType.PROXY_SWITCH, Severity.LOW, msg, EventSource.UI, false, details) } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/RemoteAdvancedViewAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/RemoteAdvancedViewAdapter.kt index 5ae3b1965..b6b837916 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/RemoteAdvancedViewAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/RemoteAdvancedViewAdapter.kt @@ -15,191 +15,28 @@ */ package com.celzero.bravedns.adapter -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.celzero.bravedns.R +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.database.RethinkRemoteFileTag -import com.celzero.bravedns.databinding.ListItemRethinkBlocklistAdvBinding -import com.celzero.bravedns.service.RethinkBlocklistManager -import com.celzero.bravedns.ui.fragment.RethinkBlocklistFragment -import com.celzero.bravedns.util.UIUtils.fetchColor import com.celzero.bravedns.util.UIUtils.openUrl -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -class RemoteAdvancedViewAdapter(val context: Context) : - PagingDataAdapter< - RethinkRemoteFileTag, - RemoteAdvancedViewAdapter.RethinkRemoteFileTagViewHolder - >(DIFF_CALLBACK) { - - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - - override fun areItemsTheSame( - oldConnection: RethinkRemoteFileTag, - newConnection: RethinkRemoteFileTag - ): Boolean { - return oldConnection == newConnection - } - - override fun areContentsTheSame( - oldConnection: RethinkRemoteFileTag, - newConnection: RethinkRemoteFileTag - ): Boolean { - return oldConnection == newConnection - } - } - } - - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int - ): RethinkRemoteFileTagViewHolder { - val itemBinding = - ListItemRethinkBlocklistAdvBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - return RethinkRemoteFileTagViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: RethinkRemoteFileTagViewHolder, position: Int) { - val filetag: RethinkRemoteFileTag = getItem(position) ?: return - - holder.update(filetag, position) - } - - inner class RethinkRemoteFileTagViewHolder(private val b: ListItemRethinkBlocklistAdvBinding) : - RecyclerView.ViewHolder(b.root) { - - fun update(filetag: RethinkRemoteFileTag, position: Int) { - b.root.tag = getGroupName(filetag.group) - displayHeaderIfNeeded(filetag, position) - displayMetaData(filetag) - - b.crpCheckBox.setOnClickListener { toggleCheckbox(b.crpCheckBox.isChecked, filetag) } - - b.crpCard.setOnClickListener { toggleCheckbox(!b.crpCheckBox.isChecked, filetag) } - - b.crpDescEntriesTv.setOnClickListener { openUrl(context, filetag.url[0]) } - } - - private fun displayMetaData(filetag: RethinkRemoteFileTag) { - b.crpLabelTv.text = filetag.vname - - if (filetag.subg.isEmpty()) { - b.crpDescGroupTv.text = filetag.group - } else { - b.crpDescGroupTv.text = filetag.subg - } - setEntries(filetag) - - b.crpCheckBox.isChecked = filetag.isSelected - setCardBackground(filetag.isSelected) - } - - private fun setEntries(filetag: RethinkRemoteFileTag) { - b.crpDescEntriesTv.text = - context.getString(R.string.dc_entries, filetag.entries.toString()) - - if (filetag.level.isNullOrEmpty()) return - - val level = filetag.level?.get(0) ?: return - when (level) { - 0 -> { - val color = fetchColor(context, R.attr.chipTextPositive) - val bgColor = fetchColor(context, R.attr.chipBgColorPositive) - b.crpDescEntriesTv.setTextColor(color) - b.crpDescEntriesTv.chipBackgroundColor = ColorStateList.valueOf(bgColor) - } - 1 -> { - val color = fetchColor(context, R.attr.chipTextNeutral) - val bgColor = fetchColor(context, R.attr.chipBgColorNeutral) - b.crpDescEntriesTv.setTextColor(color) - b.crpDescEntriesTv.chipBackgroundColor = ColorStateList.valueOf(bgColor) - } - 2 -> { - val color = fetchColor(context, R.attr.chipTextNegative) - val bgColor = fetchColor(context, R.attr.chipBgColorNegative) - b.crpDescEntriesTv.setTextColor(color) - b.crpDescEntriesTv.chipBackgroundColor = ColorStateList.valueOf(bgColor) - } - else -> { - /* no-op */ - } - } - } - - private fun getTitleDesc(title: String): String { - return if (title.equals(RethinkBlocklistManager.PARENTAL_CONTROL.name, true)) { - context.getString(RethinkBlocklistManager.PARENTAL_CONTROL.desc) - } else if (title.equals(RethinkBlocklistManager.SECURITY.name, true)) { - context.getString(RethinkBlocklistManager.SECURITY.desc) - } else if (title.equals(RethinkBlocklistManager.PRIVACY.name, true)) { - context.getString(RethinkBlocklistManager.PRIVACY.desc) - } else { - "" - } - } - - private fun setCardBackground(isSelected: Boolean) { - if (isSelected) { - b.crpCard.setCardBackgroundColor(fetchColor(context, R.attr.selectedCardBg)) - } else { - b.crpCard.setCardBackgroundColor(fetchColor(context, R.attr.background)) - } - } - - private fun toggleCheckbox(isSelected: Boolean, filetag: RethinkRemoteFileTag) { - b.crpCheckBox.isChecked = isSelected - setCardBackground(isSelected) - setFileTag(filetag, isSelected) - } - - private fun setFileTag(filetag: RethinkRemoteFileTag, selected: Boolean) { - io { - filetag.isSelected = selected - RethinkBlocklistManager.updateFiletagRemote(filetag) - val list = RethinkBlocklistManager.getSelectedFileTagsRemote().toSet() - RethinkBlocklistFragment.updateFileTagList(list) - } - } - - private fun displayHeaderIfNeeded(filetag: RethinkRemoteFileTag, position: Int) { - if (position == 0 || getItem(position - 1)?.group != filetag.group) { - b.crpTitleLl.visibility = View.VISIBLE - b.crpBlocktypeHeadingTv.text = getGroupName(filetag.group) - b.crpBlocktypeDescTv.text = getTitleDesc(filetag.group) - return - } - - b.crpTitleLl.visibility = View.GONE - } - - private fun getGroupName(group: String): String { - return if (group.equals(RethinkBlocklistManager.PARENTAL_CONTROL.name, true)) { - context.getString(RethinkBlocklistManager.PARENTAL_CONTROL.label) - } else if (group.equals(RethinkBlocklistManager.SECURITY.name, true)) { - context.getString(RethinkBlocklistManager.SECURITY.label) - } else if (group.equals(RethinkBlocklistManager.PRIVACY.name, true)) { - context.getString(RethinkBlocklistManager.PRIVACY.label) - } else { - "" - } - } - - private fun io(f: suspend () -> Unit) { - CoroutineScope(Dispatchers.IO).launch { f() } - } - } +@Composable +fun RemoteAdvancedBlocklistRow( + filetag: RethinkRemoteFileTag, + showHeader: Boolean, + onToggle: (Boolean) -> Unit +) { + val context = LocalContext.current + BlocklistAdvancedRow( + group = filetag.group, + subGroup = filetag.subg, + name = filetag.vname, + entries = filetag.entries, + level = filetag.level?.firstOrNull(), + entryUrl = filetag.url.firstOrNull(), + isSelected = filetag.isSelected, + showHeader = showHeader, + onToggle = onToggle, + onEntryClick = { url -> openUrl(context, url) } + ) } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/RemoteSimpleViewAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/RemoteSimpleViewAdapter.kt index c65b0d5e7..0e1898127 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/RemoteSimpleViewAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/RemoteSimpleViewAdapter.kt @@ -15,184 +15,25 @@ */ package com.celzero.bravedns.adapter -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.cardview.widget.CardView -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.celzero.bravedns.R +import androidx.compose.runtime.Composable import com.celzero.bravedns.database.RemoteBlocklistPacksMap -import com.celzero.bravedns.databinding.ListItemRethinkBlocklistSimpleBinding -import com.celzero.bravedns.service.RethinkBlocklistManager -import com.celzero.bravedns.ui.fragment.RethinkBlocklistFragment -import com.celzero.bravedns.util.UIUtils.fetchColor -import com.celzero.bravedns.util.UIUtils.fetchToggleBtnColors -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch - -class RemoteSimpleViewAdapter(val context: Context) : - PagingDataAdapter( - DIFF_CALLBACK - ) { - - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - - override fun areItemsTheSame( - oldConnection: RemoteBlocklistPacksMap, - newConnection: RemoteBlocklistPacksMap - ): Boolean { - return oldConnection == newConnection - } - - override fun areContentsTheSame( - oldConnection: RemoteBlocklistPacksMap, - newConnection: RemoteBlocklistPacksMap - ): Boolean { - return oldConnection == newConnection - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RethinkSimpleViewHolder { - val itemBinding = - ListItemRethinkBlocklistSimpleBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - return RethinkSimpleViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: RethinkSimpleViewHolder, position: Int) { - val map: RemoteBlocklistPacksMap = getItem(position) ?: return - holder.update(map, position) - } - - inner class RethinkSimpleViewHolder(private val b: ListItemRethinkBlocklistSimpleBinding) : - RecyclerView.ViewHolder(b.root) { - - fun update(map: RemoteBlocklistPacksMap, position: Int) { - b.root.tag = getGroupName(map.group) - displayMetaData(map, position) - setupClickListener(map) - } - - private fun setupClickListener(map: RemoteBlocklistPacksMap) { - b.crpCheckBox.setOnClickListener { toggleCheckbox(b.crpCheckBox.isChecked, map) } - - b.crpCard.setOnClickListener { toggleCheckbox(!b.crpCheckBox.isChecked, map) } - } - - private fun setCardBackground(card: CardView, isSelected: Boolean) { - if (isSelected) { - card.setCardBackgroundColor(fetchColor(context, R.attr.selectedCardBg)) - } else { - card.setCardBackgroundColor(fetchColor(context, R.attr.background)) - } - } - - private fun toggleCheckbox(isSelected: Boolean, map: RemoteBlocklistPacksMap) { - b.crpCheckBox.isChecked = isSelected - setCardBackground(b.crpCard, isSelected) - setFileTag(map.blocklistIds.toMutableList(), if (isSelected) 1 else 0) - } - - private fun setFileTag(tagIds: MutableList, selected: Int) { - io { - RethinkBlocklistManager.updateFiletagsRemote(tagIds.toSet(), selected) - val selectedTags = RethinkBlocklistManager.getSelectedFileTagsRemote().toSet() - RethinkBlocklistFragment.updateFileTagList(selectedTags) - ui { notifyDataSetChanged() } - } - } - - private fun displayMetaData(map: RemoteBlocklistPacksMap, position: Int) { - setCardBackground(b.crpCard, false) - - // check to show the title and desc, as of now these values are predefined so checking - // with those pre defined values. - if (position == 0 || getItem(position - 1)?.group != map.group) { - b.crpTitleLl.visibility = View.VISIBLE - b.crpBlocktypeHeadingTv.text = getGroupName(map.group) - b.crpBlocktypeDescTv.text = getTitleDesc(map.group) - } else { - b.crpTitleLl.visibility = View.GONE - } - - b.crpLabelTv.text = map.pack.replaceFirstChar(Char::titlecase) - b.crpDescGroupTv.text = - context.getString( - R.string.rsv_blocklist_count_text, - map.blocklistIds.size.toString() - ) - - val selectedTags = RethinkBlocklistFragment.getSelectedFileTags() - // enable the check box if the stamp contains all the values - b.crpCheckBox.isChecked = selectedTags.containsAll(map.blocklistIds) - setCardBackground(b.crpCard, b.crpCheckBox.isChecked) - - // show level indicator - showLevelIndicator(b.crpLevelIndicator, map.level) - } - - private fun showLevelIndicator(mIconIndicator: TextView, level: Int) { - when (level) { - 0 -> { - val color = fetchToggleBtnColors(context, R.color.firewallNoRuleToggleBtnBg) - mIconIndicator.setBackgroundColor(color) - } - 1 -> { - val color = fetchToggleBtnColors(context, R.color.firewallWhiteListToggleBtnTxt) - mIconIndicator.setBackgroundColor(color) - } - 2 -> { - val color = fetchToggleBtnColors(context, R.color.firewallBlockToggleBtnTxt) - mIconIndicator.setBackgroundColor(color) - } - else -> { - /* no-op */ - } - } - } - - private fun getTitleDesc(title: String): String { - return if (title.equals(RethinkBlocklistManager.PARENTAL_CONTROL.name, true)) { - context.getString(RethinkBlocklistManager.PARENTAL_CONTROL.desc) - } else if (title.equals(RethinkBlocklistManager.SECURITY.name, true)) { - context.getString(RethinkBlocklistManager.SECURITY.desc) - } else if (title.equals(RethinkBlocklistManager.PRIVACY.name, true)) { - context.getString(RethinkBlocklistManager.PRIVACY.desc) - } else { - "" - } - } - - // handle the group name (filetag.json) - private fun getGroupName(group: String): String { - return if (group.equals(RethinkBlocklistManager.PARENTAL_CONTROL.name, true)) { - context.getString(RethinkBlocklistManager.PARENTAL_CONTROL.label) - } else if (group.equals(RethinkBlocklistManager.SECURITY.name, true)) { - context.getString(RethinkBlocklistManager.SECURITY.label) - } else if (group.equals(RethinkBlocklistManager.PRIVACY.name, true)) { - context.getString(RethinkBlocklistManager.PRIVACY.label) - } else { - "" - } - } - - private fun io(f: suspend () -> Unit) { - CoroutineScope(Dispatchers.IO).launch { f() } - } - - private fun ui(f: () -> Unit) { - CoroutineScope(Dispatchers.Main).launch { f() } - } - } +import com.celzero.bravedns.ui.rethink.RethinkBlocklistState + +@Composable +fun RemoteSimpleBlocklistRow( + map: RemoteBlocklistPacksMap, + showHeader: Boolean, + onToggle: (Boolean) -> Unit +) { + val selectedTags = RethinkBlocklistState.getSelectedFileTags() + val isSelected = selectedTags.containsAll(map.blocklistIds) + + BlocklistSimpleRow( + group = map.group, + pack = map.pack, + blocklistCount = map.blocklistIds.size, + isSelected = isSelected, + showHeader = showHeader, + onToggle = onToggle + ) } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/RethinkEndpointAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/RethinkEndpointAdapter.kt index e649f5b8b..84b6182e7 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/RethinkEndpointAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/RethinkEndpointAdapter.kt @@ -16,208 +16,99 @@ package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_DNS import android.content.Context -import android.content.DialogInterface -import android.content.Intent -import android.view.LayoutInflater -import android.view.ViewGroup import android.widget.Toast -import androidx.core.content.ContextCompat -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.findViewTreeLifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext import com.celzero.bravedns.R import com.celzero.bravedns.data.AppConfig import com.celzero.bravedns.database.RethinkDnsEndpoint -import com.celzero.bravedns.databinding.RethinkEndpointListItemBinding -import com.celzero.bravedns.service.RethinkBlocklistManager import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.ui.activity.ConfigureRethinkBasicActivity -import com.celzero.bravedns.util.UIUtils +import com.celzero.bravedns.ui.compose.theme.RethinkMultiActionDialog import com.celzero.bravedns.util.UIUtils.clipboardCopy import com.celzero.bravedns.util.Utilities -import com.celzero.firestack.backend.Backend -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext +import com.celzero.bravedns.ui.compose.dns.ConfigureRethinkScreenType -class RethinkEndpointAdapter(private val context: Context, private val appConfig: AppConfig) : - PagingDataAdapter( - DIFF_CALLBACK - ) { +private const val TAG = "RethinkEndpointAdapter" - var lifecycleOwner: LifecycleOwner? = null - - companion object { - private const val ONE_SEC = 1000L - private const val TAG = "RethinkEndpointAdapter" - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - oldConnection: RethinkDnsEndpoint, - newConnection: RethinkDnsEndpoint - ): Boolean { - return (oldConnection.url == newConnection.url && - oldConnection.isActive == newConnection.isActive) - } - - override fun areContentsTheSame( - oldConnection: RethinkDnsEndpoint, - newConnection: RethinkDnsEndpoint - ): Boolean { - return (oldConnection.url == newConnection.url && - oldConnection.isActive != newConnection.isActive) - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RethinkEndpointViewHolder { - val itemBinding = - RethinkEndpointListItemBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - lifecycleOwner = parent.findViewTreeLifecycleOwner() - return RethinkEndpointViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: RethinkEndpointViewHolder, position: Int) { - val doHEndpoint: RethinkDnsEndpoint = getItem(position) ?: return - holder.update(doHEndpoint) - } - - inner class RethinkEndpointViewHolder(private val b: RethinkEndpointListItemBinding) : - RecyclerView.ViewHolder(b.root) { - private var statusCheckJob: Job? = null - - fun update(endpoint: RethinkDnsEndpoint) { - displayDetails(endpoint) - setupClickListeners(endpoint) - } - - private fun setupClickListeners(endpoint: RethinkDnsEndpoint) { - b.root.setOnClickListener { updateConnection(endpoint) } - b.rethinkEndpointListActionImage.setOnClickListener { showDohMetadataDialog(endpoint) } - b.rethinkEndpointListCheckImage.setOnClickListener { updateConnection(endpoint) } - } - - private fun displayDetails(endpoint: RethinkDnsEndpoint) { - b.rethinkEndpointListUrlName.text = endpoint.name - b.rethinkEndpointListCheckImage.isChecked = endpoint.isActive - - // Shows either the info/delete icon for the DoH entries. - showIcon(endpoint) - - if (endpoint.isActive && VpnController.hasTunnel() && !appConfig.isSmartDnsEnabled()) { - keepSelectedStatusUpdated(endpoint) - } else if (endpoint.isActive) { - b.rethinkEndpointListUrlExplanation.text = - context.getString(R.string.rt_filter_parent_selected) - } else { - b.rethinkEndpointListUrlExplanation.text = "" - } - } - - private fun keepSelectedStatusUpdated(endpoint: RethinkDnsEndpoint) { - statusCheckJob = io { - while (true) { - updateBlocklistStatusText(endpoint) - delay(ONE_SEC) - } - } - } - - private suspend fun updateBlocklistStatusText(endpoint: RethinkDnsEndpoint) { - // if the view is not active then cancel the job - if ( - lifecycleOwner - ?.lifecycle - ?.currentState - ?.isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED) == false || - bindingAdapterPosition == RecyclerView.NO_POSITION - ) { - statusCheckJob?.cancel() - return - } - - updateDnsStatus(endpoint) - } +private sealed class RethinkDialogState { + data class Info(val endpoint: RethinkDnsEndpoint) : RethinkDialogState() +} - private suspend fun updateDnsStatus(endpoint: RethinkDnsEndpoint) { - val state = VpnController.getDnsStatus(Backend.Preferred) - val status = UIUtils.getDnsStatusStringRes(state) - uiCtx { - // show the status as it is if it is not connected +@Composable +fun RethinkEndpointRow( + endpoint: RethinkDnsEndpoint, + appConfig: AppConfig, + onEditConfiguration: (ConfigureRethinkScreenType, String, String) -> Unit = { _, _, _ -> } +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val explanation = + rememberDnsStatusExplanation( + key = "${endpoint.url}:${endpoint.blocklistCount}", + isSelected = endpoint.isActive, + smartDnsEnabled = appConfig.isSmartDnsEnabled(), + tag = TAG, + statusTextMapper = { ctx, status -> if (status != R.string.dns_connected) { - b.rethinkEndpointListUrlExplanation.text = - context.getString(status).replaceFirstChar(Char::titlecase) - return@uiCtx - } - - if (endpoint.blocklistCount > 0) { - b.rethinkEndpointListUrlExplanation.text = - context.getString( - R.string.dns_connected_rethink_plus, - endpoint.blocklistCount.toString() - ) + ctx.getString(status).replaceFirstChar(Char::titlecase) + } else if (endpoint.blocklistCount > 0) { + ctx.getString( + R.string.dns_connected_rethink_plus, + endpoint.blocklistCount.toString() + ) } else { - b.rethinkEndpointListUrlExplanation.text = context.getString(status) + ctx.getString(status) } } - - } - - private fun showIcon(endpoint: RethinkDnsEndpoint) { - if (endpoint.isEditable(context)) { - b.rethinkEndpointListActionImage.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_edit_icon) - ) - } else { - b.rethinkEndpointListActionImage.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.ic_info) - ) - } - } - - private fun updateConnection(endpoint: RethinkDnsEndpoint) { - Logger.d( - LOG_TAG_DNS, - "$TAG rdns update; ${endpoint.name}, ${endpoint.url}, ${endpoint.isActive}" - ) - - io { + ) + var dialogState by remember(endpoint.url) { mutableStateOf(null) } + + DnsEndpointRow( + title = endpoint.name, + supporting = explanation.ifEmpty { null }, + selected = endpoint.isActive, + action = if (endpoint.isEditable(context)) DnsRowAction.Edit else DnsRowAction.Info, + selection = DnsRowSelection.Radio, + onActionClick = { dialogState = RethinkDialogState.Info(endpoint) }, + onSelectionChange = { + launchDnsEndpointSelectionUpdate(scope, context, TAG) { endpoint.isActive = true appConfig.handleRethinkChanges(endpoint) } } - - private fun showDohMetadataDialog(endpoint: RethinkDnsEndpoint) { - val builder = MaterialAlertDialogBuilder(context, R.style.App_Dialog_NoDim) - builder.setTitle(endpoint.name) - builder.setMessage(endpoint.url + "\n\n" + endpoint.desc) - builder.setCancelable(true) - if (endpoint.isEditable(context)) { - builder.setPositiveButton(context.getString(R.string.rt_edit_dialog_positive)) { _, _ -> - openEditConfiguration(endpoint) - } + ) + + dialogState?.let { state -> + val info = state as RethinkDialogState.Info + val editEnabled = info.endpoint.isEditable(context) + val positiveText = + if (editEnabled) { + context.getString(R.string.rt_edit_dialog_positive) } else { - builder.setPositiveButton(context.getString(R.string.dns_info_positive)) { dialogInterface, _ -> - dialogInterface.dismiss() - } + context.getString(R.string.dns_info_positive) } - builder.setNeutralButton(context.getString(R.string.dns_info_neutral)) { _: DialogInterface, _: Int -> + RethinkMultiActionDialog( + onDismissRequest = { dialogState = null }, + title = info.endpoint.name, + message = info.endpoint.url + "\n\n" + info.endpoint.desc, + primaryText = positiveText, + onPrimary = { + dialogState = null + if (editEnabled) { + openEditConfiguration(context, endpoint, onEditConfiguration) + } + }, + secondaryText = context.getString(R.string.dns_info_neutral), + onSecondary = { clipboardCopy( context, - endpoint.url, + info.endpoint.url, context.getString(R.string.copy_clipboard_label) ) Utilities.showToastUiCentered( @@ -226,36 +117,23 @@ class RethinkEndpointAdapter(private val context: Context, private val appConfig Toast.LENGTH_SHORT ) } - builder.create().show() - } - - private fun openEditConfiguration(endpoint: RethinkDnsEndpoint) { - - if (!VpnController.hasTunnel()) { - Utilities.showToastUiCentered( - context, - context.getString(R.string.ssv_toast_start_rethink), - Toast.LENGTH_SHORT - ) - return - } - - val intent = Intent(context, ConfigureRethinkBasicActivity::class.java) - intent.putExtra( - ConfigureRethinkBasicActivity.RETHINK_BLOCKLIST_TYPE, - RethinkBlocklistManager.RethinkBlocklistType.REMOTE - ) - intent.putExtra(ConfigureRethinkBasicActivity.RETHINK_BLOCKLIST_NAME, endpoint.name) - intent.putExtra(ConfigureRethinkBasicActivity.RETHINK_BLOCKLIST_URL, endpoint.url) - context.startActivity(intent) - } - - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } - } + ) + } +} - private fun io(f: suspend () -> Unit): Job? { - return lifecycleOwner?.lifecycleScope?.launch { withContext(Dispatchers.IO) { f() } } - } +private fun openEditConfiguration( + context: Context, + endpoint: RethinkDnsEndpoint, + onEditConfiguration: (ConfigureRethinkScreenType, String, String) -> Unit +) { + if (!VpnController.hasTunnel()) { + Utilities.showToastUiCentered( + context, + context.getString(R.string.ssv_toast_start_rethink), + Toast.LENGTH_SHORT + ) + return } + + onEditConfiguration(ConfigureRethinkScreenType.REMOTE, endpoint.name, endpoint.url) } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/RethinkLogAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/RethinkLogAdapter.kt index 904fa8b2f..c7cbc8760 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/RethinkLogAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/RethinkLogAdapter.kt @@ -16,32 +16,43 @@ limitations under the License. package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_UI + import android.content.Context import android.graphics.drawable.Drawable -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.core.content.ContextCompat -import androidx.fragment.app.FragmentActivity -import androidx.lifecycle.Lifecycle -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.ui.platform.LocalContext +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import com.celzero.bravedns.R import com.celzero.bravedns.database.ConnectionTracker import com.celzero.bravedns.database.RethinkLog -import com.celzero.bravedns.databinding.ListItemConnTrackBinding import com.celzero.bravedns.service.FirewallManager import com.celzero.bravedns.service.FirewallRuleset import com.celzero.bravedns.service.ProxyManager import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.ui.bottomsheet.ConnTrackerBottomSheet import com.celzero.bravedns.util.Constants.Companion.TIME_FORMAT_1 import com.celzero.bravedns.util.KnownPorts import com.celzero.bravedns.util.Protocol @@ -49,386 +60,360 @@ import com.celzero.bravedns.util.UIUtils import com.celzero.bravedns.util.UIUtils.getDurationInHumanReadableFormat import com.celzero.bravedns.util.Utilities import com.celzero.bravedns.util.Utilities.getIcon -import com.google.gson.Gson +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import io.github.aakira.napier.Napier import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.util.Locale -class RethinkLogAdapter(private val context: Context) : - PagingDataAdapter(DIFF_CALLBACK) { - - companion object { - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - - override fun areItemsTheSame(oldConnection: RethinkLog, newConnection: RethinkLog) = - oldConnection.id == newConnection.id - - override fun areContentsTheSame( - oldConnection: RethinkLog, - newConnection: RethinkLog - ) = oldConnection == newConnection - } - - private const val MAX_BYTES = 500000 // 500 KB - private const val MAX_TIME_TCP = 135 // seconds - private const val MAX_TIME_UDP = 135 // seconds - private const val RTT_SHORT_THRESHOLD_MS = 20 // milliseconds - - const val DNS_IP_TEMPLATE_V4 = "10.111.222.3" - const val DNS_IP_TEMPLATE_V6 = "fd66:f83a:c650::3" - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RethinkLogViewHolder { - val itemBinding = - ListItemConnTrackBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - return RethinkLogViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: RethinkLogViewHolder, position: Int) { - val log: RethinkLog = getItem(position) ?: return - holder.update(log) - holder.setTag(log) - } - - inner class RethinkLogViewHolder(private val b: ListItemConnTrackBinding) : - RecyclerView.ViewHolder(b.root) { - - fun update(log: RethinkLog) { - displayTransactionDetails(log) - displayProtocolDetails(log.port, log.protocol) - displayAppDetails(log) - displaySummaryDetails(log) - // case: when the rule is set to RULE12 but no proxy is set, consider this as error - // handle this as special case, and display the RULE1C hint - // RULE1C is the hint for RULE12 with no proxy set. - val blocked = if (log.blockedByRule == FirewallRuleset.RULE12.id) { - log.proxyDetails.isEmpty() - } else { - log.isBlocked - } - val rule = if (log.blockedByRule == FirewallRuleset.RULE12.id && log.proxyDetails.isEmpty()) { - FirewallRuleset.RULE18.id - } else { - log.blockedByRule - } - displayFirewallRulesetHint(log.isBlocked, rule) - - b.connectionParentLayout.setOnClickListener { openBottomSheet(log) } +private const val MAX_BYTES = 500000 // 500 KB +private const val MAX_TIME_TCP = 135 // seconds +private const val MAX_TIME_UDP = 135 // seconds + +const val DNS_IP_TEMPLATE_V4 = "10.111.222.3" +const val DNS_IP_TEMPLATE_V6 = "fd66:f83a:c650::3" + +@Composable +fun RethinkLogRow( + log: RethinkLog, + onShowConnTracker: (ConnectionTracker) -> Unit +) { + val context = LocalContext.current + val time = Utilities.convertLongToTime(log.timeStamp, TIME_FORMAT_1) + val protocolLabel = protocolLabel(context, log.port, log.protocol) + val indicatorColor = hintColor(context, log) + val summary = summaryInfo(context, log) + val flag = log.flag + val ipAddress = + if (log.ipAddress == DNS_IP_TEMPLATE_V4 || log.ipAddress == DNS_IP_TEMPLATE_V6) { + stringResource(R.string.dns_mode_info_title) + } else { + log.ipAddress } - fun setTag(log: RethinkLog) { - b.connectionResponseTime.tag = log.timeStamp - b.root.tag = log.timeStamp - } + var appName by remember(log.uid, log.appName) { mutableStateOf(log.appName) } + var appIcon by remember(log.uid) { mutableStateOf(null) } - private fun openBottomSheet(log: RethinkLog) { - if (context !is FragmentActivity) { - Logger.w(LOG_TAG_UI, "err opening the connection tracker bottomsheet") - return - } - // ToDo: get rid of rethink btm sht if not required - val bottomSheetFragment = ConnTrackerBottomSheet() - // see AppIpRulesAdapter.kt#openBottomSheet() - val bundle = Bundle() - bundle.putString(ConnTrackerBottomSheet.INSTANCE_STATE_IPDETAILS, Gson().toJson(log)) - bottomSheetFragment.arguments = bundle - bottomSheetFragment.show(context.supportFragmentManager, bottomSheetFragment.tag) + LaunchedEffect(log.uid, log.appName) { + val apps = + withContext(Dispatchers.IO) { FirewallManager.getPackageNamesByUid(log.uid) } + if (apps.isEmpty()) { + appIcon = Utilities.getDefaultIcon(context) + appName = log.appName + return@LaunchedEffect } - private fun displayTransactionDetails(log: RethinkLog) { - val time = Utilities.convertLongToTime(log.timeStamp, TIME_FORMAT_1) - b.connectionResponseTime.text = time - b.connectionFlag.text = log.flag - - if (log.ipAddress == DNS_IP_TEMPLATE_V4 || log.ipAddress == DNS_IP_TEMPLATE_V6) { - b.connectionIpAddress.text = context.getString(R.string.dns_mode_info_title) + val count = apps.count() + appName = + if (count > 1) { + context.getString( + R.string.ctbs_app_other_apps, + log.appName, + (count - 1).toString() + ) } else { - b.connectionIpAddress.text = log.ipAddress + log.appName } + appIcon = Utilities.getIcon(context, apps[0], "") + } - if (log.dnsQuery.isNullOrEmpty()) { - b.connectionDomain.visibility = View.GONE - } else { - b.connectionDomain.text = log.dnsQuery - b.connectionDomain.visibility = View.VISIBLE - // marquee is not working for the textview, hence the workaround. - b.connectionDomain.isSelected = true - } - } - - private fun displayAppDetails(log: RethinkLog) { - b.connectionAppName.text = log.appName - - io { - val apps = FirewallManager.getPackageNamesByUid(log.uid) - uiCtx { - if (apps.isEmpty()) { - loadAppIcon(Utilities.getDefaultIcon(context)) - return@uiCtx - } - - val count = apps.count() - val appName = - if (count > 1) { - context.getString( - R.string.ctbs_app_other_apps, - log.appName, - (count).minus(1).toString() - ) - } else { - log.appName - } - - b.connectionAppName.text = appName - loadAppIcon(getIcon(context, apps[0], /*No app name */ "")) - } + val dnsQuery = log.dnsQuery + + Column( + modifier = + Modifier + .fillMaxWidth() + .clickable { onShowConnTracker(toConnectionTracker(log)) } + .padding(horizontal = 10.dp, vertical = 8.dp), + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(10.dp) + ) { + Box( + modifier = + Modifier + .width(1.5.dp) + .fillMaxHeight() + .background(indicatorColor ?: Color.Transparent) + ) + val iconDrawable = appIcon ?: Utilities.getDefaultIcon(context) + val iconPainter = rememberDrawablePainter(iconDrawable) + iconPainter?.let { painter -> + Image( + painter = painter, + contentDescription = null, + modifier = Modifier.size(32.dp) + ) } - } - - private fun displayProtocolDetails(port: Int, proto: Int) { - // Instead of showing the port name and protocol, now the ports are resolved with - // known ports(reserved port and protocol identifiers). - // https://github.com/celzero/rethink-app/issues/42 - #3 - transport + protocol. - val resolvedPort = KnownPorts.resolvePort(port) - // case: for UDP/443 label it as HTTP3 instead of HTTPS - b.connLatencyTxt.text = - if (port == KnownPorts.HTTPS_PORT && proto == Protocol.UDP.protocolType) { - context.getString(R.string.connection_http3) - } else if (resolvedPort != KnownPorts.PORT_VAL_UNKNOWN) { - resolvedPort.uppercase(Locale.ROOT) - } else { - Protocol.getProtocolName(proto).name - } - } - - private fun displayFirewallRulesetHint(isBlocked: Boolean, ruleName: String) { - when { - // hint red when blocked - isBlocked -> { - b.connectionStatusIndicator.visibility = View.VISIBLE - val isError = FirewallRuleset.isProxyError(ruleName) - if (isError) { - b.connectionStatusIndicator.setBackgroundColor( - UIUtils.fetchColor(context, R.attr.chipTextNeutral) - ) - } else { - b.connectionStatusIndicator.setBackgroundColor( - ContextCompat.getColor(context, R.color.colorRed_A400) - ) - } - } - // hint white when whitelisted - (FirewallRuleset.shouldShowHint(ruleName)) -> { - b.connectionStatusIndicator.visibility = View.VISIBLE - b.connectionStatusIndicator.setBackgroundColor( - ContextCompat.getColor(context, R.color.primaryLightColorText) + Column(modifier = Modifier.weight(1f)) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = appName, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.weight(1f) + ) + Text( + text = protocolLabel, + style = MaterialTheme.typography.labelSmall, + modifier = Modifier.padding(horizontal = 6.dp) + ) + Text( + text = flag, + style = MaterialTheme.typography.titleMedium ) } - // no hints, otherwise - else -> { - b.connectionStatusIndicator.visibility = View.INVISIBLE + Text( + text = ipAddress, + style = MaterialTheme.typography.bodyMedium + ) + if (!dnsQuery.isNullOrEmpty()) { + Text( + text = dnsQuery, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f) + ) } } } + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text(text = time, style = MaterialTheme.typography.bodySmall) + Text( + text = summary.duration, + style = MaterialTheme.typography.bodySmall + ) + Text( + text = summary.delay, + style = MaterialTheme.typography.bodySmall + ) + } + if (summary.showSummary) { + Text( + text = summary.dataUsage, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f) + ) + } + Spacer(modifier = Modifier.fillMaxWidth()) + } +} - private fun displaySummaryDetails(log: RethinkLog) { - io { - val connType = ConnectionTracker.ConnType.get(log.connType) - val hasCid = VpnController.hasCid(log.connId, log.uid) - uiCtx { - b.connectionDataUsage.text = "" - b.connectionDelay.text = "" - if ( - log.duration == 0 && - log.downloadBytes == 0L && - log.uploadBytes == 0L && - log.message.isEmpty() - ) { - var hasMinSummary = false - if (hasCid) { - b.connectionSummaryLl.visibility = View.VISIBLE - b.connectionDataUsage.text = context.getString(R.string.lbl_active) - b.connectionDuration.text = context.getString(R.string.symbol_green_circle) - b.connectionDelay.text = "" - hasMinSummary = true - } else { - b.connectionDataUsage.text = "" - b.connectionDuration.text ="" - } - if (connType.isMetered()) { - b.connectionDelay.text = context.getString(R.string.symbol_currency) - hasMinSummary = true - } else { - b.connectionDelay.text = "" - } - - if (isRpnProxy(log.rpid)) { - b.connectionSummaryLl.visibility = View.VISIBLE - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_sparkle) - ) - } else if (isConnectionProxied(log.blockedByRule, log.proxyDetails)) { - b.connectionSummaryLl.visibility = View.VISIBLE - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_key) - ) - hasMinSummary = true - } - if (!hasMinSummary) { - b.connectionSummaryLl.visibility = View.GONE - } - return@uiCtx - } - - b.connectionSummaryLl.visibility = View.VISIBLE - val duration = getDurationInHumanReadableFormat(context, log.duration) - b.connectionDuration.text = context.getString(R.string.single_argument, duration) - // add unicode for download and upload - val download = - context.getString( - R.string.symbol_download, - Utilities.humanReadableByteCount(log.downloadBytes, true) - ) - val upload = - context.getString( - R.string.symbol_upload, - Utilities.humanReadableByteCount(log.uploadBytes, true) - ) - b.connectionDataUsage.text = context.getString(R.string.two_argument, upload, download) - b.connectionDelay.text = "" - if (connType.isMetered()) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_currency) - ) - } - if (isConnectionHeavier(log)) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_heavy) - ) - } - if (isConnectionSlower(log)) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_turtle) - ) - } - // bunny in case rpid as present, key in case of proxy - // bunny and key indicate conn is proxied, so its enough to show one of them - if (isRpnProxy(log.rpid)) { - b.connectionSummaryLl.visibility = View.VISIBLE - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_sparkle) - ) - } else if (containsRelayProxy(log.rpid)) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_bunny) - ) - } else if (isConnectionProxied(log.blockedByRule, log.proxyDetails)) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_key) - ) - } - - // rtt -> show rocket if less than 20ms, treat it as rtt - if (isRoundTripShorter(log.synack, log.isBlocked)) { - b.connectionDelay.text = - context.getString( - R.string.ci_desc, - b.connectionDelay.text, - context.getString(R.string.symbol_rocket) - ) - } +private fun protocolLabel(context: Context, port: Int, proto: Int): String { + val resolvedPort = KnownPorts.resolvePort(port) + return if (port == KnownPorts.HTTPS_PORT && proto == Protocol.UDP.protocolType) { + context.getString(R.string.connection_http3) + } else if (resolvedPort != KnownPorts.PORT_VAL_UNKNOWN) { + resolvedPort.uppercase(Locale.ROOT) + } else { + Protocol.getProtocolName(proto).name + } +} - if (b.connectionDelay.text.isEmpty() && b.connectionDataUsage.text.isEmpty()) { - b.connectionSummaryLl.visibility = View.GONE - } - } - } +@Composable +private fun hintColor(context: Context, log: RethinkLog): Color? { + val blocked = + if (log.blockedByRule == FirewallRuleset.RULE12.id) { + log.proxyDetails.isEmpty() + } else { + log.isBlocked } - - private fun isRoundTripShorter(rtt: Long, blocked: Boolean): Boolean { - return rtt in 1..RTT_SHORT_THRESHOLD_MS && !blocked + val rule = + if (log.blockedByRule == FirewallRuleset.RULE12.id && log.proxyDetails.isEmpty()) { + FirewallRuleset.RULE18.id + } else { + log.blockedByRule } - - private fun containsRelayProxy(rpid: String): Boolean { - return rpid.isNotEmpty() + return when { + blocked -> { + val isError = FirewallRuleset.isProxyError(rule) + if (isError) { + MaterialTheme.colorScheme.onSurfaceVariant + } else { + MaterialTheme.colorScheme.error + } } - - private fun isConnectionProxied(ruleName: String?, proxyDetails: String): Boolean { - if (ruleName == null) return false - val rule = FirewallRuleset.getFirewallRule(ruleName) ?: return false - val proxy = ProxyManager.isNotLocalAndRpnProxy(proxyDetails) - // show key symbol in case of proxy error too - val isProxyError = FirewallRuleset.isProxyError(ruleName) - return (FirewallRuleset.isProxied(rule) && proxyDetails.isNotEmpty() && proxy) || isProxyError + FirewallRuleset.shouldShowHint(rule) -> { + MaterialTheme.colorScheme.onSurfaceVariant } + else -> null + } +} - private fun isRpnProxy(pid: String): Boolean { - return pid.isNotEmpty() && ProxyManager.isRpnProxy(pid) +data class LogSummary(val dataUsage: String, val duration: String, val delay: String, val showSummary: Boolean) + +private fun summaryInfo(context: Context, log: RethinkLog): LogSummary { + val connType = ConnectionTracker.ConnType.get(log.connType) + var dataUsage = "" + var delay = "" + var duration = "" + var showSummary = false + + if (log.duration == 0 && log.downloadBytes == 0L && log.uploadBytes == 0L && log.message.isEmpty()) { + var hasMinSummary = false + if (VpnController.hasCid(log.connId, log.uid)) { + dataUsage = context.getString(R.string.lbl_active) + duration = context.getString(R.string.symbol_green_circle) + hasMinSummary = true } - private fun isConnectionHeavier(log: RethinkLog): Boolean { - return log.downloadBytes + log.uploadBytes > MAX_BYTES + if (connType.isMetered()) { + delay = context.getString(R.string.symbol_currency) + hasMinSummary = true } - private fun isConnectionSlower(log: RethinkLog): Boolean { - return (log.protocol == Protocol.UDP.protocolType && log.duration > MAX_TIME_UDP) || - (log.protocol == Protocol.TCP.protocolType && log.duration > MAX_TIME_TCP) + if (isRpnProxy(log.rpid)) { + delay = + context.getString( + R.string.ci_desc, + delay, + context.getString(R.string.symbol_sparkle) + ) + } else if (isConnectionProxied(log.blockedByRule, log.proxyDetails)) { + delay = + context.getString( + R.string.ci_desc, + delay, + context.getString(R.string.symbol_key) + ) + hasMinSummary = true } + showSummary = hasMinSummary + return LogSummary(dataUsage, duration, delay, showSummary) + } - private fun loadAppIcon(drawable: Drawable?) { - Glide.with(context) - .load(drawable) - .error(Utilities.getDefaultIcon(context)) - .into(b.connectionAppIcon) - } + showSummary = true + duration = context.getString(R.string.single_argument, getDurationInHumanReadableFormat(context, log.duration)) + val download = + context.getString( + R.string.symbol_download, + Utilities.humanReadableByteCount(log.downloadBytes, true) + ) + val upload = + context.getString( + R.string.symbol_upload, + Utilities.humanReadableByteCount(log.uploadBytes, true) + ) + dataUsage = context.getString(R.string.two_argument, upload, download) + + if (connType.isMetered()) { + delay = + context.getString( + R.string.ci_desc, + delay, + context.getString(R.string.symbol_currency) + ) + } + if (isConnectionHeavier(log)) { + delay = + context.getString( + R.string.ci_desc, + delay, + context.getString(R.string.symbol_heavy) + ) + } + if (isConnectionSlower(log)) { + delay = + context.getString( + R.string.ci_desc, + delay, + context.getString(R.string.symbol_turtle) + ) } + if (isRpnProxy(log.rpid)) { + delay = + context.getString( + R.string.ci_desc, + delay, + context.getString(R.string.symbol_sparkle) + ) + } else if (containsRelayProxy(log.rpid)) { + delay = + context.getString( + R.string.ci_desc, + delay, + context.getString(R.string.symbol_bunny) + ) + } else if (isConnectionProxied(log.blockedByRule, log.proxyDetails)) { + delay = + context.getString( + R.string.ci_desc, + delay, + context.getString(R.string.symbol_key) + ) + } + if (isRoundTripShorter(log.synack, log.isBlocked)) { + delay = + context.getString( + R.string.ci_desc, + delay, + context.getString(R.string.symbol_rocket) + ) + } + showSummary = delay.isNotEmpty() || dataUsage.isNotEmpty() + return LogSummary(dataUsage, duration, delay, showSummary) +} + +private fun isRoundTripShorter(rtt: Long, blocked: Boolean): Boolean { + return rtt in 1..20 && !blocked +} - private fun io(f: suspend () -> Unit) { - val owner = context as? LifecycleOwner ?: return +private fun containsRelayProxy(rpid: String): Boolean { + return rpid.isNotEmpty() +} - owner.lifecycleScope.launch(Dispatchers.IO) { f() } - } +private fun isConnectionProxied(ruleName: String?, proxyDetails: String): Boolean { + if (ruleName == null) return false + val rule = FirewallRuleset.getFirewallRule(ruleName) ?: return false + val proxy = ProxyManager.isNotLocalAndRpnProxy(proxyDetails) + val isProxyError = FirewallRuleset.isProxyError(ruleName) + return (FirewallRuleset.isProxied(rule) && proxyDetails.isNotEmpty() && proxy) || isProxyError +} - private suspend fun uiCtx(f: suspend () -> Unit) { - val owner = context as? LifecycleOwner ?: return +private fun isRpnProxy(pid: String): Boolean { + return pid.isNotEmpty() && ProxyManager.isRpnProxy(pid) +} - withContext(Dispatchers.Main.immediate) { - if (!owner.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) { - return@withContext - } +private fun isConnectionHeavier(log: RethinkLog): Boolean { + return log.downloadBytes + log.uploadBytes > MAX_BYTES +} - f() - } - } +private fun isConnectionSlower(log: RethinkLog): Boolean { + return (log.protocol == Protocol.UDP.protocolType && log.duration > MAX_TIME_UDP) || + (log.protocol == Protocol.TCP.protocolType && log.duration > MAX_TIME_TCP) +} + +private fun toConnectionTracker(log: RethinkLog): ConnectionTracker { + val tracker = ConnectionTracker() + tracker.appName = log.appName + tracker.uid = log.uid + tracker.usrId = log.usrId + tracker.ipAddress = log.ipAddress + tracker.port = log.port + tracker.protocol = log.protocol + tracker.isBlocked = log.isBlocked + tracker.blockedByRule = log.blockedByRule + tracker.blocklists = log.blocklists + tracker.proxyDetails = log.proxyDetails + tracker.flag = log.flag + tracker.dnsQuery = log.dnsQuery + tracker.timeStamp = log.timeStamp + tracker.connId = log.connId + tracker.downloadBytes = log.downloadBytes + tracker.uploadBytes = log.uploadBytes + tracker.duration = log.duration + tracker.synack = log.synack + tracker.rpid = log.rpid + tracker.message = log.message + tracker.connType = log.connType + return tracker } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/WgConfigAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/WgConfigAdapter.kt index 4d90dc11a..477474a65 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/WgConfigAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/WgConfigAdapter.kt @@ -15,34 +15,50 @@ */ package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_PROXY -import Logger.LOG_TAG_UI import android.content.Context import android.content.Intent import android.text.format.DateUtils -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup import android.widget.Toast -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.findViewTreeLifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.AssistChip +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.compose.LocalLifecycleOwner import com.celzero.bravedns.R -import com.celzero.bravedns.adapter.OneWgConfigAdapter.DnsStatusListener import com.celzero.bravedns.database.EventSource import com.celzero.bravedns.database.EventType import com.celzero.bravedns.database.Severity import com.celzero.bravedns.database.WgConfigFiles -import com.celzero.bravedns.database.WgConfigFilesImmutable -import com.celzero.bravedns.databinding.ListItemWgGeneralInterfaceBinding import com.celzero.bravedns.net.doh.Transaction import com.celzero.bravedns.service.EventLogger import com.celzero.bravedns.service.ProxyManager -import com.celzero.bravedns.service.ProxyManager.ID_WG_BASE import com.celzero.bravedns.service.VpnController import com.celzero.bravedns.service.WireguardManager import com.celzero.bravedns.service.WireguardManager.ERR_CODE_OTHER_WG_ACTIVE @@ -50,653 +66,573 @@ import com.celzero.bravedns.service.WireguardManager.ERR_CODE_VPN_NOT_ACTIVE import com.celzero.bravedns.service.WireguardManager.ERR_CODE_VPN_NOT_FULL import com.celzero.bravedns.service.WireguardManager.ERR_CODE_WG_INVALID import com.celzero.bravedns.service.WireguardManager.WG_UPTIME_THRESHOLD -import com.celzero.bravedns.ui.activity.WgConfigDetailActivity -import com.celzero.bravedns.ui.activity.WgConfigEditorActivity.Companion.INTENT_EXTRA_WG_ID +import com.celzero.bravedns.ui.compose.wireguard.WgType import com.celzero.bravedns.util.UIUtils -import com.celzero.bravedns.util.UIUtils.fetchColor import com.celzero.bravedns.util.Utilities import com.celzero.bravedns.wireguard.WgHopManager -import com.celzero.bravedns.wireguard.WgInterface -import com.celzero.firestack.backend.Backend import com.celzero.firestack.backend.RouterStats +import io.github.aakira.napier.Napier import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job import kotlinx.coroutines.delay +import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class WgConfigAdapter(private val context: Context, private val listener: DnsStatusListener, private val splitDns: Boolean, private val eventLogger: EventLogger) : - PagingDataAdapter(DIFF_CALLBACK) { - private var lifecycleOwner: LifecycleOwner? = null - - companion object { - private const val DELAY_MS = 1500L - private const val TAG = "WgCfgAdapter" - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - - override fun areItemsTheSame( - oldConnection: WgConfigFiles, - newConnection: WgConfigFiles - ): Boolean { - return oldConnection == newConnection - } - - override fun areContentsTheSame( - oldConnection: WgConfigFiles, - newConnection: WgConfigFiles - ): Boolean { - return oldConnection == newConnection - } - } +private const val DELAY_MS = 1500L + +data class WgChips( + val ipv4: Boolean = false, + val ipv6: Boolean = false, + val splitTunnel: Boolean = false, + val amnezia: Boolean = false, + val hopSrc: Boolean = false, + val hopping: Boolean = false, + val properties: String = "" +) { + fun hasAny(): Boolean { + return ipv4 || + ipv6 || + splitTunnel || + amnezia || + hopSrc || + hopping || + properties.isNotEmpty() } +} - override fun onBindViewHolder(holder: WgInterfaceViewHolder, position: Int) { - val item = getItem(position) - val wgConfigFiles: WgConfigFiles = item ?: return - holder.update(wgConfigFiles) +data class WgUiState( + val isActive: Boolean, + val statusText: String, + val appsText: String, + val showActiveLayout: Boolean, + val uptimeText: String, + val rxtxText: String, + val strokeColor: Color, + val strokeWidth: Dp +) + +@Composable +fun WgConfigRow( + config: WgConfigFiles, + eventLogger: EventLogger, + onDnsStatusChanged: () -> Unit, + onConfigDetailClick: (Int, WgType) -> Unit +) { + val context = LocalContext.current + val lifecycleOwner = LocalLifecycleOwner.current + val scope = rememberCoroutineScope() + var isChecked by remember(config.id, config.isActive) { + mutableStateOf(config.isActive && VpnController.hasTunnel()) } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WgInterfaceViewHolder { - val itemBinding = - ListItemWgGeneralInterfaceBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - if (lifecycleOwner == null) { - lifecycleOwner = parent.findViewTreeLifecycleOwner() - } - return WgInterfaceViewHolder(itemBinding) + var statusText by remember(config.id) { + mutableStateOf(context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase)) } - - override fun onViewDetachedFromWindow(holder: WgInterfaceViewHolder) { - super.onViewDetachedFromWindow(holder) - holder.cancelJobIfAny() - } - - inner class WgInterfaceViewHolder(private val b: ListItemWgGeneralInterfaceBinding) : - RecyclerView.ViewHolder(b.root) { - private var job: Job? = null - - fun update(config: WgConfigFiles) { - b.interfaceNameText.text = config.name - b.interfaceNameText.isSelected = true - b.interfaceIdText.text = context.getString(R.string.single_argument_parenthesis, config.id.toString()) - b.interfaceSwitch.isChecked = config.isActive && VpnController.hasTunnel() - setupClickListeners(config) - val appsCount = ProxyManager.getAppCountForProxy(ID_WG_BASE + config.id) - updateUi(config, appsCount) - updateStatusJob(config) - updateHopSrcChip(config.id) - updateAmneziaChip(config) - updateHoppingChip(config.id) - } - - private fun updateStatusJob(config: WgConfigFiles) { - if (config.isActive && VpnController.hasTunnel()) { - job = updateProxyStatusContinuously(config) - } else { - cancelJobIfAny() - disableInactiveConfig(config) - } - } - - private fun disableInactiveConfig(config: WgConfigFiles) { - if (config.isLockdown) { - b.protocolInfoChipGroup.visibility = View.GONE - b.interfaceActiveLayout.visibility = View.GONE - b.interfaceStatus.visibility = View.GONE - } else { - b.interfaceAppsCount.visibility = View.GONE - b.interfaceActiveLayout.visibility = View.GONE - b.interfaceDetailCard.strokeColor = fetchColor(context, R.attr.background) - b.interfaceDetailCard.strokeWidth = 0 - b.interfaceSwitch.isChecked = false - b.protocolInfoChipGroup.visibility = View.GONE - b.interfaceStatus.visibility = View.VISIBLE - b.interfaceStatus.text = - context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase) - updateProtocolChip(Pair(false, false)) - updateSplitTunnelChip(false) - updateHopSrcChip(config.id) - updateAmneziaChip(config) - updateHoppingChip(config.id) - } - } - - private fun updateProxyStatusContinuously(config: WgConfigFiles): Job? { - return io { - while (true) { - updateStatus(config) - delay(DELAY_MS) + var appsText by remember(config.id) { mutableStateOf("") } + var showActiveLayout by remember(config.id) { mutableStateOf(false) } + var uptimeText by remember(config.id) { mutableStateOf("") } + var rxtxText by remember(config.id) { mutableStateOf("") } + val errorColor = MaterialTheme.colorScheme.error + val onSurfaceVariantColor = MaterialTheme.colorScheme.onSurfaceVariant + val tertiaryColor = MaterialTheme.colorScheme.tertiary + var strokeColor by remember(config.id, errorColor) { mutableStateOf(errorColor) } + var strokeWidth by remember(config.id) { mutableStateOf(0.dp) } + var chips by remember(config.id) { mutableStateOf(WgChips()) } + var inProgress by remember(config.id) { mutableStateOf(false) } + + LaunchedEffect( + config.id, + config.isActive, + config.isCatchAll, + config.useOnlyOnMetered, + config.ssidEnabled + ) { + chips = withContext(Dispatchers.IO) { computeChips(context, config) } + while (isActive) { + if (!lifecycleOwner.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) { + delay(DELAY_MS) + continue + } + val uiState = + withContext(Dispatchers.IO) { + computeStatusUi( + context = context, + config = config, + errorColor = errorColor, + onSurfaceVariantColor = onSurfaceVariantColor, + tertiaryColor = tertiaryColor + ) } - } - } - - private fun updateProtocolChip(pair: Pair?) { - if (pair == null) return - - if (!pair.first && !pair.second) { - b.protocolInfoChipIpv4.visibility = View.GONE - b.protocolInfoChipIpv6.visibility = View.GONE - return - } - b.protocolInfoChipGroup.visibility = View.VISIBLE - b.protocolInfoChipIpv4.visibility = View.GONE - b.protocolInfoChipIpv6.visibility = View.GONE - if (pair.first) { - b.protocolInfoChipIpv4.visibility = View.VISIBLE - b.protocolInfoChipIpv4.text = context.getString(R.string.settings_ip_text_ipv4) - } else { - b.protocolInfoChipIpv4.visibility = View.GONE - } - if (pair.second) { - b.protocolInfoChipIpv6.visibility = View.VISIBLE - b.protocolInfoChipIpv6.text = context.getString(R.string.settings_ip_text_ipv6) - } else { - b.protocolInfoChipIpv6.visibility = View.GONE - } + isChecked = uiState.isActive + statusText = uiState.statusText + appsText = uiState.appsText + showActiveLayout = uiState.showActiveLayout + uptimeText = uiState.uptimeText + rxtxText = uiState.rxtxText + strokeColor = uiState.strokeColor + strokeWidth = uiState.strokeWidth + delay(DELAY_MS) } + } - private fun updateSplitTunnelChip(isSplitTunnel: Boolean) { - if (isSplitTunnel) { - b.chipSplitTunnel.visibility = View.VISIBLE - } else { - b.chipSplitTunnel.visibility = View.GONE - } + Card( + modifier = + Modifier + .fillMaxWidth() + .padding(vertical = 4.dp) + .clickable { launchConfigDetail(context, config.id, onConfigDetailClick) }, + shape = RoundedCornerShape(18.dp), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceContainerLow + ), + border = if (strokeWidth > 0.dp) { + BorderStroke(strokeWidth, strokeColor) + } else { + BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f)) } + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(14.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + Column(modifier = Modifier.weight(1f)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + text = config.name, + style = MaterialTheme.typography.titleMedium + ) + Spacer(modifier = Modifier.width(6.dp)) + Text( + text = + context.getString( + R.string.single_argument_parenthesis, + config.id.toString() + ), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f) + ) + } + if (chips.hasAny()) { + Row( + modifier = Modifier.padding(top = 6.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp) + ) { + if (chips.ipv4) { + WgChip(text = context.getString(R.string.settings_ip_text_ipv4)) + } + if (chips.ipv6) { + WgChip(text = context.getString(R.string.settings_ip_text_ipv6)) + } + if (chips.splitTunnel) { + WgChip(text = context.getString(R.string.lbl_split)) + } + if (chips.amnezia) { + WgChip(text = context.getString(R.string.lbl_amnezia)) + } + if (chips.hopSrc) { + WgChip(text = context.getString(R.string.lbl_hopping)) + } + if (chips.hopping) { + WgChip(text = context.getString(R.string.cd_dns_crypt_relay_heading)) + } + if (chips.properties.isNotEmpty()) { + WgChip(text = chips.properties) + } + } + } + } - private fun updateHopSrcChip(id: Int) { - val sid = ID_WG_BASE + id - val hop = WgHopManager.getMapBySrc(sid) - if (hop.isNotEmpty()) { - b.protocolInfoChipGroup.visibility = View.VISIBLE - b.chipHopSrc.visibility = View.VISIBLE - b.chipHopSrc.text = context.getString( - R.string.two_argument_space, - context.getString(R.string.symbol_bunny), - context.getString(R.string.lbl_hopping) + Switch( + checked = isChecked, + onCheckedChange = { checked -> + if (inProgress) return@Switch + inProgress = true + scope.launch(Dispatchers.IO) { + val success = + if (checked) { + enableWgIfPossible(context, config, onDnsStatusChanged, eventLogger) + } else { + disableWgIfPossible(context, config, onDnsStatusChanged, eventLogger) + } + withContext(Dispatchers.Main) { + isChecked = if (checked) success else !success + inProgress = false + } + } + } ) - } else { - b.chipHopSrc.visibility = View.GONE } - } - private fun updateHoppingChip(id: Int) { - val sid = ID_WG_BASE + id - val hops = WgHopManager.getMapByHop(sid) - if (hops.isNotEmpty()) { - b.protocolInfoChipGroup.visibility = View.VISIBLE - b.chipHopping.visibility = View.VISIBLE - val hopContentTxt = context.getString( - R.string.two_argument_colon, context.getString(R.string.lbl_hop), - hops.joinToString { it.src }) - b.chipHopping.text = context.getString( - R.string.two_argument_space, - context.getString(R.string.symbol_satellite), - hopContentTxt - ) - } else { - b.chipHopping.visibility = View.GONE - } - } + Text( + text = statusText, + style = MaterialTheme.typography.bodySmall, + fontStyle = FontStyle.Italic, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f), + modifier = Modifier.padding(top = 4.dp) + ) - fun cancelJobIfAny() { - if (job?.isActive == true) { - job?.cancel() - } - } + Text( + text = appsText, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.padding(top = 4.dp) + ) - private suspend fun updateStatus(config: WgConfigFiles) { - val id = ID_WG_BASE + config.id - val statusId = VpnController.getProxyStatusById(id) - val pair = VpnController.getSupportedIpVersion(id) - val c = WireguardManager.getConfigById(config.id) - val stats = VpnController.getProxyStats(id) - val dnsStatusId = if (splitDns) { - VpnController.getDnsStatus(id) - } else { - null - } - val isSplitTunnel = - if (c?.getPeers()?.isNotEmpty() == true) { - VpnController.isSplitTunnelProxy(id, pair) - } else { - false + if (showActiveLayout) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = uptimeText, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.weight(1f) + ) + Text( + text = rxtxText, + style = MaterialTheme.typography.bodySmall + ) } - - // if the view is not active then cancel the job - if ( - lifecycleOwner != null && - lifecycleOwner - ?.lifecycle - ?.currentState - ?.isAtLeast(androidx.lifecycle.Lifecycle.State.STARTED) == false - ) { - cancelJobIfAny() - return - } - uiCtx { - updateStatusUi(config, statusId, dnsStatusId, stats) - updateProtocolChip(pair) - updateSplitTunnelChip(isSplitTunnel) } } + } +} - private fun updateAmneziaChip(config: WgConfigFiles) { - val c = WireguardManager.getConfigById(config.id) ?: return +@Composable +fun WgChip(text: String) { + AssistChip(onClick = {}, label = { Text(text = text) }) +} - c.getInterface()?.let { - if (isAmneziaConfig(it)) { - b.protocolInfoChipGroup.visibility = View.VISIBLE - b.chipAmnezia.visibility = View.VISIBLE - } else { - b.chipAmnezia.visibility = View.GONE - } - } +suspend fun computeChips(context: Context, config: WgConfigFiles): WgChips { + val id = ProxyManager.ID_WG_BASE + config.id + val pair = VpnController.getSupportedIpVersion(id) + val cfg = WireguardManager.getConfigById(config.id) + val splitTunnel = + if (cfg?.getPeers()?.isNotEmpty() == true) { + VpnController.isSplitTunnelProxy(id, pair) + } else { + false } + val hopSrc = WgHopManager.getMapBySrc(id).isNotEmpty() + val hopping = WgHopManager.isAlreadyHop(id) + val properties = buildString { + if (config.isCatchAll) append(context.getString(R.string.symbol_lightening)) + if (config.useOnlyOnMetered) append(context.getString(R.string.symbol_mobile)) + if (config.ssidEnabled) append(context.getString(R.string.symbol_id)) + } + val amnezia = cfg?.getInterface()?.isAmnezia() == true + return WgChips( + ipv4 = pair.first, + ipv6 = pair.second, + splitTunnel = splitTunnel, + amnezia = amnezia, + hopSrc = hopSrc, + hopping = hopping, + properties = properties + ) +} - private fun isAmneziaConfig(c: WgInterface): Boolean { - // TODO: should we add more checks here? - // consider the config values jc, jmin, jmax, h1, h2, h3, h4, s1, s2 - return c.getJc().isPresent || c.getJmin().isPresent || c.getJmax().isPresent || - c.getH1().isPresent || c.getH2().isPresent || c.getH3().isPresent || - c.getH4().isPresent || c.getS1().isPresent || c.getS2().isPresent +suspend fun computeStatusUi( + context: Context, + config: WgConfigFiles, + errorColor: Color, + onSurfaceVariantColor: Color, + tertiaryColor: Color +): WgUiState { + val proxyId = ProxyManager.ID_WG_BASE + config.id + val appCount = ProxyManager.getAppsCountForProxy(proxyId) + val appsText = + if (config.isCatchAll) { + context.getString(R.string.routing_remaining_apps) + } else { + context.getString(R.string.add_remove_apps, appCount.toString()) } - private fun updateUi(mapping: WgConfigFiles, appsCount: Int) { - b.interfaceAppsCount.visibility = View.VISIBLE - b.chipProperties.text = "" - if (mapping.isCatchAll) { - b.chipProperties.visibility = View.VISIBLE - b.chipProperties.text = context.getString(R.string.symbol_lightening) - } - if (mapping.isLockdown) { - if (!mapping.isActive) { - b.interfaceDetailCard.strokeWidth = 2 - b.interfaceDetailCard.strokeColor = fetchColor(context, R.attr.accentBad) - } - b.chipProperties.visibility = View.VISIBLE - b.chipProperties.text = context.getString(R.string.two_argument_space, b.chipProperties.text.toString(), context.getString(R.string.symbol_lockdown)) - } - if (mapping.useOnlyOnMetered) { - b.chipProperties.visibility = View.VISIBLE - b.chipProperties.text = context.getString(R.string.two_argument_space,b.chipProperties.text.toString(), context.getString(R.string.symbol_mobile)) - } - if (mapping.ssidEnabled) { - b.chipProperties.visibility = View.VISIBLE - b.chipProperties.text = context.getString( - R.string.two_argument_space, - b.chipProperties.text.toString(), - context.getString(R.string.symbol_id) - ) - } + if (config.isActive && !VpnController.hasTunnel()) { + return WgUiState( + isActive = false, + statusText = context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase), + appsText = appsText, + showActiveLayout = false, + uptimeText = "", + rxtxText = "", + strokeColor = errorColor, + strokeWidth = 0.dp + ) + } - val visible = if (b.chipProperties.text.isNotEmpty()) View.VISIBLE else View.GONE - b.chipProperties.visibility = visible + if (!config.isActive || !VpnController.hasTunnel()) { + return WgUiState( + isActive = false, + statusText = context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase), + appsText = appsText, + showActiveLayout = false, + uptimeText = "", + rxtxText = "", + strokeColor = errorColor, + strokeWidth = 0.dp + ) + } - if (!mapping.isActive) { - // no need to update the apps count if the config is disabled - b.interfaceAppsCount.visibility = View.GONE - b.interfaceActiveLayout.visibility = View.GONE - } else if (mapping.isCatchAll) { - b.interfaceAppsCount.text = context.getString(R.string.routing_remaining_apps) - b.interfaceAppsCount.setTextColor(fetchColor(context, R.attr.primaryLightColorText)) - } else { - b.interfaceAppsCount.text = context.getString(R.string.firewall_card_status_active, appsCount.toString()) - if (appsCount == 0) { - b.interfaceAppsCount.setTextColor(fetchColor(context, R.attr.accentBad)) - } else { - b.interfaceAppsCount.setTextColor(fetchColor(context, R.attr.primaryLightColorText)) - } - } + val statusPair = VpnController.getProxyStatusById(proxyId) + val stats = VpnController.getProxyStats(proxyId) + val dnsStatusId = VpnController.getDnsStatus(proxyId) + val statusText = + if (dnsStatusId != null && isDnsError(dnsStatusId)) { + context.getString(R.string.status_failing).replaceFirstChar(Char::titlecase) + } else { + getStatusText( + context, + UIUtils.ProxyStatus.entries.find { it.id == statusPair.first }, + getHandshakeTime(stats).toString(), + stats, + statusPair.second + ) } - private fun updateStatusUi(config: WgConfigFiles, statusPair: Pair, dnsStatusId: Long?, stats: RouterStats?) { - if (config.isActive) { - b.interfaceSwitch.isChecked = true - b.interfaceDetailCard.strokeWidth = 2 - b.interfaceStatus.visibility = View.VISIBLE - b.interfaceActiveLayout.visibility = View.VISIBLE - val time = getUpTime(stats) - val rxtx = getRxTx(stats) - if (time.isNotEmpty()) { - val t = context.getString(R.string.logs_card_duration, time) - b.interfaceActiveUptime.text = - context.getString( - R.string.two_argument_space, - context.getString(R.string.lbl_active), - t - ) - } else { - b.interfaceActiveUptime.text = context.getString(R.string.lbl_active) - } - b.interfaceActiveRxTx.text = rxtx - - if (dnsStatusId != null) { - // check for dns failure cases and update the UI - if (isDnsError(dnsStatusId) && statusPair.first != Backend.TPU) { - b.interfaceDetailCard.strokeColor = - fetchColor(context, R.attr.chipTextNegative) - val humanReadableLastOk = getHumanReadableLastOk(stats).toString() - // show last ok time if available - if (humanReadableLastOk.isEmpty()) { - b.interfaceStatus.text = context.getString( - R.string.status_failing - ).replaceFirstChar(Char::titlecase) - } else { - b.interfaceStatus.text = context.getString( - R.string.about_version_install_source, - context.getString(R.string.status_failing) - .replaceFirstChar(Char::titlecase), humanReadableLastOk - ) - } - Logger.d( - LOG_TAG_UI, - "$TAG DNS failing, status updated to failing with stroke color chipTextNegative, lastok:${stats?.lastOK}, since:${stats?.since}, humanReadableLastOk:$humanReadableLastOk" - ) - } else { - // if dns status is not failing, then update the proxy status - updateProxyStatusUi(statusPair, stats) - } - } else { - // in one wg mode, if dns status should be available, this is a fallback case - updateProxyStatusUi(statusPair, stats) - } - } else { - b.interfaceActiveLayout.visibility = View.GONE - b.interfaceDetailCard.strokeColor = fetchColor(context, R.attr.background) - b.interfaceDetailCard.strokeWidth = 0 - b.interfaceSwitch.isChecked = false - b.interfaceAppsCount.visibility = View.GONE - b.interfaceStatus.visibility = View.VISIBLE - b.interfaceStatus.text = - context.getString(R.string.lbl_disabled).replaceFirstChar(Char::titlecase) - } + val strokeColor = + if (dnsStatusId != null && isDnsError(dnsStatusId)) { + errorColor + } else { + val status = + UIUtils.ProxyStatus.entries.find { it.id == statusPair.first } + getStrokeColorForStatus( + status = status, + stats = stats, + errorColor = errorColor, + onSurfaceVariantColor = onSurfaceVariantColor, + tertiaryColor = tertiaryColor + ) } - private fun getStrokeColorForStatus(status: UIUtils.ProxyStatus?, stats: RouterStats?): Int { - val now = System.currentTimeMillis() - val lastOk = stats?.lastOK ?: 0L - val since = stats?.since ?: 0L - val isFailing = now - since > WG_UPTIME_THRESHOLD && lastOk == 0L - return when (status) { - UIUtils.ProxyStatus.TOK -> if (isFailing) R.attr.chipTextNegative else R.attr.accentGood - // treat TNT as neutral, for v055u (until fixed in go), as there is a scenario - // where idle is behaving as waiting - UIUtils.ProxyStatus.TUP, UIUtils.ProxyStatus.TZZ, UIUtils.ProxyStatus.TNT -> R.attr.chipTextNeutral - else -> R.attr.chipTextNegative // TKO, TEND - } + val rxtx = getRxTx(context, stats) + val time = getUpTime(stats) + val uptimeText = + if (time.isNotEmpty()) { + val t = context.getString(R.string.logs_card_duration, time) + context.getString( + R.string.two_argument_space, + context.getString(R.string.lbl_active), + t + ) + } else { + context.getString(R.string.lbl_active) } - private fun getStatusText( - status: UIUtils.ProxyStatus?, - humanReadableLastOk: String? = null, - stats: RouterStats?, - errMsg: String? = null - ): String { - if (status == null) { - val txt = if (!errMsg.isNullOrEmpty()) { - context.getString(R.string.status_waiting) + " ($errMsg)" - } else { - context.getString(R.string.status_waiting) - } - return txt.replaceFirstChar(Char::titlecase) - } + return WgUiState( + isActive = true, + statusText = statusText, + appsText = appsText, + showActiveLayout = true, + uptimeText = uptimeText, + rxtxText = rxtx, + strokeColor = strokeColor, + strokeWidth = 2.dp + ) +} - // no need to check for lastOk/since for paused wg - if (status == UIUtils.ProxyStatus.TPU) { - return context.getString(UIUtils.getProxyStatusStringRes(status.id)) - .replaceFirstChar(Char::titlecase) - } +private fun isDnsError(statusId: Long?): Boolean { + if (statusId == null) return true + val s = Transaction.Status.fromId(statusId) + return s == Transaction.Status.BAD_QUERY || + s == Transaction.Status.BAD_RESPONSE || + s == Transaction.Status.NO_RESPONSE || + s == Transaction.Status.SEND_FAIL || + s == Transaction.Status.CLIENT_ERROR || + s == Transaction.Status.INTERNAL_ERROR || + s == Transaction.Status.TRANSPORT_ERROR +} - val now = System.currentTimeMillis() - val lastOk = stats?.lastOK ?: 0L - val since = stats?.since ?: 0L - if (now - since > WG_UPTIME_THRESHOLD && lastOk == 0L) { - return context.getString(R.string.status_failing).replaceFirstChar(Char::titlecase) +private fun getStrokeColorForStatus( + status: UIUtils.ProxyStatus?, + stats: RouterStats?, + errorColor: Color, + onSurfaceVariantColor: Color, + tertiaryColor: Color +): Color { + val now = System.currentTimeMillis() + val lastOk = stats?.lastOK ?: 0L + val since = stats?.since ?: 0L + val isFailing = now - since > WG_UPTIME_THRESHOLD && lastOk == 0L + return when (status) { + UIUtils.ProxyStatus.TOK -> + if (isFailing) { + onSurfaceVariantColor + } else { + tertiaryColor } + UIUtils.ProxyStatus.TUP, + UIUtils.ProxyStatus.TZZ, + UIUtils.ProxyStatus.TNT -> onSurfaceVariantColor + else -> errorColor + } +} - val baseText = context.getString(UIUtils.getProxyStatusStringRes(status.id)) - .replaceFirstChar(Char::titlecase) - - return if (stats?.lastOK != 0L && humanReadableLastOk != null) { - context.getString(R.string.about_version_install_source, baseText, humanReadableLastOk) +fun getStatusText( + context: Context, + status: UIUtils.ProxyStatus?, + handshakeTime: String? = null, + stats: RouterStats?, + errMsg: String? = null +): String { + if (status == null) { + val txt = + if (errMsg != null) { + context.getString(R.string.status_waiting) + " ($errMsg)" } else { - baseText + context.getString(R.string.status_waiting) } - } - - private fun updateProxyStatusUi(statusPair: Pair, stats: RouterStats?) { - val status = UIUtils.ProxyStatus.entries.find { it.id == statusPair.first } // Convert to enum + return txt.replaceFirstChar(Char::titlecase) + } - val humanReadableLastOk = getHumanReadableLastOk(stats).toString() + val now = System.currentTimeMillis() + val lastOk = stats?.lastOK ?: 0L + val since = stats?.since ?: 0L + if (now - since > WG_UPTIME_THRESHOLD && lastOk == 0L) { + return context.getString(R.string.status_failing).replaceFirstChar(Char::titlecase) + } - val strokeColor = getStrokeColorForStatus(status, stats) - b.interfaceDetailCard.strokeColor = fetchColor(context, strokeColor) - val statusText = getStatusText(status, humanReadableLastOk, stats, statusPair.second) + val baseText = + context.getString(UIUtils.getProxyStatusStringRes(status.id)) + .replaceFirstChar(Char::titlecase) + return if (stats?.lastOK != 0L && handshakeTime != null) { + context.getString(R.string.about_version_install_source, baseText, handshakeTime) + } else { + baseText + } +} - b.interfaceStatus.text = statusText - Logger.d(LOG_TAG_UI, "$TAG status updated to $statusText (${status?.id} - ${status?.name}) with stroke color $strokeColor, lastok:${stats?.lastOK}, since:${stats?.since}, humanReadableLastOk:$humanReadableLastOk") - } +fun getUpTime(stats: RouterStats?): CharSequence { + if (stats == null) return "" + if (stats.since <= 0L) return "" + val now = System.currentTimeMillis() + return DateUtils.getRelativeTimeSpanString( + stats.since, + now, + DateUtils.MINUTE_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE + ) +} - private fun isDnsError(statusId: Long?): Boolean { - if (statusId == null) return true +fun getRxTx(context: Context, stats: RouterStats?): String { + if (stats == null) return "" + val rx = + context.getString( + R.string.symbol_download, + Utilities.humanReadableByteCount(stats.rx, true) + ) + val tx = + context.getString( + R.string.symbol_upload, + Utilities.humanReadableByteCount(stats.tx, true) + ) + return context.getString(R.string.two_argument_space, tx, rx) +} - val s = Transaction.Status.fromId(statusId) - return s == Transaction.Status.BAD_QUERY || s == Transaction.Status.BAD_RESPONSE || s == Transaction.Status.NO_RESPONSE || s == Transaction.Status.SEND_FAIL || s == Transaction.Status.CLIENT_ERROR || s == Transaction.Status.INTERNAL_ERROR || s == Transaction.Status.TRANSPORT_ERROR - } +fun getHandshakeTime(stats: RouterStats?): CharSequence { + if (stats == null) return "" + if (stats.lastOK == 0L) return "" + val now = System.currentTimeMillis() + return DateUtils.getRelativeTimeSpanString( + stats.lastOK, + now, + DateUtils.MINUTE_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE + ) +} - private fun getRxTx(stats: RouterStats?): String { - if (stats == null) return "" - val rx = - context.getString( - R.string.symbol_download, - Utilities.humanReadableByteCount(stats.rx, true) - ) - val tx = - context.getString( - R.string.symbol_upload, - Utilities.humanReadableByteCount(stats.tx, true) - ) - return context.getString(R.string.two_argument_space, tx, rx) +suspend fun enableWgIfPossible(context: Context, config: WgConfigFiles, onDnsStatusChanged: () -> Unit, eventLogger: EventLogger): Boolean { + if (!VpnController.hasTunnel()) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + ERR_CODE_VPN_NOT_ACTIVE + + context.getString(R.string.settings_socks5_vpn_disabled_error), + Toast.LENGTH_LONG + ) } + return false + } - private fun getUpTime(stats: RouterStats?): CharSequence { - if (stats == null) { - return "" - } - if (stats.since <= 0L) { - return "" - } - val now = System.currentTimeMillis() - // returns a string describing 'time' as a time relative to 'now' - return DateUtils.getRelativeTimeSpanString( - stats.since, - now, - DateUtils.MINUTE_IN_MILLIS, - DateUtils.FORMAT_ABBREV_RELATIVE + if (!WireguardManager.canEnableProxy()) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + ERR_CODE_VPN_NOT_FULL + context.getString(R.string.wireguard_enabled_failure), + Toast.LENGTH_LONG ) } + return false + } - private fun getHumanReadableLastOk(stats: RouterStats?): CharSequence { - if (stats == null) { - return "" - } - if (stats.lastOK <= 0L) { - return "" - } - val now = System.currentTimeMillis() - // returns a string describing 'time' as a time relative to 'now' - return DateUtils.getRelativeTimeSpanString( - stats.lastOK, - now, - DateUtils.MINUTE_IN_MILLIS, - DateUtils.FORMAT_ABBREV_RELATIVE + if (WireguardManager.oneWireGuardEnabled()) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + ERR_CODE_OTHER_WG_ACTIVE + context.getString(R.string.wireguard_enabled_failure), + Toast.LENGTH_LONG ) } + return false + } - fun setupClickListeners(config: WgConfigFiles) { - b.interfaceDetailCard.setOnClickListener { launchConfigDetail(config.id) } - - b.interfaceSwitch.setOnCheckedChangeListener(null) - b.interfaceSwitch.setOnClickListener { - val cfg = config.toImmutable() - io { - if (b.interfaceSwitch.isChecked) { - enableWgIfPossible(cfg) - } else { - disableWgIfPossible(cfg) - } - } - } + if (!WireguardManager.isValidConfig(config.id)) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + ERR_CODE_WG_INVALID + context.getString(R.string.wireguard_enabled_failure), + Toast.LENGTH_LONG + ) } + return false + } - private suspend fun disableWgIfPossible(cfg: WgConfigFilesImmutable) { - if (!VpnController.hasTunnel()) { - Logger.i(LOG_TAG_PROXY, "$TAG VPN not active, cannot enable WireGuard") - uiCtx { - Utilities.showToastUiCentered( - context, - ERR_CODE_VPN_NOT_ACTIVE + - context.getString(R.string.settings_socks5_vpn_disabled_error), - Toast.LENGTH_LONG - ) - // reset the check box - b.interfaceSwitch.isChecked = true - } - return - } + WireguardManager.enableConfig(config.toImmutable()) + withContext(Dispatchers.Main) { onDnsStatusChanged() } + logEvent(eventLogger, "WireGuard enabled", "WG ID: ${config.id}") + return true +} - if (WireguardManager.canDisableConfig(cfg)) { - WireguardManager.disableConfig(cfg) - logEvent("Wireguard disable", "Disabled WireGuard config: ${cfg.name} (id: ${cfg.id})") +suspend fun disableWgIfPossible(context: Context, config: WgConfigFiles, onDnsStatusChanged: () -> Unit, eventLogger: EventLogger): Boolean { + val canDisable = WireguardManager.canDisableConfig(config.toImmutable()) + if (!canDisable) { + val msgRes = + if (WgHopManager.isWgEitherHopOrSrc(config.id)) { + R.string.wireguard_disable_failure_relay } else { - if (cfg.isCatchAll) { - uiCtx { - Utilities.showToastUiCentered( - context, - context.getString(R.string.wireguard_disable_failure), - Toast.LENGTH_LONG - ) - b.interfaceSwitch.isChecked = true - } - } else { - uiCtx { - Utilities.showToastUiCentered( - context, - context.getString(R.string.wireguard_disable_failure_relay), - Toast.LENGTH_LONG - ) - b.interfaceSwitch.isChecked = true - } - } - } - - uiCtx { listener.onDnsStatusChanged() } - } - - private suspend fun enableWgIfPossible(cfg: WgConfigFilesImmutable) { - - if (!VpnController.hasTunnel()) { - Logger.i(LOG_TAG_PROXY, "$TAG VPN not active, cannot enable WireGuard") - uiCtx { - Utilities.showToastUiCentered( - context, - ERR_CODE_VPN_NOT_ACTIVE + - context.getString(R.string.settings_socks5_vpn_disabled_error), - Toast.LENGTH_LONG - ) - // reset the check box - b.interfaceSwitch.isChecked = false - } - return - } - - if (!WireguardManager.canEnableProxy()) { - Logger.i(LOG_TAG_PROXY, "$TAG not in DNS+Firewall mode, cannot enable WireGuard") - uiCtx { - // reset the check box - b.interfaceSwitch.isChecked = false - Utilities.showToastUiCentered( - context, - ERR_CODE_VPN_NOT_FULL + - context.getString(R.string.wireguard_enabled_failure), - Toast.LENGTH_LONG - ) - } - return + R.string.wireguard_disable_failure } - - if (WireguardManager.oneWireGuardEnabled()) { - // this should not happen, ui is disabled if one wireGuard is enabled - Logger.w(LOG_TAG_PROXY, "$TAG one wireGuard is already enabled") - uiCtx { - // reset the check box - b.interfaceSwitch.isChecked = false - Utilities.showToastUiCentered( - context, - ERR_CODE_OTHER_WG_ACTIVE + - context.getString(R.string.wireguard_enabled_failure), - Toast.LENGTH_LONG - ) - } - return - } - - if (!WireguardManager.isValidConfig(cfg.id)) { - Logger.i(LOG_TAG_PROXY, "$TAG invalid WireGuard config") - uiCtx { - // reset the check box - b.interfaceSwitch.isChecked = false - Utilities.showToastUiCentered( - context, - ERR_CODE_WG_INVALID + context.getString(R.string.wireguard_enabled_failure), - Toast.LENGTH_LONG - ) - } - return - } - - WireguardManager.enableConfig(cfg) - logEvent("Wireguard enable", "Enabled WireGuard config: ${cfg.name} (id: ${cfg.id})") - uiCtx { listener.onDnsStatusChanged() } - } - - private fun launchConfigDetail(id: Int) { - if (!VpnController.hasTunnel()) { - Utilities.showToastUiCentered( - context, - context.getString(R.string.ssv_toast_start_rethink), - Toast.LENGTH_SHORT - ) - return - } - - val intent = Intent(context, WgConfigDetailActivity::class.java) - intent.putExtra(INTENT_EXTRA_WG_ID, id) - intent.putExtra( - WgConfigDetailActivity.INTENT_EXTRA_WG_TYPE, - WgConfigDetailActivity.WgType.DEFAULT.value - ) - context.startActivity(intent) + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered(context, context.getString(msgRes), Toast.LENGTH_LONG) } + return false } - private fun logEvent(msg: String, details: String) { - eventLogger.log(EventType.PROXY_SWITCH, Severity.LOW, msg, EventSource.UI, false, details) - } + WireguardManager.disableConfig(config.toImmutable()) + withContext(Dispatchers.Main) { onDnsStatusChanged() } + logEvent(eventLogger, "WireGuard disabled", "WG ID: ${config.id}") + return true +} - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } +private fun launchConfigDetail(context: Context, id: Int, onConfigDetailClick: (Int, WgType) -> Unit) { + if (!VpnController.hasTunnel()) { + Utilities.showToastUiCentered( + context, + context.getString(R.string.ssv_toast_start_rethink), + Toast.LENGTH_SHORT + ) + return } - private fun io(f: suspend () -> Unit): Job? { - if (lifecycleOwner == null) { - return null - } - return lifecycleOwner?.lifecycleScope?.launch(Dispatchers.IO) { f() } - } + onConfigDetailClick(id, WgType.DEFAULT) +} + +private fun logEvent(eventLogger: EventLogger, msg: String, details: String) { + eventLogger.log(EventType.PROXY_SWITCH, Severity.LOW, msg, EventSource.UI, false, details) } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/WgHopAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/WgHopAdapter.kt index a66b09f02..e00f5596d 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/WgHopAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/WgHopAdapter.kt @@ -15,23 +15,43 @@ */ package com.celzero.bravedns.adapter + import Logger import Logger.LOG_TAG_UI import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup import android.widget.Toast -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.BorderStroke +import androidx.compose.material3.AssistChip +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Checkbox +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp import com.celzero.bravedns.R -import com.celzero.bravedns.databinding.ListItemWgHopBinding import com.celzero.bravedns.service.ProxyManager.ID_WG_BASE import com.celzero.bravedns.service.VpnController import com.celzero.bravedns.service.WireguardManager import com.celzero.bravedns.util.UIUtils -import com.celzero.bravedns.util.UIUtils.fetchColor import com.celzero.bravedns.util.Utilities import com.celzero.bravedns.wireguard.Config import com.celzero.bravedns.wireguard.WgHopManager @@ -40,373 +60,277 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -/** - * Adapter for WireGuard configuration hopping - * - * NOTE: For new implementations, consider using GenericHopAdapter which supports - * both WireGuard configs and RPN proxies through the HopItem sealed interface. - * This adapter is kept for backwards compatibility. - */ -class WgHopAdapter( - private val context: Context, - private val srcId: Int, - private val hopables: List, - private var selectedId: Int -) : RecyclerView.Adapter() { - - companion object { - private const val TAG = "HopAdapter" - private const val HOP_TEST_DELAY_MS = 2000L // 2 seconds - } - - private var isAttached = false - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HopViewHolder { - val itemBinding = - ListItemWgHopBinding.inflate(LayoutInflater.from(parent.context), parent, false) - return HopViewHolder(itemBinding) - } - - override fun getItemCount(): Int { - return hopables.size - } - - override fun onBindViewHolder(holder: HopViewHolder, position: Int) { - if (position < 0 || position >= itemCount) { - Logger.w(LOG_TAG_UI, "$TAG; Invalid position $position for itemCount $itemCount") - return - } - holder.update(hopables[position]) - } - - override fun onAttachedToRecyclerView(recyclerView: RecyclerView) { - super.onAttachedToRecyclerView(recyclerView) - isAttached = true +private const val TAG = "HopAdapter" + +@Composable +fun HopRow( + context: Context, + srcId: Int, + config: Config, + isActive: Boolean, + selectedId: Int, + onSelectedIdChange: (Int) -> Unit +) { + var isChecked by remember { mutableStateOf(config.getId() == selectedId) } + var inProgress by remember { mutableStateOf(false) } + var statusText by remember { mutableStateOf("") } + var chips by remember { mutableStateOf(HopChips()) } + val scope = rememberCoroutineScope() + + LaunchedEffect(config.getId(), selectedId) { + isChecked = config.getId() == selectedId } - override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { - super.onDetachedFromRecyclerView(recyclerView) - isAttached = false + LaunchedEffect(config.getId(), selectedId) { + statusText = computeStatusText(context, srcId, config, selectedId) + chips = computeChips(context, config) } - inner class HopViewHolder(private val b: ListItemWgHopBinding) : - RecyclerView.ViewHolder(b.root) { - - fun update(config: Config) { - val mapping = WireguardManager.getConfigFilesById(config.getId()) ?: return - b.wgHopListNameTv.text = config.getName() + " (" + config.getId() + ")" - b.wgHopListCheckbox.isChecked = config.getId() == selectedId - setCardStroke(config.getId() == selectedId, mapping.isActive) - showChips(config) - updateStatusUi(config) - setupClickListeners(config, mapping.isActive) + val strokeColor = + if (isChecked && isActive) { + MaterialTheme.colorScheme.tertiary + } else if (isChecked) { + MaterialTheme.colorScheme.error + } else { + Color.Transparent } - - private fun updateStatusUi(config: Config) { - io { - val map = WireguardManager.getConfigFilesById(config.getId()) - if (map == null) { - uiCtx { - b.wgHopListDescTv.text = context.getString(R.string.config_invalid_desc) - } - return@io - } - if (selectedId == config.getId()) { - val srcConfig = WireguardManager.getConfigById(srcId) - if (srcConfig == null) { - Logger.i(LOG_TAG_UI, "$TAG; source config($srcId) not found to hop") - uiCtx { - b.wgHopListDescTv.text = context.getString(R.string.lbl_inactive) - } - return@io - } - val src = ID_WG_BASE + srcConfig.getId() - val hop = ID_WG_BASE + config.getId() - val statusPair = VpnController.hopStatus(src, hop) - uiCtx { - val id = statusPair.first - if (statusPair.first != null) { - val txt = UIUtils.getProxyStatusStringRes(id) - b.wgHopListDescTv.text = context.getString(txt) + val strokeWidth = if (isChecked) 2.dp else 0.dp + + Card( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = 8.dp, vertical = 6.dp) + .clickable(enabled = !inProgress) { + scope.launch { + inProgress = true + val targetChecked = !isChecked + val res = + handleHop( + context = context, + srcId = srcId, + config = config, + isChecked = targetChecked, + isActive = isActive, + selectedId = selectedId, + onSelectedIdChange = onSelectedIdChange + ) + if (res.first) { + isChecked = targetChecked + statusText = computeStatusText(context, srcId, config, selectedId) } else { - b.wgHopListDescTv.text = statusPair.second + isChecked = false } + inProgress = false } - return@io + }, + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), + border = if (strokeWidth > 0.dp) BorderStroke(strokeWidth, strokeColor) else null + ) { + Column(modifier = Modifier.fillMaxWidth().padding(12.dp)) { + Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = config.getName() + " (" + config.getId() + ")", + style = MaterialTheme.typography.titleMedium + ) + Text(text = statusText, style = MaterialTheme.typography.bodySmall) } - if (map.isActive) { - uiCtx { - b.wgHopListDescTv.text = context.getString(R.string.lbl_active) - } - return@io - } else { - uiCtx { - b.wgHopListDescTv.text = context.getString(R.string.lbl_inactive) + Checkbox( + checked = isChecked, + onCheckedChange = { checked -> + if (inProgress) return@Checkbox + scope.launch { + inProgress = true + val res = + handleHop( + context = context, + srcId = srcId, + config = config, + isChecked = checked, + isActive = isActive, + selectedId = selectedId, + onSelectedIdChange = onSelectedIdChange + ) + if (res.first) { + isChecked = checked + statusText = computeStatusText(context, srcId, config, selectedId) + } else { + isChecked = false + } + inProgress = false + } } - } + ) } - } - private fun showChips(config: Config) { - io { - val id = ID_WG_BASE + config.getId() - val pair = VpnController.getSupportedIpVersion(id) - val isSplitTunnel = if (config.getPeers()?.isNotEmpty() == true) { - VpnController.isSplitTunnelProxy(id, pair) - } else { - false - } - uiCtx { - updatePropertiesChip(config) - updateAmzChip(config) - updateProtocolChip(pair) - updateSplitTunnelChip(isSplitTunnel) - updateHopSrcChip(config) - updateHoppingChip(config) + if (chips.hasAny()) { + Row(horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.padding(top = 6.dp)) { + if (chips.ipv4) HopChip(text = context.getString(R.string.settings_ip_text_ipv4)) + if (chips.ipv6) HopChip(text = context.getString(R.string.settings_ip_text_ipv6)) + if (chips.splitTunnel) HopChip(text = context.getString(R.string.lbl_split)) + if (chips.amnezia) HopChip(text = context.getString(R.string.lbl_amnezia)) + if (chips.hopSrc) HopChip(text = context.getString(R.string.lbl_hopping)) + if (chips.hopping) HopChip(text = context.getString(R.string.cd_dns_crypt_relay_heading)) + if (chips.properties.isNotEmpty()) HopChip(text = chips.properties) } } - } - private fun updatePropertiesChip(config: Config) { - val mapping = WireguardManager.getConfigFilesById(config.getId()) ?: return - if (!mapping.isCatchAll && !mapping.isLockdown && !mapping.useOnlyOnMetered && !mapping.ssidEnabled) { - b.chipProperties.visibility = View.GONE - return - } - b.chipProperties.text = "" - if (mapping.isCatchAll) { - b.chipProperties.visibility = View.VISIBLE - b.chipProperties.text = context.getString(R.string.symbol_lightening) - } - if (mapping.isLockdown) { - b.chipProperties.visibility = View.VISIBLE - b.chipProperties.text = context.getString( - R.string.two_argument_space, - b.chipProperties.text.toString(), - context.getString(R.string.symbol_lockdown) - ) + if (inProgress) { + Spacer(modifier = Modifier.height(8.dp)) + LinearProgressIndicator(modifier = Modifier.fillMaxWidth()) } - if (mapping.useOnlyOnMetered) { - b.chipProperties.visibility = View.VISIBLE - b.chipProperties.text = context.getString( - R.string.two_argument_space, - b.chipProperties.text.toString(), - context.getString(R.string.symbol_mobile) - ) - } - if (mapping.ssidEnabled) { - b.chipProperties.visibility = View.VISIBLE - b.chipProperties.text = context.getString( - R.string.two_argument_space, - b.chipProperties.text.toString(), - context.getString(R.string.symbol_id) - ) - } - - val visible = if (b.chipProperties.text.isNotEmpty()) View.VISIBLE else View.GONE - b.chipProperties.visibility = visible } + } +} - private fun updateAmzChip(config: Config) { - config.getInterface()?.let { - if (it.isAmnezia()) { - b.chipGroup.visibility = View.VISIBLE - b.chipAmnezia.visibility = View.VISIBLE - } else { - b.chipAmnezia.visibility = View.GONE - } - } - } +@Composable +private fun HopChip(text: String) { + AssistChip(onClick = {}, label = { Text(text = text) }) +} - private fun updateProtocolChip(pair: Pair?) { - if (pair == null) return +private data class HopChips( + val ipv4: Boolean = false, + val ipv6: Boolean = false, + val splitTunnel: Boolean = false, + val amnezia: Boolean = false, + val hopSrc: Boolean = false, + val hopping: Boolean = false, + val properties: String = "" +) { + fun hasAny(): Boolean { + return ipv4 || ipv6 || splitTunnel || amnezia || hopSrc || hopping || properties.isNotEmpty() + } +} - if (!pair.first && !pair.second) { - b.chipIpv4.visibility = View.GONE - b.chipIpv6.visibility = View.GONE - return - } - b.chipGroup.visibility = View.VISIBLE - b.chipIpv4.visibility = View.GONE - b.chipIpv6.visibility = View.GONE - if (pair.first) { - b.chipIpv4.visibility = View.VISIBLE - b.chipIpv4.text = context.getString(R.string.settings_ip_text_ipv4) - } else { - b.chipIpv4.visibility = View.GONE - } - if (pair.second) { - b.chipIpv6.visibility = View.VISIBLE - b.chipIpv6.text = context.getString(R.string.settings_ip_text_ipv6) - } else { - b.chipIpv6.visibility = View.GONE - } - } - - private fun updateSplitTunnelChip(isSplitTunnel: Boolean) { - if (isSplitTunnel) { - b.chipGroup.visibility = View.VISIBLE - b.chipSplitTunnel.visibility = View.VISIBLE - } else { - b.chipSplitTunnel.visibility = View.GONE - } +private suspend fun computeStatusText( + context: Context, + srcId: Int, + config: Config, + selectedId: Int +): String { + val map = WireguardManager.getConfigFilesById(config.getId()) + if (map == null) return context.getString(R.string.config_invalid_desc) + if (selectedId == config.getId()) { + val srcConfig = WireguardManager.getConfigById(srcId) + if (srcConfig == null) return context.getString(R.string.lbl_inactive) + val src = ID_WG_BASE + srcConfig.getId() + val hop = ID_WG_BASE + config.getId() + val statusPair = VpnController.hopStatus(src, hop) + return if (statusPair.first != null) { + context.getString(UIUtils.getProxyStatusStringRes(statusPair.first)) + } else { + statusPair.second } + } + return if (map.isActive) context.getString(R.string.lbl_active) else context.getString(R.string.lbl_inactive) +} - private fun updateHopSrcChip(config: Config) { - val id = ID_WG_BASE + config.getId() - val hop = WgHopManager.getMapBySrc(id) - if (hop.isNotEmpty()) { - b.chipGroup.visibility = View.VISIBLE - b.chipHopSrc.visibility = View.VISIBLE +private suspend fun computeChips(context: Context, config: Config): HopChips { + return withContext(Dispatchers.IO) { + val id = ID_WG_BASE + config.getId() + val pair = VpnController.getSupportedIpVersion(id) + val isSplitTunnel = + if (config.getPeers()?.isNotEmpty() == true) { + VpnController.isSplitTunnelProxy(id, pair) } else { - b.chipHopSrc.visibility = View.GONE + false } - } - - private fun updateHoppingChip(config: Config) { - val id = ID_WG_BASE + config.getId() - val hop = WgHopManager.isAlreadyHop(id) - if (hop) { - b.chipGroup.visibility = View.VISIBLE - b.chipHopping.visibility = View.VISIBLE - } else { - b.chipHopping.visibility = View.GONE + val hopSrc = WgHopManager.getMapBySrc(id).isNotEmpty() + val hopping = WgHopManager.isAlreadyHop(id) + val properties = buildString { + val mapping = WireguardManager.getConfigFilesById(config.getId()) + if (mapping != null) { + if (mapping.isCatchAll) append(context.getString(R.string.symbol_lightening)) + if (mapping.useOnlyOnMetered) append(context.getString(R.string.symbol_mobile)) + if (mapping.ssidEnabled) append(context.getString(R.string.symbol_id)) } } + val amnezia = config.getInterface()?.isAmnezia() == true + HopChips( + ipv4 = pair.first, + ipv6 = pair.second, + splitTunnel = isSplitTunnel, + amnezia = amnezia, + hopSrc = hopSrc, + hopping = hopping, + properties = properties + ) + } +} - private fun setupClickListeners(config: Config, isActive: Boolean) { - b.wgHopListCard.setOnClickListener { - io { handleHop(config, !b.wgHopListCheckbox.isChecked, isActive) } - } +private suspend fun handleHop( + context: Context, + srcId: Int, + config: Config, + isChecked: Boolean, + isActive: Boolean, + selectedId: Int, + onSelectedIdChange: (Int) -> Unit +): Pair { + val srcConfig = WireguardManager.getConfigById(srcId) + val mapping = WireguardManager.getConfigFilesById(config.getId()) + if (srcConfig == null || mapping == null) { + Logger.i(LOG_TAG_UI, "$TAG; source config($srcId) not found to hop") + uiCtx { Utilities.showToastUiCentered(context, context.getString(R.string.config_invalid_desc), Toast.LENGTH_LONG) } + return false to context.getString(R.string.config_invalid_desc) + } - b.wgHopListCheckbox.setOnClickListener { - io { handleHop(config, b.wgHopListCheckbox.isChecked, isActive) } - } + if (mapping.useOnlyOnMetered || mapping.ssidEnabled) { + uiCtx { + Utilities.showToastUiCentered( + context, + context.getString(R.string.hop_error_toast_msg_3), + Toast.LENGTH_LONG + ) } + return false to context.getString(R.string.hop_error_toast_msg_3) + } - private suspend fun handleHop(config: Config, isChecked: Boolean, isActive: Boolean) { - val srcConfig = WireguardManager.getConfigById(srcId) - val mapping = WireguardManager.getConfigFilesById(config.getId()) - if (srcConfig == null || mapping == null) { - Logger.i(LOG_TAG_UI, "$TAG; source config($srcId) not found to hop") - uiCtx { - if (!isAttached) return@uiCtx - Utilities.showToastUiCentered(context, context.getString(R.string.config_invalid_desc), Toast.LENGTH_LONG) - } - return - } - - if (mapping.useOnlyOnMetered || mapping.ssidEnabled) { - uiCtx { - if (!isAttached) return@uiCtx - Utilities.showToastUiCentered( - context, - context.getString(R.string.hop_error_toast_msg_3), - Toast.LENGTH_LONG - ) - } - return - } - uiCtx { - showProgressIndicator() - } - Logger.d(LOG_TAG_UI, "$TAG; init, hop: ${srcConfig.getId()} -> ${config.getId()}, isChecked? $isChecked") - val src = ID_WG_BASE + srcConfig.getId() - val hop = ID_WG_BASE + config.getId() - val currMap = WgHopManager.getMapBySrc(src) - if (currMap.isNotEmpty()) { - var res = false - currMap.forEach { - if (it.hop != hop && it.hop.isNotEmpty()) { - val id = it.hop.substring(ID_WG_BASE.length).toIntOrNull() ?: return@forEach - res = WgHopManager.removeHop(srcConfig.getId(), id).first - } - } - if (res) { - selectedId = -1 - uiCtx { - if (!isAttached) return@uiCtx - notifyDataSetChanged() - } - } - } - delay(HOP_TEST_DELAY_MS) - if (isChecked) { - val hopTestRes = VpnController.testHop(src, hop) - if (!hopTestRes.first) { - uiCtx { - if (!isAttached) return@uiCtx - - dismissProgressIndicator() - b.wgHopListCheckbox.isChecked = false - Utilities.showToastUiCentered( - context, - hopTestRes.second ?: context.getString(R.string.unknown_error), - Toast.LENGTH_LONG - ) - } - return - } - } - - val res = if (!isChecked) { - selectedId = -1 - WgHopManager.removeHop(srcConfig.getId(), config.getId()) - } else { - selectedId = config.getId() - WgHopManager.hop(srcConfig.getId(), config.getId()) - } - uiCtx { - if (!isAttached) return@uiCtx - - dismissProgressIndicator() - Utilities.showToastUiCentered(context, res.second, Toast.LENGTH_LONG) - if (!res.first) { - b.wgHopListCheckbox.isChecked = false - setCardStroke(isSelected = false, isActive = false) - } else { - b.wgHopListCheckbox.isChecked = true - setCardStroke(isSelected = true, isActive) - } - notifyDataSetChanged() + Logger.d(LOG_TAG_UI, "$TAG; init, hop: ${srcConfig.getId()} -> ${config.getId()}, isChecked? $isChecked") + val src = ID_WG_BASE + srcConfig.getId() + val hop = ID_WG_BASE + config.getId() + val currMap = WgHopManager.getMapBySrc(src) + if (currMap.isNotEmpty()) { + var res = false + currMap.forEach { + if (it.hop != hop && it.hop.isNotEmpty()) { + val id = it.hop.substring(ID_WG_BASE.length).toIntOrNull() ?: return@forEach + res = WgHopManager.removeHop(srcConfig.getId(), id).first } } - - fun showProgressIndicator() { - if (!isAttached) return - - b.wgHopListCheckbox.isEnabled = false - b.wgHopListProgress.visibility = View.VISIBLE - b.wgHopListCard.isEnabled = false - } - - fun dismissProgressIndicator() { - if (!isAttached) return - - b.wgHopListCheckbox.isEnabled = true - b.wgHopListProgress.visibility = View.GONE + if (res) { + onSelectedIdChange(-1) } - - private fun setCardStroke(isSelected: Boolean, isActive: Boolean) { - val strokeColor = if (isSelected && isActive) { - b.wgHopListCard.strokeWidth = 2 - fetchColor(context, R.attr.chipTextPositive) - } else if (isSelected) { // selected but not active - b.wgHopListCard.strokeWidth = 2 - fetchColor(context, R.attr.chipTextNegative) - } else { - b.wgHopListCard.strokeWidth = 0 - fetchColor(context, R.attr.chipTextNegative) + } + delay(2000) + if (isChecked) { + val hopTestRes = VpnController.testHop(src, hop) + if (!hopTestRes.first) { + uiCtx { + Utilities.showToastUiCentered( + context, + hopTestRes.second ?: context.getString(R.string.unknown_error), + Toast.LENGTH_LONG + ) } - b.wgHopListCard.strokeColor = strokeColor + return false to (hopTestRes.second ?: context.getString(R.string.unknown_error)) } } - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } + val res = if (!isChecked) { + onSelectedIdChange(-1) + WgHopManager.removeHop(srcConfig.getId(), config.getId()) + } else { + onSelectedIdChange(config.getId()) + WgHopManager.hop(srcConfig.getId(), config.getId()) } - - private fun io(f: suspend () -> Unit) { - (context as LifecycleOwner).lifecycleScope.launch { withContext(Dispatchers.IO) { f() } } + uiCtx { + Utilities.showToastUiCentered(context, res.second, Toast.LENGTH_LONG) } + return res +} + +private suspend fun uiCtx(f: suspend () -> Unit) { + withContext(Dispatchers.Main) { f() } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/WgIncludeAppsAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/WgIncludeAppsAdapter.kt index 2390c72b7..2da55988b 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/WgIncludeAppsAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/WgIncludeAppsAdapter.kt @@ -15,307 +15,178 @@ */ package com.celzero.bravedns.adapter -import Logger -import Logger.LOG_TAG_PROXY -import android.content.Context -import android.content.DialogInterface -import android.content.pm.PackageManager + import android.graphics.drawable.Drawable -import android.view.LayoutInflater -import android.view.ViewGroup -import android.widget.ArrayAdapter -import android.widget.Toast -import androidx.appcompat.app.AlertDialog -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide -import com.celzero.bravedns.R +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.Image +import androidx.compose.foundation.selection.toggleable +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Checkbox +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.scale +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp import com.celzero.bravedns.database.ProxyApplicationMapping -import com.celzero.bravedns.databinding.ListItemWgIncludeAppsBinding import com.celzero.bravedns.service.FirewallManager -import com.celzero.bravedns.service.ProxyManager -import com.celzero.bravedns.service.ProxyManager.addProxyToApp -import com.celzero.bravedns.service.ProxyManager.removeProxyFromApp -import com.celzero.bravedns.util.UIUtils import com.celzero.bravedns.util.Utilities.getDefaultIcon import com.celzero.bravedns.util.Utilities.getIcon -import com.celzero.bravedns.util.Utilities.showToastUiCentered -import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import androidx.compose.ui.platform.LocalContext import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class WgIncludeAppsAdapter( - private val context: Context, - private val proxyId: String, - private val proxyName: String -) : - PagingDataAdapter( - DIFF_CALLBACK - ) { - private val packageManager: PackageManager = context.packageManager - - companion object { - - private val DIFF_CALLBACK = - object : DiffUtil.ItemCallback() { - - // Unique identifier should be based on uid and packageName only - // since the same app can appear in multiple proxy mappings - override fun areItemsTheSame( - oldConnection: ProxyApplicationMapping, - newConnection: ProxyApplicationMapping - ): Boolean { - return (oldConnection.proxyId == newConnection.proxyId && - oldConnection.uid == newConnection.uid) - } - - override fun areContentsTheSame( - oldConnection: ProxyApplicationMapping, - newConnection: ProxyApplicationMapping - ): Boolean { - return false - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): IncludedAppInfoViewHolder { - val itemBinding = - ListItemWgIncludeAppsBinding.inflate(LayoutInflater.from(parent.context), parent, false) - return IncludedAppInfoViewHolder(itemBinding) - } - - override fun onBindViewHolder(holder: IncludedAppInfoViewHolder, position: Int) { - val apps: ProxyApplicationMapping = getItem(position) ?: return - // Double-check position validity to prevent IndexOutOfBoundsException - if (position !in 0.. Unit +) { + val context = LocalContext.current + val packageManager = context.packageManager + var isProxyExcluded by remember(mapping.uid, mapping.packageName) { mutableStateOf(false) } + var hasInternetPerm by remember(mapping.uid, mapping.packageName) { mutableStateOf(true) } + var iconDrawable by remember(mapping.uid, mapping.packageName) { mutableStateOf(null) } + var isIncluded by + remember(mapping.uid, mapping.packageName, mapping.proxyId) { + mutableStateOf(false) } - holder.update(apps) - } - inner class IncludedAppInfoViewHolder(private val b: ListItemWgIncludeAppsBinding) : - RecyclerView.ViewHolder(b.root) { - - fun update(mapping: ProxyApplicationMapping) { - // capture item identity before async operations to prevent incorrect UI updates - // when ViewHolder is recycled for a different item during fast scrolling - val itemUid = mapping.uid - val itemPackageName = mapping.packageName - val itemAppName = mapping.appName - val itemProxyId = proxyId - - io { - // all proxies assigned to this uid and package - val proxyIdsForApp = - ProxyManager.getProxyIdsForApp(mapping.uid, mapping.packageName) - val isIncludedInCurrent = proxyIdsForApp.contains(itemProxyId) - val isProxyExcluded = FirewallManager.isAppExcludedFromProxy(itemUid) - val hasInternetPerm = mapping.hasInternetPermission(packageManager) - val iconDrawable = getIcon(context, itemPackageName, itemAppName) - Logger.d(LOG_TAG_PROXY, "INCLUDE(${mapping.appName}): $isIncludedInCurrent, $isProxyExcluded, $proxyName, $proxyId, $proxyIdsForApp, $isIncludedInCurrent") - uiCtx { - // Update UI synchronously on the main thread - // enable/disable UI based on exclusion - // is still valid and bound to the same item - if (bindingAdapterPosition == RecyclerView.NO_POSITION) { - Logger.w( - LOG_TAG_PROXY, - "ViewHolder recycled, skipping UI update for uid: $itemUid" - ) - return@uiCtx - } - - // double-check - val currentItem = getItem(bindingAdapterPosition) - if (currentItem?.uid != itemUid) { - Logger.w( - LOG_TAG_PROXY, - "ViewHolder rebound to different item, skipping update for uid: $itemUid" - ) - return@uiCtx - } - - if (isProxyExcluded) { - b.wgIncludeAppListContainer.isEnabled = false - b.wgIncludeAppListCheckbox.isChecked = false - b.wgIncludeCard.isClickable = false - b.wgIncludeCard.isFocusable = false - b.wgIncludeAppListCheckbox.isClickable = false - b.wgIncludeAppListCheckbox.isFocusable = false - } else { - b.wgIncludeAppListContainer.isEnabled = true - b.wgIncludeCard.isClickable = true - b.wgIncludeCard.isFocusable = true - b.wgIncludeAppListCheckbox.isClickable = true - b.wgIncludeAppListCheckbox.isFocusable = true - } - - b.wgIncludeAppListApkLabelTv.text = itemAppName - b.wgIncludeAppListApkLabelTv.alpha = if (hasInternetPerm) 1.0f else 0.4f - - // checkbox state purely based on membership in this proxyId - b.wgIncludeAppListCheckbox.isChecked = isIncludedInCurrent && !isProxyExcluded - setCardBackground(isIncludedInCurrent && !isProxyExcluded) - - // description text logic: show only other proxies (exclude current proxyId) - setupClickListeners(mapping, isProxyExcluded) - displayIcon(iconDrawable) - } - } - } - - private fun setupClickListeners(mapping: ProxyApplicationMapping, isProxyExcluded: Boolean) { - b.wgIncludeCard.setOnClickListener { - val isIncluded = !b.wgIncludeAppListCheckbox.isChecked - b.wgIncludeAppListCheckbox.isChecked = isIncluded - Logger.i( - LOG_TAG_PROXY, - "wgIncludeAppListContainer- ${mapping.appName}, $isIncluded" - ) - updateInterfaceDetails(mapping, isIncluded && !isProxyExcluded) - } - - b.wgIncludeAppListCheckbox.setOnCheckedChangeListener(null) - b.wgIncludeAppListCheckbox.setOnClickListener { - val isIncluded = b.wgIncludeAppListCheckbox.isChecked - Logger.i( - LOG_TAG_PROXY, - "wgIncludeAppListCheckbox- ${mapping.appName}, $isIncluded" - ) - updateInterfaceDetails(mapping, isIncluded && !isProxyExcluded) - } + LaunchedEffect(mapping.uid, mapping.proxyId, mapping.packageName) { + isProxyExcluded = withContext(Dispatchers.IO) { + FirewallManager.isAppExcludedFromProxy(mapping.uid) } - - private fun displayIcon(drawable: Drawable?) { - Glide.with(context) - .load(drawable) - .error(getDefaultIcon(context)) - .into(b.wgIncludeAppListApkIconIv) + hasInternetPerm = mapping.hasInternetPermission(packageManager) + iconDrawable = withContext(Dispatchers.IO) { + getIcon(context, mapping.packageName, mapping.appName) } - private fun setCardBackground(isSelected: Boolean) { - if (isSelected) { - b.wgIncludeCard.setCardBackgroundColor( - UIUtils.fetchColor(context, R.attr.selectedCardBg) - ) - } else { - b.wgIncludeCard.setCardBackgroundColor( - UIUtils.fetchColor(context, R.attr.background) - ) - } - } + isIncluded = mapping.proxyId == proxyId && mapping.proxyId.isNotEmpty() && !isProxyExcluded + } - private fun updateInterfaceDetails(mapping: ProxyApplicationMapping, include: Boolean) { - io { - // apps that share this packageName but may have multiple uids (multi-user) - val appUidList = FirewallManager.getAppNamesByUid(mapping.uid) - if (FirewallManager.isAppExcludedFromProxy(mapping.uid)) { - uiCtx { - showToastUiCentered( - context, - context.getString(R.string.exclude_apps_from_proxy_failure_toast), - Toast.LENGTH_LONG - ) - } - return@io - } - uiCtx { - if (appUidList.count() > 1) { - showDialog(appUidList, mapping, include) - } else { - updateProxyIdForApp(mapping, include) - } - } - } + val isClickable = !isProxyExcluded + val containerColor = + when { + isProxyExcluded -> MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.35f) + isIncluded -> MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.72f) + else -> MaterialTheme.colorScheme.surfaceContainerLow } - - private fun updateProxyIdForApp(mapping: ProxyApplicationMapping, include: Boolean) { - io { - if (include) { - addProxyToApp(mapping.uid, mapping.packageName, proxyId, proxyName) - Logger.i(LOG_TAG_PROXY, "Included app: ${mapping.uid}, $proxyId, $proxyName") - } else { - removeProxyFromApp(mapping.uid, mapping.packageName, proxyId) - Logger.i(LOG_TAG_PROXY, "Removed app: ${mapping.uid}, $proxyId, $proxyName") - } - refresh() - } + val interactionSource = remember { MutableInteractionSource() } + val isPressed by interactionSource.collectIsPressedAsState() + val scale by animateFloatAsState( + targetValue = if (isPressed) 0.97f else 1f, + animationSpec = spring(stiffness = Spring.StiffnessMedium), + label = "includeRowScale" + ) + val contentAlpha = if (hasInternetPerm && !isProxyExcluded) 1f else 0.5f + val titleColor = + when { + isIncluded -> MaterialTheme.colorScheme.onPrimaryContainer + else -> MaterialTheme.colorScheme.onSurface } - - private fun showDialog( - packageList: List, - mapping: ProxyApplicationMapping, - included: Boolean - ) { - val positiveTxt: String - - val builderSingle = MaterialAlertDialogBuilder(context) - - builderSingle.setIcon(R.drawable.ic_firewall_exclude_on) - - val count = packageList.count() - val title = - if (included) { - positiveTxt = context.getString(R.string.lbl_include) - context.getString(R.string.wg_apps_dialog_title_include, count.toString()) - } else { - positiveTxt = context.getString(R.string.lbl_remove) - context.getString(R.string.wg_apps_dialog_title_exclude, count.toString()) - } - - builderSingle.setTitle(title) - val arrayAdapter = - ArrayAdapter(context, android.R.layout.simple_list_item_activated_1) - arrayAdapter.addAll(packageList) - builderSingle.setCancelable(false) - - // show list just for information, we operate on all uids for this package - builderSingle.setItems(packageList.toTypedArray(), null) - - builderSingle - .setPositiveButton(positiveTxt) { _: DialogInterface, _: Int -> - // apply change to all UIDs that share this package name - io { - val packageNames: List = - FirewallManager.getPackageNamesByUid(mapping.uid) - packageNames.forEach { pkgName: String -> - val appInfo = FirewallManager.getAppInfoByPackage(pkgName) - if (appInfo != null) { - if (included) { - addProxyToApp( - appInfo.uid, - appInfo.packageName, - proxyId, - proxyName - ) - } else { - removeProxyFromApp(appInfo.uid, appInfo.packageName, proxyId) - } - } - } - refresh() + val shape = shapeFor(position) + + Surface( + modifier = + Modifier + .fillMaxWidth() + .scale(scale) + .clip(shape) + .padding( + top = if (position == CardPosition.Middle || position == CardPosition.Last) 2.dp else 0.dp + ), + shape = shape, + color = containerColor + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .toggleable( + value = isIncluded, + enabled = isClickable, + role = Role.Checkbox, + interactionSource = interactionSource, + indication = null + ) { checked -> + if (checked == isIncluded || !isClickable) return@toggleable + isIncluded = checked + onInterfaceUpdate(mapping, checked) } - } - .setNeutralButton(context.getString(R.string.ctbs_dialog_negative_btn)) { _: DialogInterface, _: Int -> - } - - val alertDialog: AlertDialog = builderSingle.show() - alertDialog.listView.setOnItemClickListener { _, _, _, _ -> } - alertDialog.setCancelable(false) + .padding(horizontal = Dimensions.spacingMd, vertical = 9.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + val iconPainter = + rememberDrawablePainter(iconDrawable) + ?: rememberDrawablePainter(getDefaultIcon(context)) + iconPainter?.let { painter -> + Image( + painter = painter, + contentDescription = null, + modifier = + Modifier + .size(36.dp) + .clip(RoundedCornerShape(10.dp)) + ) + } + Text( + text = mapping.appName, + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + color = titleColor.copy(alpha = contentAlpha), + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f) + ) + Checkbox( + checked = isIncluded, + enabled = isClickable, + onCheckedChange = null + ) } } +} - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } - } - - - private fun io(f: suspend () -> Unit) { - (context as LifecycleOwner).lifecycleScope.launch { withContext(Dispatchers.IO) { f() } } +private fun shapeFor(position: CardPosition): RoundedCornerShape { + return when (position) { + CardPosition.Single -> RoundedCornerShape(18.dp) + CardPosition.First -> RoundedCornerShape( + topStart = 18.dp, + topEnd = 18.dp, + bottomStart = 10.dp, + bottomEnd = 10.dp + ) + CardPosition.Middle -> RoundedCornerShape(10.dp) + CardPosition.Last -> RoundedCornerShape( + topStart = 10.dp, + topEnd = 10.dp, + bottomStart = 18.dp, + bottomEnd = 18.dp + ) } } diff --git a/app/src/full/java/com/celzero/bravedns/adapter/WgPeersAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/WgPeersAdapter.kt index 98ccfe679..55cc1bd88 100644 --- a/app/src/full/java/com/celzero/bravedns/adapter/WgPeersAdapter.kt +++ b/app/src/full/java/com/celzero/bravedns/adapter/WgPeersAdapter.kt @@ -15,134 +15,190 @@ */ package com.celzero.bravedns.adapter -import android.app.Activity import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.recyclerview.widget.RecyclerView +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import com.celzero.bravedns.R -import com.celzero.bravedns.databinding.ListItemWgPeersBinding import com.celzero.bravedns.service.WireguardManager +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog import com.celzero.bravedns.ui.dialog.WgAddPeerDialog -import com.celzero.bravedns.util.Themes import com.celzero.bravedns.util.UIUtils +import com.celzero.bravedns.util.Utilities.tos import com.celzero.bravedns.wireguard.Peer -import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class WgPeersAdapter( - val context: Context, - private var themeId: Int, - private val configId: Int, - private var peers: MutableList -) : RecyclerView.Adapter() { - - override fun onBindViewHolder(holder: WgPeersViewHolder, position: Int) { - val peer: Peer = peers[position] - holder.update(peer) - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WgPeersViewHolder { - val itemBinding = - ListItemWgPeersBinding.inflate(LayoutInflater.from(parent.context), parent, false) - return WgPeersViewHolder(itemBinding) - } - - override fun getItemCount(): Int { - return peers.size - } +@Composable +fun WgPeerRow( + context: Context, + configId: Int, + wgPeer: Peer, + onPeerChanged: () -> Unit +) { + val scope = rememberCoroutineScope() + val showDeleteDialog = remember(wgPeer.getPublicKey()) { mutableStateOf(false) } + var showEditDialog by remember(wgPeer.getPublicKey()) { mutableStateOf(false) } + val endpoint = + if (wgPeer.getEndpoint().isPresent) { + wgPeer.getEndpoint().get().toString() + } else { + null + } + val allowedIps = + if (wgPeer.getAllowedIps().isNotEmpty()) { + wgPeer.getAllowedIps().joinToString { it.toString() } + } else { + null + } + val keepAlive = + if (wgPeer.persistentKeepalive.isPresent) { + UIUtils.getDurationInHumanReadableFormat( + context, + wgPeer.persistentKeepalive.get() + ) + } else { + null + } - inner class WgPeersViewHolder(private val b: ListItemWgPeersBinding) : - RecyclerView.ViewHolder(b.root) { + Card( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(18.dp), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceContainerLow + ), + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f)) + ) { + Column( + modifier = Modifier.padding(start = 14.dp, end = 14.dp, top = 14.dp, bottom = 14.dp), + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = stringResource(id = R.string.lbl_peer), + style = MaterialTheme.typography.titleMedium + ) + Spacer(modifier = Modifier.weight(1f)) + IconButton(onClick = { + showEditDialog = true + }) { + Icon( + painter = painterResource(id = R.drawable.ic_edit_icon_grey), + contentDescription = null + ) + } + IconButton(onClick = { + showDeleteDialog.value = true + }) { + Icon( + painter = painterResource(id = R.drawable.ic_delete), + contentDescription = null + ) + } + } - fun update(wgPeer: Peer) { - if (wgPeer.getEndpoint().isPresent) { - b.endpointText.text = wgPeer.getEndpoint().get().toString() - } else { - b.endpointText.visibility = View.GONE - b.endpointLabel.visibility = View.GONE + LabelValue( + label = stringResource(id = R.string.lbl_public_key), + value = wgPeer.getPublicKey().base64().tos().orEmpty() + ) + if (!allowedIps.isNullOrEmpty()) { + LabelValue( + label = stringResource(id = R.string.lbl_allowed_ips), + value = allowedIps + ) } - if (wgPeer.getAllowedIps().isNotEmpty()) { - b.allowedIpsText.text = wgPeer.getAllowedIps().joinToString { it.toString() } - } else { - b.allowedIpsText.visibility = View.GONE - b.allowedIpsLabel.visibility = View.GONE + if (!endpoint.isNullOrEmpty()) { + LabelValue( + label = stringResource(id = R.string.parse_error_inet_endpoint), + value = endpoint + ) } - if (wgPeer.persistentKeepalive.isPresent) { - b.persistentKeepaliveText.text = - UIUtils.getDurationInHumanReadableFormat( - context, - wgPeer.persistentKeepalive.get() - ) - } else { - b.persistentKeepaliveText.visibility = View.GONE - b.persistentKeepaliveLabel.visibility = View.GONE + if (!keepAlive.isNullOrEmpty()) { + LabelValue( + label = stringResource(id = R.string.lbl_persistent_keepalive), + value = keepAlive + ) } - b.publicKeyText.text = wgPeer.getPublicKey().base64() - - b.peerEdit.setOnClickListener { openEditPeerDialog(wgPeer) } - b.peerDelete.setOnClickListener { showDeleteInterfaceDialog(wgPeer) } - } - } - - private fun openEditPeerDialog(wgPeer: Peer) { - // send 0 as peerId to indicate that it is a new peer - if (Themes.isFrostTheme(themeId)) { - themeId = R.style.App_Dialog_NoDim - } - val addPeerDialog = WgAddPeerDialog(context as Activity, themeId, configId, wgPeer) - addPeerDialog.setCanceledOnTouchOutside(false) - addPeerDialog.show() - addPeerDialog.setOnDismissListener { dataChanged() } - } - - fun dataChanged() { - peers.clear() - io { - val p = WireguardManager.getPeers(configId) - peers.addAll(p) - uiCtx { this?.notifyDataSetChanged() } } } - private fun showDeleteInterfaceDialog(wgPeer: Peer) { - val builder = MaterialAlertDialogBuilder(context, R.style.App_Dialog_NoDim) - val delText = + if (showDeleteDialog.value) { + val deleteTitle = context.getString( R.string.two_argument_space, context.getString(R.string.config_delete_dialog_title), context.getString(R.string.lbl_peer) ) - builder.setTitle(delText) - builder.setMessage(context.getString(R.string.config_delete_dialog_desc)) - builder.setCancelable(true) - - builder.setPositiveButton(delText) { _, _ -> deletePeer(wgPeer) } - - builder.setNegativeButton(context.getString(R.string.lbl_cancel)) { _, _ -> - // no-op - } - builder.create().show() + RethinkConfirmDialog( + onDismissRequest = { showDeleteDialog.value = false }, + title = deleteTitle, + message = context.getString(R.string.config_delete_dialog_desc), + confirmText = deleteTitle, + dismissText = context.getString(R.string.lbl_cancel), + isConfirmDestructive = true, + onConfirm = { + showDeleteDialog.value = false + deletePeer(context, scope, configId, wgPeer, onPeerChanged) + }, + onDismiss = { showDeleteDialog.value = false } + ) } - private fun deletePeer(wgPeer: Peer) { - io { - WireguardManager.deletePeer(configId, wgPeer) - peers = WireguardManager.getPeers(configId) - uiCtx { this.notifyDataSetChanged() } - } + if (showEditDialog) { + WgAddPeerDialog( + configId = configId, + wgPeer = wgPeer, + onDismiss = { + showEditDialog = false + onPeerChanged() + } + ) } +} - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } +@Composable +private fun LabelValue(label: String, value: String) { + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(text = label, style = MaterialTheme.typography.bodyMedium) + Text(text = value, style = MaterialTheme.typography.bodySmall) } +} - private fun io(f: suspend () -> Unit) { - (context as LifecycleOwner).lifecycleScope.launch(Dispatchers.IO) { f() } +private fun deletePeer( + context: Context, + scope: kotlinx.coroutines.CoroutineScope, + configId: Int, + wgPeer: Peer, + onPeerChanged: () -> Unit +) { + scope.launch(Dispatchers.IO) { + WireguardManager.deletePeer(configId, wgPeer) + withContext(Dispatchers.Main) { onPeerChanged() } } } diff --git a/app/src/full/java/com/celzero/bravedns/customdownloader/LocalBlocklistCoordinator.kt b/app/src/full/java/com/celzero/bravedns/customdownloader/LocalBlocklistCoordinator.kt index 350903d4f..f7078ba3a 100644 --- a/app/src/full/java/com/celzero/bravedns/customdownloader/LocalBlocklistCoordinator.kt +++ b/app/src/full/java/com/celzero/bravedns/customdownloader/LocalBlocklistCoordinator.kt @@ -35,7 +35,7 @@ import com.celzero.bravedns.data.AppConfig import com.celzero.bravedns.download.BlocklistDownloadHelper import com.celzero.bravedns.service.PersistentState import com.celzero.bravedns.service.RethinkBlocklistManager -import com.celzero.bravedns.ui.activity.AppLockActivity +import com.celzero.bravedns.ui.HomeScreenActivity import com.celzero.bravedns.util.Constants import com.celzero.bravedns.util.Constants.Companion.INIT_TIME_MS import com.celzero.bravedns.util.Constants.Companion.LOCAL_BLOCKLIST_DOWNLOAD_FOLDER_NAME @@ -451,7 +451,7 @@ class LocalBlocklistCoordinator(val context: Context, workerParams: WorkerParame if (Utilities.isAtleastO()) { val name: CharSequence = context.getString(R.string.notif_channel_download) - val description = context.resources.getString(R.string.notif_channed_desc_download) + val description = context.getString(R.string.notif_channed_desc_download) val importance = NotificationManager.IMPORTANCE_HIGH val channel = NotificationChannel(DOWNLOAD_NOTIFICATION_TAG, name, importance) channel.description = description @@ -492,7 +492,7 @@ class LocalBlocklistCoordinator(val context: Context, workerParams: WorkerParame private fun getPendingIntent(context: Context): PendingIntent { return Utilities.getActivityPendingIntent( context, - Intent(context, AppLockActivity::class.java), + Intent(context, HomeScreenActivity::class.java), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, mutable = false ) diff --git a/app/src/full/java/com/celzero/bravedns/customdownloader/OkHttpDebugLogging.kt b/app/src/full/java/com/celzero/bravedns/customdownloader/OkHttpDebugLogging.kt index 32543a714..66f0eab90 100644 --- a/app/src/full/java/com/celzero/bravedns/customdownloader/OkHttpDebugLogging.kt +++ b/app/src/full/java/com/celzero/bravedns/customdownloader/OkHttpDebugLogging.kt @@ -25,6 +25,7 @@ import java.util.logging.Level import java.util.logging.LogRecord import java.util.logging.Logger import java.util.logging.SimpleFormatter +import java.util.Locale import kotlin.reflect.KClass object OkHttpDebugLogging { @@ -41,7 +42,12 @@ object OkHttpDebugLogging { formatter = object : SimpleFormatter() { override fun format(record: LogRecord) = - String.format("[%1\$tF %1\$tT] %2\$s %n", record.millis, record.message) + String.format( + Locale.US, + "[%1\$tF %1\$tT] %2\$s %n", + record.millis, + record.message + ) } } diff --git a/app/src/full/java/com/celzero/bravedns/scheduler/WorkScheduler.kt b/app/src/full/java/com/celzero/bravedns/scheduler/WorkScheduler.kt index 5a9c2d73e..2d8686460 100644 --- a/app/src/full/java/com/celzero/bravedns/scheduler/WorkScheduler.kt +++ b/app/src/full/java/com/celzero/bravedns/scheduler/WorkScheduler.kt @@ -203,6 +203,12 @@ class WorkScheduler(val context: Context) { ) } + fun cancelBlocklistUpdateCheckJob() { + Logger.i(LOG_TAG_SCHEDULER, "Cancel all the work related to blocklist update check") + WorkManager.getInstance(context.applicationContext) + .cancelAllWorkByTag(BLOCKLIST_UPDATE_CHECK_JOB_TAG) + } + fun scheduleDataUsageJob() { Logger.i(LOG_TAG_SCHEDULER, "Data usage job scheduled") val workRequest = diff --git a/app/src/full/java/com/celzero/bravedns/ui/HomeDialogComponents.kt b/app/src/full/java/com/celzero/bravedns/ui/HomeDialogComponents.kt new file mode 100644 index 000000000..f0a672bc4 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/HomeDialogComponents.kt @@ -0,0 +1,130 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkMultiActionDialog + +@Composable +internal fun HomeConfirmDialog( + title: String, + message: String, + confirmText: String, + onConfirm: () -> Unit, + onDismissRequest: () -> Unit, + dismissText: String? = null, + onDismiss: (() -> Unit)? = null, + isConfirmDestructive: Boolean = false +) { + RethinkConfirmDialog( + onDismissRequest = onDismissRequest, + title = title, + message = message, + confirmText = confirmText, + dismissText = dismissText, + onConfirm = onConfirm, + onDismiss = onDismiss ?: onDismissRequest, + isConfirmDestructive = isConfirmDestructive + ) +} + +@Composable +internal fun HomeAlwaysOnStopDialog( + title: String, + message: String, + stopText: String, + openSettingsText: String, + cancelText: String, + onStop: () -> Unit, + onOpenSettings: () -> Unit, + onCancel: () -> Unit +) { + RethinkMultiActionDialog( + onDismissRequest = {}, + title = title, + message = message, + primaryText = stopText, + onPrimary = onStop, + secondaryText = openSettingsText, + onSecondary = onOpenSettings, + tertiaryText = cancelText, + onTertiary = onCancel + ) +} + +@Composable +internal fun HomeStatsDialog( + title: String, + displayText: String, + dismissText: String, + copyText: String, + onDismissRequest: () -> Unit, + onDismiss: () -> Unit, + onCopy: () -> Unit +) { + RethinkMultiActionDialog( + onDismissRequest = onDismissRequest, + title = title, + text = { + SelectionContainer { + Column( + modifier = + Modifier.fillMaxWidth() + .verticalScroll(rememberScrollState()) + .padding(Dimensions.spacingSm) + ) { + Text(text = displayText, style = MaterialTheme.typography.bodySmall) + } + } + }, + primaryText = dismissText, + onPrimary = onDismiss, + secondaryText = copyText, + onSecondary = onCopy + ) +} + +@Composable +internal fun HomeNewFeaturesDialog( + title: String, + dismissText: String, + contactText: String, + onDismissRequest: () -> Unit, + onDismiss: () -> Unit, + onContact: () -> Unit, + content: @Composable () -> Unit +) { + RethinkMultiActionDialog( + onDismissRequest = onDismissRequest, + title = title, + text = content, + primaryText = dismissText, + onPrimary = onDismiss, + secondaryText = contactText, + onSecondary = onContact + ) +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/HomeScreenActivity.kt b/app/src/full/java/com/celzero/bravedns/ui/HomeScreenActivity.kt index 6453a1ebb..58378ddd6 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/HomeScreenActivity.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/HomeScreenActivity.kt @@ -15,34 +15,110 @@ */ package com.celzero.bravedns.ui + import Logger import Logger.LOG_TAG_APP_UPDATE import Logger.LOG_TAG_BACKUP_RESTORE import Logger.LOG_TAG_DOWNLOAD import Logger.LOG_TAG_UI +import Logger.LOG_TAG_VPN +import android.Manifest import android.app.UiModeManager +import android.app.Activity import android.content.ActivityNotFoundException +import android.content.ClipData +import android.content.ClipboardManager import android.content.Context import android.content.Intent import android.content.pm.PackageInfo import android.content.pm.PackageManager +import android.graphics.Color as AndroidColor import android.content.res.Configuration import android.content.res.Configuration.UI_MODE_NIGHT_YES +import android.database.Cursor +import android.net.VpnService import android.net.Uri import android.os.Bundle +import android.os.Build import android.os.SystemClock -import android.view.View +import android.provider.Settings +import android.view.Gravity +import android.view.WindowManager import android.widget.Toast -import androidx.activity.OnBackPressedCallback +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.activity.SystemBarStyle +import androidx.activity.result.contract.ActivityResultContracts +import androidx.annotation.RequiresApi +import androidx.appcompat.app.AppCompatActivity +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Checkbox +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FloatingActionButton +import androidx.compose.material3.FloatingActionButtonDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.SnackbarDuration +import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.SnackbarResult +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.TextFieldDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat +import androidx.core.content.FileProvider import androidx.core.net.toUri -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import androidx.core.view.WindowInsetsControllerCompat -import androidx.core.view.updatePadding +import androidx.core.view.WindowCompat +import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.lifecycleScope -import androidx.navigation.NavOptions -import androidx.navigation.fragment.NavHostFragment import androidx.work.BackoffPolicy import androidx.work.Data import androidx.work.OneTimeWorkRequestBuilder @@ -52,37 +128,71 @@ import androidx.work.WorkRequest import com.celzero.bravedns.BuildConfig import com.celzero.bravedns.NonStoreAppUpdater import com.celzero.bravedns.R +import com.celzero.bravedns.RethinkDnsApplication.Companion.DEBUG import com.celzero.bravedns.backup.BackupHelper import com.celzero.bravedns.backup.BackupHelper.Companion.BACKUP_FILE_EXTN import com.celzero.bravedns.backup.BackupHelper.Companion.INTENT_RESTART_APP import com.celzero.bravedns.backup.BackupHelper.Companion.INTENT_SCHEME import com.celzero.bravedns.backup.RestoreAgent import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.data.SummaryStatisticsType +import com.celzero.bravedns.database.AppDatabase import com.celzero.bravedns.database.AppInfoRepository +import com.celzero.bravedns.database.EventDao import com.celzero.bravedns.database.RefreshDatabase +import com.celzero.bravedns.scheduler.BugReportZipper +import com.celzero.bravedns.scheduler.EnhancedBugReport +import com.celzero.bravedns.scheduler.WorkScheduler import com.celzero.bravedns.service.AppUpdater import com.celzero.bravedns.service.BraveVPNService -import com.celzero.bravedns.service.FirewallManager -import com.celzero.bravedns.service.InAppMessageProvider +import com.celzero.bravedns.service.EventLogger import com.celzero.bravedns.service.PersistentState import com.celzero.bravedns.service.RethinkBlocklistManager import com.celzero.bravedns.service.VpnController import com.celzero.bravedns.service.WireguardManager -import com.celzero.bravedns.ui.activity.MiscSettingsActivity -import com.celzero.bravedns.ui.activity.PauseActivity -import com.celzero.bravedns.ui.activity.WelcomeActivity + +import com.celzero.bravedns.ui.compose.dns.ConfigureRethinkScreenType +import com.celzero.bravedns.ui.compose.navigation.HomeNavRequest +import com.celzero.bravedns.ui.compose.navigation.CustomRulesMode +import com.celzero.bravedns.ui.compose.navigation.CustomRulesTab +import com.celzero.bravedns.ui.compose.navigation.HomeRoute +import com.celzero.bravedns.ui.compose.wireguard.WgType +import com.celzero.bravedns.ui.compose.navigation.HomeScreenRoot +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkModalBottomSheet +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkTheme +import com.celzero.bravedns.ui.compose.theme.RethinkColorPreset +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import com.celzero.bravedns.ui.compose.settings.AppLockScreen +import com.celzero.bravedns.ui.compose.settings.AppLockResult +import com.celzero.bravedns.ui.compose.home.PauseScreen +import com.celzero.bravedns.util.BioMetricType +import androidx.lifecycle.asFlow import com.celzero.bravedns.util.Constants -import com.celzero.bravedns.util.Constants.Companion.ALPHA_UPDATE_CHECK_URL import com.celzero.bravedns.util.Constants.Companion.MAX_ENDPOINT import com.celzero.bravedns.util.Constants.Companion.PKG_NAME_PLAY_STORE +import com.celzero.bravedns.util.Constants.Companion.RETHINKDNS_SPONSOR_LINK +import com.celzero.bravedns.util.Constants.Companion.UID_EVERYBODY +import com.celzero.bravedns.viewmodel.SummaryStatisticsViewModel import com.celzero.bravedns.util.FirebaseErrorReporting import com.celzero.bravedns.util.FirebaseErrorReporting.TOKEN_LENGTH import com.celzero.bravedns.util.FirebaseErrorReporting.TOKEN_REGENERATION_PERIOD_DAYS import com.celzero.bravedns.util.NewSettingsManager import com.celzero.bravedns.util.RemoteFileTagUtil -import com.celzero.bravedns.util.Themes -import com.celzero.bravedns.util.Themes.Companion.getCurrentTheme +import com.celzero.bravedns.util.UIUtils +import com.journeyapps.barcodescanner.ScanContract +import com.journeyapps.barcodescanner.ScanOptions +import com.celzero.bravedns.util.QrCodeFromFileScanner +import com.celzero.bravedns.util.TunnelImporter +import com.google.zxing.qrcode.QRCodeReader +import com.celzero.bravedns.util.UIUtils.openNetworkSettings import com.celzero.bravedns.util.UIUtils.openUrl +import com.celzero.bravedns.util.UIUtils.openVpnProfile +import com.celzero.bravedns.util.UIUtils.sendEmailIntent +import com.celzero.bravedns.util.Themes import com.celzero.bravedns.util.Utilities import com.celzero.bravedns.util.Utilities.getPackageMetadata import com.celzero.bravedns.util.Utilities.getRandomString @@ -91,29 +201,151 @@ import com.celzero.bravedns.util.Utilities.isAtleastQ import com.celzero.bravedns.util.Utilities.isPlayStoreFlavour import com.celzero.bravedns.util.Utilities.isWebsiteFlavour import com.celzero.bravedns.util.Utilities.showToastUiCentered +import com.celzero.bravedns.util.disableFrostTemporarily import com.celzero.bravedns.util.handleFrostEffectIfNeeded -import com.google.android.material.bottomnavigation.BottomNavigationView -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.google.android.material.snackbar.Snackbar +import com.celzero.bravedns.viewmodel.AppConnectionsViewModel +import com.celzero.bravedns.viewmodel.CustomDomainViewModel +import com.celzero.bravedns.viewmodel.CustomIpViewModel +import com.celzero.bravedns.viewmodel.CheckoutViewModel +import com.celzero.bravedns.viewmodel.DomainConnectionsViewModel +import com.celzero.bravedns.viewmodel.EventsViewModel + import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import org.koin.android.ext.android.get import org.koin.android.ext.android.inject +import org.koin.androidx.viewmodel.ext.android.viewModel +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.text.SimpleDateFormat import java.util.Calendar +import java.util.Date +import java.util.Locale import java.util.concurrent.TimeUnit -import kotlin.time.Duration.Companion.milliseconds +import java.util.zip.ZipEntry +import java.util.zip.ZipFile +import java.util.zip.ZipOutputStream -class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { +class HomeScreenActivity : AppCompatActivity() { private val persistentState by inject() + private val appInfoDb by inject() private val appUpdateManager by inject() - private val inAppMessageProvider by inject() private val rdb by inject() private val appConfig by inject() + private val workScheduler by inject() + private val appDatabase by inject() + private val eventDao by inject() + private val eventLogger by inject() + + private val homeViewModel by viewModel() + private val summaryViewModel by viewModel() + private val aboutViewModel by viewModel() + private val detailedStatsViewModel by viewModel() + private val domainConnectionsViewModel by viewModel() + private val eventsViewModel by viewModel() + private val appInfoIpRulesViewModel by viewModel() + private val appInfoDomainRulesViewModel by viewModel() + private val appInfoNetworkLogsViewModel by viewModel() + private val consoleLogViewModel by inject() + private val consoleLogRepository by inject() + private val proxyAppsMappingViewModel by viewModel() + private val dnsSettingsViewModel by viewModel() + private val appDownloadManager by inject() + private val rethinkEndpointViewModel by viewModel() + private val remoteFileTagViewModel by viewModel() + private val localFileTagViewModel by viewModel() + private val remoteBlocklistPacksMapViewModel by viewModel() + private val localBlocklistPacksMapViewModel by viewModel() + private val appInfoViewModel by viewModel() + private val connectionTrackerViewModel by viewModel() + private val dnsLogViewModel by viewModel() + private val rethinkLogViewModel by viewModel() + private val connectionTrackerRepository by inject() + private val dnsLogRepository by inject() + private val rethinkLogRepository by inject() + + // ConfigureOtherDns ViewModels + private val dohViewModel by viewModel() + private val dotViewModel by viewModel() + private val dnsProxyViewModel by viewModel() + private val dnsCryptViewModel by viewModel() + private val dnsCryptRelayViewModel by viewModel() + private val oDohViewModel by viewModel() + private val checkoutViewModel: CheckoutViewModel? by lazy { + runCatching { get() }.getOrNull() + } + private val wgConfigViewModel by viewModel() + // TODO: see if this can be replaced with a more robust solution // keep track of when app went to background private var appInBackground = false + private var showBugReportSheet by mutableStateOf(false) + private var homeDialogState by mutableStateOf(null) + private var snackbarHostState: SnackbarHostState? = null + private var homeNavRequest by mutableStateOf(null) + + private lateinit var startForResult: androidx.activity.result.ActivityResultLauncher + private lateinit var notificationPermissionResult: androidx.activity.result.ActivityResultLauncher + + // WireGuard Import Launchers + private val tunnelFileImportResultLauncher = + registerForActivityResult(ActivityResultContracts.GetContent()) { data -> + if (data == null) return@registerForActivityResult + val contentResolver = contentResolver ?: return@registerForActivityResult + lifecycleScope.launch { + if (QrCodeFromFileScanner.validContentType(contentResolver, data)) { + try { + val qrCodeFromFileScanner = + QrCodeFromFileScanner(contentResolver, QRCodeReader()) + val result = qrCodeFromFileScanner.scan(data) + if (result != null) { + withContext(Dispatchers.Main) { + TunnelImporter.importTunnel(result.text) { + showToastUiCentered( + this@HomeScreenActivity, + it.toString(), + Toast.LENGTH_LONG + ) + } + } + } else { + val message = resources.getString(R.string.invalid_file_error) + showToastUiCentered(this@HomeScreenActivity, message, Toast.LENGTH_LONG) + } + } catch (e: Exception) { + val message = resources.getString(R.string.invalid_file_error) + showToastUiCentered(this@HomeScreenActivity, message, Toast.LENGTH_LONG) + } + } else { + TunnelImporter.importTunnel(contentResolver, data) { + showToastUiCentered( + this@HomeScreenActivity, + it.toString(), + Toast.LENGTH_LONG + ) + } + } + } + } + + private val qrImportResultLauncher = + registerForActivityResult(ScanContract()) { result -> + val qrCode = result.contents + if (qrCode != null) { + lifecycleScope.launch { + TunnelImporter.importTunnel(qrCode) { + showToastUiCentered( + this@HomeScreenActivity, + it.toString(), + Toast.LENGTH_LONG + ) + } + } + } + } // TODO - #324 - Usage of isDarkTheme() in all activities. private fun Context.isDarkThemeOn(): Boolean { @@ -122,50 +354,343 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { } override fun onCreate(savedInstanceState: Bundle?) { - theme.applyStyle(getCurrentTheme(isDarkThemeOn(), persistentState.theme), true) super.onCreate(savedInstanceState) + enableEdgeToEdge( + statusBarStyle = SystemBarStyle.auto( + lightScrim = 0x00000000, + darkScrim = 0x00000000 + ), + navigationBarStyle = SystemBarStyle.auto( + lightScrim = 0x00000000, + darkScrim = 0x00000000 + ) + ) + WindowCompat.setDecorFitsSystemWindows(window, false) + window.statusBarColor = AndroidColor.TRANSPARENT + window.navigationBarColor = AndroidColor.TRANSPARENT + window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) + window.clearFlags( + WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS or + WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION + ) + window.navigationBarDividerColor = AndroidColor.TRANSPARENT + window.isNavigationBarContrastEnforced = false + window.isStatusBarContrastEnforced = false - if (isAtleastO_MR1()) { - Logger.vv(LOG_TAG_UI, "Setting up window insets for Android 27+") - ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.nav_view)) { view, insets -> - val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) - view.updatePadding(bottom = systemBars.bottom) // Add bottom padding to keep icons visible - insets - WindowInsetsCompat.CONSUMED - } - } - - if (isAtleastQ()) { - val controller = WindowInsetsControllerCompat(window, window.decorView) - controller.isAppearanceLightNavigationBars = Themes.isActivityLightTheme(isDarkThemeOn(), persistentState.theme) - window.isNavigationBarContrastEnforced = false - } - // do not launch on board activity when app is running on TV - if (persistentState.firstTimeLaunch && !isAppRunningOnTv()) { - launchOnboardActivity() - return - } + val resolvedThemePreference = + Themes.resolveThemePreference(isDarkThemeOn(), persistentState.theme) - handleFrostEffectIfNeeded(persistentState.theme) + val homeStartDestination = + if (persistentState.firstTimeLaunch && !isAppRunningOnTv()) { + HomeRoute.Welcome + } else { + HomeRoute.Home + } - updateNewVersion() + handleFrostEffectIfNeeded(resolvedThemePreference) - setupNavigationItemSelectedListener() + registerForActivityResult() + updateNewVersion() // handle intent receiver for backup/restore handleIntent() + handleNavigationIntent(intent) initUpdateCheck() observeAppState() - handleOnBackPressed() - NewSettingsManager.handleNewSettings() regenerateFirebaseTokenIfNeeded() + + appConfig.getBraveModeObservable().postValue(appConfig.getBraveMode().mode) + + setContent { + var composeThemePreference by remember { mutableStateOf(persistentState.theme) } + var composeThemeColorPreset by remember { mutableStateOf(persistentState.themeColorPreset) } + + val colorPreset = RethinkColorPreset.fromId(composeThemeColorPreset) + RethinkTheme( + themePreference = composeThemePreference, + colorPreset = colorPreset + ) { + val hostState = remember { SnackbarHostState() } + DisposableEffect(hostState) { + snackbarHostState = hostState + onDispose { + if (snackbarHostState == hostState) { + snackbarHostState = null + } + } + } + val homeState by homeViewModel.uiState.collectAsStateWithLifecycle() + val aboutState by aboutViewModel.uiState.collectAsStateWithLifecycle() + + var isUnlocked by remember { mutableStateOf(false) } + val vpnState by remember { VpnController.connectionStatus.asFlow() }.collectAsStateWithLifecycle( + initialValue = null + ) + + if (vpnState == BraveVPNService.State.PAUSED) { + PauseScreen(onFinish = { }) + } else if (isUnlocked) { + HomeScreenRoot( + homeUiState = homeState, + onHomeStartStopClick = { handleMainScreenBtnClickEvent() }, + onHomeDnsClick = { navigateToDnsDetailIfAllowed() }, + onHomeFirewallClick = { homeNavRequest = HomeNavRequest.FirewallSettings }, + onHomeProxyClick = { + if (appConfig.isWireGuardEnabled()) { + homeNavRequest = HomeNavRequest.WgMain + } else { + homeNavRequest = HomeNavRequest.ProxySettings + } + }, + onHomeLogsClick = { homeNavRequest = HomeNavRequest.NetworkLogs }, + onHomeAppsClick = { homeNavRequest = HomeNavRequest.AppList }, + onHomeSponsorClick = { + // promptForAppSponsorship() + }, + summaryViewModel = summaryViewModel, + onOpenDetailedStats = { type -> openDetailedStatsUi(type) }, + startDestination = homeStartDestination, + isDebug = DEBUG, + onConfigureAppsClick = { homeNavRequest = HomeNavRequest.AppList }, + onConfigureDnsClick = { navigateToDnsDetailIfAllowed() }, + onConfigureFirewallClick = { + homeNavRequest = HomeNavRequest.FirewallSettings + }, + onFirewallUniversalClick = { + homeNavRequest = HomeNavRequest.UniversalFirewallSettings + }, + onFirewallCustomIpClick = { + homeNavRequest = + HomeNavRequest.CustomRules( + uid = UID_EVERYBODY, + tab = CustomRulesTab.IP, + mode = CustomRulesMode.APP_SPECIFIC + ) + }, + onFirewallAppWiseIpClick = { openAppWiseIpScreen() }, + onConfigureProxyClick = { homeNavRequest = HomeNavRequest.ProxySettings }, + onConfigureNetworkClick = { + homeNavRequest = HomeNavRequest.TunnelSettings + }, + onConfigureOthersClick = { homeNavRequest = HomeNavRequest.MiscSettings }, + onConfigureLogsClick = { homeNavRequest = HomeNavRequest.NetworkLogs }, + onConfigureAntiCensorshipClick = { + homeNavRequest = HomeNavRequest.AntiCensorship + }, + onConfigureAdvancedClick = { + homeNavRequest = HomeNavRequest.AdvancedSettings + }, + aboutUiState = aboutState, + onSponsorClick = { openUrl(this, RETHINKDNS_SPONSOR_LINK) }, + onTelegramClick = { + openUrl( + this, + getString(R.string.about_telegram_link) + ) + }, + onBugReportClick = { aboutViewModel.triggerBugReport() }, + onWhatsNewClick = { showNewFeaturesDialog() }, + onAppUpdateClick = { checkForUpdate(AppUpdater.UserPresent.INTERACTIVE) }, + onContributorsClick = { showContributors() }, + onTranslateClick = { + openUrl( + this, + getString(R.string.about_translate_link) + ) + }, + onWebsiteClick = { openUrl(this, getString(R.string.about_website_link)) }, + onGithubClick = { openUrl(this, getString(R.string.about_github_link)) }, + onFaqClick = { openUrl(this, getString(R.string.about_faq_link)) }, + onDocsClick = { openUrl(this, getString(R.string.about_docs_link)) }, + onPrivacyPolicyClick = { + openUrl( + this, + getString(R.string.about_privacy_policy_link) + ) + }, + onTermsOfServiceClick = { + openUrl( + this, + getString(R.string.about_terms_link) + ) + }, + onLicenseClick = { openUrl(this, getString(R.string.about_license_link)) }, + onTwitterClick = { + openUrl( + this, + getString(R.string.about_twitter_handle) + ) + }, + onEmailClick = { disableFrostTemporarily(); sendEmailIntent(this) }, + onRedditClick = { openUrl(this, getString(R.string.about_reddit_handle)) }, + onElementClick = { openUrl(this, getString(R.string.about_matrix_handle)) }, + onMastodonClick = { + openUrl( + this, + getString(R.string.about_mastodom_handle) + ) + }, + onGeneralSettingsClick = { homeNavRequest = HomeNavRequest.MiscSettings }, + onAppInfoClick = { UIUtils.openAndroidAppInfo(this, packageName) }, + onVpnProfileClick = { openVpnProfile(this) }, + onNotificationClick = { openNotificationSettings() }, + onStatsClick = { openStatsDialog() }, + onDbStatsClick = { openDatabaseDumpDialog() }, + onFlightRecordClick = { initiateFlightRecord() }, + onEventLogsClick = { openEventLogs() }, + onTokenClick = { copyTokenToClipboard() }, + onTokenDoubleTap = { aboutViewModel.generateNewToken() }, + onFossClick = { openUrl(this, getString(R.string.about_foss_link)) }, + onFlossFundsClick = { + openUrl( + this, + getString(R.string.about_floss_fund_link) + ) + }, + snackbarHostState = hostState, + detailedStatsViewModel = detailedStatsViewModel, + domainConnectionsViewModel = domainConnectionsViewModel, + eventsViewModel = eventsViewModel, + eventDao = eventDao, + appInfoEventLogger = eventLogger, + appInfoIpRulesViewModel = appInfoIpRulesViewModel, + appInfoDomainRulesViewModel = appInfoDomainRulesViewModel, + appInfoNetworkLogsViewModel = appInfoNetworkLogsViewModel, + persistentState = persistentState, + appConfig = appConfig, + onOpenVpnProfile = { UIUtils.openVpnProfile(this@HomeScreenActivity) }, + onRefreshDatabase = { lifecycleScope.launch { rdb.refresh(RefreshDatabase.ACTION_REFRESH_INTERACTIVE) } }, + onThemeModeChanged = { composeThemePreference = it }, + onThemeColorChanged = { composeThemeColorPreset = it }, + consoleLogViewModel = consoleLogViewModel, + consoleLogRepository = consoleLogRepository, + onShareConsoleLogs = { + homeNavRequest = HomeNavRequest.NetworkLogs + }, // Fallback to Activity for complex share + onConsoleLogsDeleteComplete = { + showToastUiCentered( + this@HomeScreenActivity, + getString(R.string.config_add_success_toast), + Toast.LENGTH_SHORT + ) + }, + proxyAppsMappingViewModel = proxyAppsMappingViewModel, + dnsSettingsViewModel = dnsSettingsViewModel, + appDownloadManager = appDownloadManager, + onDnsCustomDnsClick = { startCustomDnsActivity() }, + onDnsLocalBlocklistConfigureClick = { startLocalBlocklistConfigureActivity() }, + onDnsRethinkPlusDnsClick = { startRethinkPlusDnsActivity() }, + homeNavRequest = homeNavRequest, + onHomeNavConsumed = { homeNavRequest = null }, + rethinkEndpointViewModel = rethinkEndpointViewModel, + remoteFileTagViewModel = remoteFileTagViewModel, + localFileTagViewModel = localFileTagViewModel, + remoteBlocklistPacksMapViewModel = remoteBlocklistPacksMapViewModel, + localBlocklistPacksMapViewModel = localBlocklistPacksMapViewModel, + appInfoViewModel = appInfoViewModel, + refreshDatabase = rdb, + connectionTrackerViewModel = connectionTrackerViewModel, + dnsLogViewModel = dnsLogViewModel, + rethinkLogViewModel = rethinkLogViewModel, + connectionTrackerRepository = connectionTrackerRepository, + dnsLogRepository = dnsLogRepository, + rethinkLogRepository = rethinkLogRepository, + onConfigureOtherDns = { index -> + homeNavRequest = HomeNavRequest.ConfigureOtherDns(index) + }, + // ConfigureOtherDns ViewModels + dohViewModel = dohViewModel, + dotViewModel = dotViewModel, + dnsProxyViewModel = dnsProxyViewModel, + dnsCryptViewModel = dnsCryptViewModel, + dnsCryptRelayViewModel = dnsCryptRelayViewModel, + oDohViewModel = oDohViewModel, + // UniversalFirewallSettings callbacks + onNavigateToLogs = { searchQuery -> + homeNavRequest = HomeNavRequest.NetworkLogs + }, + onOpenAccessibilitySettings = { + startActivity(Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)) + }, + // WireGuard dependencies + wgConfigViewModel = wgConfigViewModel, + // Checkout dependencies + checkoutViewModel = checkoutViewModel, + onNavigateToProxy = { homeNavRequest = HomeNavRequest.ProxySettings }, + // WgMain callbacks + onWgCreateClick = { + homeNavRequest = HomeNavRequest.WgConfigEditor( + com.celzero.bravedns.service.WireguardManager.INVALID_CONF_ID, + com.celzero.bravedns.ui.compose.wireguard.WgType.DEFAULT + ) + }, + onWgImportClick = { launchFileImport() }, + onWgQrScanClick = { launchQrScanner() }, + appDatabase = appDatabase + ) + } else { + AppLockScreen( + persistentState = persistentState, + onAuthResult = { result -> + when (result) { + AppLockResult.Success, AppLockResult.NotRequired -> { + isUnlocked = true + } + + AppLockResult.Failure -> { + finish() + } + + AppLockResult.Pending -> { + // Waiting for user interaction + } + } + } + ) + } + + + if (showBugReportSheet) { + BugReportFilesSheet(onDismiss = { showBugReportSheet = false }) + } + HomeDialogHost() + } + } + + // enable in-app messaging, will be used to show in-app messages in case of billing issues + //enableInAppMessaging() + } + + + /*private fun enableInAppMessaging() { + initiateBillingIfNeeded() + // enable in-app messaging + InAppBillingHandler.enableInAppMessaging(this) + Logger.v(LOG_IAB, "enableInAppMessaging: enabled") + } + + private fun initiateBillingIfNeeded() { + if (InAppBillingHandler.isBillingClientSetup()) { + Logger.i(LOG_IAB, "ensureBillingSetup: billing client already setup") + return + } + + InAppBillingHandler.initiate(this.applicationContext) + Logger.i(LOG_IAB, "ensureBillingSetup: billing client initiated") + }*/ + + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + handleNavigationIntent(intent) + Logger.v(LOG_TAG_UI, "home screen activity received new intent") } override fun onResume() { @@ -175,9 +700,6 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { appInBackground = false Logger.d(LOG_TAG_UI, "app restored from background, maintaining activity stack") } - // Show any pending Play Billing in-app messages (payment recovery, grace-period - // notices, etc.). This is a no-op on non-Play flavors. - inAppMessageProvider.showMessages(this) } // check if app running on TV @@ -200,10 +722,8 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { intent.scheme?.equals(INTENT_SCHEME) == true && intent.data?.path?.contains(BACKUP_FILE_EXTN) == true ) { - Logger.i(LOG_TAG_UI, "handleIntent: backup intent") handleRestoreProcess(intent.data) } else if (intent.scheme?.equals(INTENT_SCHEME) == true) { - Logger.i(LOG_TAG_UI, "handleIntent: restore intent") showToastUiCentered( this, getString(R.string.brbs_restore_no_uri_toast), @@ -215,6 +735,82 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { } } + private fun handleNavigationIntent(intent: Intent?) { + if (intent == null) return + handleNotificationAction(intent) + val target = intent.getStringExtra(EXTRA_NAV_TARGET) ?: return + when (target) { + NAV_TARGET_DOMAIN_CONNECTIONS -> { + val typeValue = intent.getIntExtra(EXTRA_DC_TYPE, 0) + val flag = intent.getStringExtra(EXTRA_DC_FLAG).orEmpty() + val domain = intent.getStringExtra(EXTRA_DC_DOMAIN).orEmpty() + val asn = intent.getStringExtra(EXTRA_DC_ASN).orEmpty() + val ip = intent.getStringExtra(EXTRA_DC_IP).orEmpty() + val isBlocked = intent.getBooleanExtra(EXTRA_DC_IS_BLOCKED, false) + val timeCategoryValue = intent.getIntExtra(EXTRA_DC_TIME_CATEGORY, 0) + val type = + com.celzero.bravedns.ui.compose.logs.DomainConnectionsInputType.fromValue( + typeValue + ) + val timeCategory = + DomainConnectionsViewModel.TimeCategory.fromValue(timeCategoryValue) + ?: DomainConnectionsViewModel.TimeCategory.ONE_HOUR + homeNavRequest = + HomeNavRequest.DomainConnections( + type = type, + flag = flag, + domain = domain, + asn = asn, + ip = ip, + isBlocked = isBlocked, + timeCategory = timeCategory + ) + } + + NAV_TARGET_APP_INFO -> { + val uid = intent.getIntExtra(EXTRA_APP_INFO_UID, Constants.INVALID_UID) + if (uid == Constants.INVALID_UID) return + homeNavRequest = HomeNavRequest.AppInfo(uid = uid) + } + + NAV_TARGET_NETWORK_LOGS -> { + // Navigate to network logs screen + homeNavRequest = HomeNavRequest.NetworkLogs + } + + NAV_TARGET_WG_MAIN -> { + homeNavRequest = HomeNavRequest.WgMain + } + } + } + + private fun handleNotificationAction(intent: Intent) { + if (intent.extras == null) return + + val accessibility = intent.getStringExtra(Constants.NOTIF_INTENT_EXTRA_ACCESSIBILITY_NAME) + if (Constants.NOTIF_INTENT_EXTRA_ACCESSIBILITY_VALUE == accessibility) { + homeDialogState = HomeDialog.AccessibilityCrash + return + } + + val newApp = intent.getStringExtra(Constants.NOTIF_INTENT_EXTRA_NEW_APP_NAME) + if (Constants.NOTIF_INTENT_EXTRA_NEW_APP_VALUE == newApp) { + val uid = + intent.getIntExtra(Constants.NOTIF_INTENT_EXTRA_APP_UID, Constants.INVALID_UID) + if (uid > 0) { + homeNavRequest = HomeNavRequest.AppInfo(uid = uid) + } + return + } + + val wg = intent.getStringExtra(Constants.NOTIF_WG_PERMISSION_NAME) + if (Constants.NOTIF_WG_PERMISSION_VALUE == wg) { + homeNavRequest = HomeNavRequest.WgMain + return + } + } + + private fun handleRestoreProcess(uri: Uri?) { if (uri == null) { showToastUiCentered( @@ -248,22 +844,7 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { private fun showRestoreDialog(uri: Uri) { if (!isInForeground()) return - - val builder = MaterialAlertDialogBuilder(this, R.style.App_Dialog_NoDim) - builder.setTitle(R.string.brbs_restore_dialog_title) - builder.setMessage(R.string.brbs_restore_dialog_message) - builder.setPositiveButton(getString(R.string.brbs_restore_dialog_positive)) { _, _ -> - startRestore(uri) - observeRestoreWorker() - } - - builder.setNegativeButton(getString(R.string.lbl_cancel)) { _, _ -> - // no-op - } - - builder.setCancelable(true) - val dialog = builder.create() - dialog.show() + homeDialogState = HomeDialog.Restore(uri) } private fun startRestore(fileUri: Uri) { @@ -301,11 +882,6 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { Toast.LENGTH_SHORT ) workManager.pruneWork() - // restart the app so that Room gets fresh SQLite connections - lifecycleScope.launch { - delay(1000.milliseconds) - restartApp() - } } else if ( WorkInfo.State.CANCELLED == workInfo.state || WorkInfo.State.FAILED == workInfo.state @@ -323,30 +899,24 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { } } - private fun restartApp() { - val pm: PackageManager = packageManager - val intent = pm.getLaunchIntentForPackage(packageName) ?: return - val mainIntent = Intent.makeRestartActivityTask(intent.component) - mainIntent.putExtra(INTENT_RESTART_APP, true) - startActivity(mainIntent) - Runtime.getRuntime().exit(0) - } - private fun observeAppState() { VpnController.connectionStatus.observe(this) { if (it == BraveVPNService.State.PAUSED) { - startActivity(Intent().setClass(this, PauseActivity::class.java)) - finish() + // Handled in setContent } } } private fun removeThisMethod() { + // set allowBypass to false for all versions, overriding the user's preference. + // the default was true for Play Store and website versions, and false for F-Droid. + // when allowBypass is true, some OEMs bypass the VPN service, causing connections + // to fail due to the "Block connections without VPN" option. + persistentState.allowBypass = false - val rethinkUid = Utilities.getApplicationInfo(this, this.packageName)?.uid io { - if (rethinkUid != null) FirewallManager.exemptRethinkApp(rethinkUid) - else Logger.e(LOG_TAG_UI, "HomeScreen Rethink UID is null") + appInfoDb.setRethinkToBypassDnsAndFirewall() + appInfoDb.setRethinkToBypassProxy(true) } // change the persistent state for defaultDnsUrl, if its google.com (only for v055d) @@ -361,7 +931,7 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { // if biometric auth is enabled, then set the biometric auth type to 3 (15 minutes) if (persistentState.biometricAuth) { persistentState.biometricAuthType = - MiscSettingsActivity.BioMetricType.FIFTEEN_MIN.action + BioMetricType.FIFTEEN_MIN.action // reset the bio metric auth time, as now the value is changed from System.currentTimeMillis // to SystemClock.elapsedRealtime persistentState.biometricAuthTime = SystemClock.elapsedRealtime() @@ -407,11 +977,6 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { } } - private fun launchOnboardActivity() { - val intent = Intent(this, WelcomeActivity::class.java) - startActivity(intent) - finish() - } private fun updateNewVersion() { if (!isNewVersion()) return @@ -478,18 +1043,6 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { // do not check for debug builds if (BuildConfig.DEBUG) return - // alpha testers get updates via direct distribution, take to the url - if (Utilities.isAlphaBuild()) { - if (isInteractive == AppUpdater.UserPresent.INTERACTIVE) { - Logger.i(LOG_TAG_APP_UPDATE, "update check skipped for alpha build") - openUrl(this, ALPHA_UPDATE_CHECK_URL) - return - } else { - Logger.i(LOG_TAG_APP_UPDATE, "non interactive update check skipped for alpha build") - return - } - } - // Check updates only for play store / website version. Not fDroid. if (!isPlayStoreFlavour() && !isWebsiteFlavour()) { Logger.i(LOG_TAG_APP_UPDATE, "update check not for ${BuildConfig.FLAVOR}") @@ -611,21 +1164,16 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { } private fun showUpdateCompleteSnackbar() { - try { - val container: View = findViewById(R.id.container) - val snack = - Snackbar.make( - container, - getString(R.string.update_complete_snack_message), - Snackbar.LENGTH_INDEFINITE + lifecycleScope.launch { + val result = + snackbarHostState?.showSnackbar( + message = getString(R.string.update_complete_snack_message), + actionLabel = getString(R.string.update_complete_action_snack), + duration = SnackbarDuration.Indefinite ) - snack.setAction(getString(R.string.update_complete_action_snack)) { + if (result == SnackbarResult.ActionPerformed) { appUpdateManager.completeUpdate() } - snack.setActionTextColor(ContextCompat.getColor(this, R.color.primaryLightColorText)) - snack.show() - } catch (e: Exception) { - Logger.e(LOG_TAG_UI, "err showing update complete snackbar: ${e.message}", e) } } @@ -635,78 +1183,7 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { message: String ) { if (!isInForeground()) return - - val builder = MaterialAlertDialogBuilder(this, R.style.App_Dialog_NoDim) - builder.setTitle(title) - - // Determine dialog type based on title to decide if it should be modal - val isUpdateAvailable = title == getString(R.string.download_update_dialog_title) - val isUpToDate = message == getString(R.string.download_update_dialog_message_ok) - val isError = message == getString(R.string.download_update_dialog_failure_message) - val isQuotaExceeded = message == getString(R.string.download_update_dialog_trylater_message) - - // Adjust message for Play Store if needed - if (isUpdateAvailable && source == AppUpdater.InstallSource.STORE) { - // Play Store updates should use native UI, but if we reach here, show appropriate message - builder.setMessage("A new version is available. Please update from Play Store.") - } else { - builder.setMessage(message) - } - - // Make dialog non-dismissible (modal) only when an actual update is available - // User cannot dismiss by tapping outside or pressing back button - // However, user can still choose "Remind me later" button - builder.setCancelable(!isUpdateAvailable) - - when { - isUpdateAvailable -> { - // Update is available - modal dialog with explicit user choice - if (source == AppUpdater.InstallSource.STORE) { - // For Play Store updates, this dialog rarely appears as Google's native UI handles it - // But if it does appear, just show OK to dismiss (native UI should have been shown) - builder.setPositiveButton(getString(R.string.hs_download_positive_default)) { dialogInterface, _ -> - appUpdateManager.completeUpdate() - dialogInterface.dismiss() - } - builder.setNegativeButton(getString(R.string.hs_download_negative_default)) { dialogInterface, _ -> - persistentState.lastAppUpdateCheck = System.currentTimeMillis() - dialogInterface.dismiss() - } - } else { - // For website version, open browser to download - this is the main use case - builder.setPositiveButton(getString(R.string.hs_download_positive_website)) { dialogInterface, _ -> - initiateDownload() - dialogInterface.dismiss() - } - // Negative button allows user to postpone the update - builder.setNegativeButton(getString(R.string.hs_download_negative_default)) { dialogInterface, _ -> - persistentState.lastAppUpdateCheck = System.currentTimeMillis() - dialogInterface.dismiss() - } - } - } - isUpToDate || isError || isQuotaExceeded -> { - // Informational dialogs - dismissible with OK button - builder.setCancelable(true) - builder.setPositiveButton(getString(R.string.hs_download_positive_default)) { dialogInterface, _ -> - dialogInterface.dismiss() - } - } - else -> { - // Fallback for any other case - make it dismissible - builder.setCancelable(true) - builder.setPositiveButton(getString(R.string.hs_download_positive_default)) { dialogInterface, _ -> - dialogInterface.dismiss() - } - } - } - - try { - val dialog = builder.create() - dialog.show() - } catch (e: Exception) { - Logger.e(LOG_TAG_UI, "err showing download dialog: ${e.message}", e) - } + homeDialogState = HomeDialog.Download(source, title, message) } private fun initiateDownload() { @@ -736,145 +1213,1378 @@ class HomeScreenActivity : BaseActivity(R.layout.activity_home_screen) { Logger.v(LOG_TAG_UI, "home screen activity is stopped, app going to background") } - private fun handleOnBackPressed() { - onBackPressedDispatcher.addCallback( - this, - object : OnBackPressedCallback(true) { - override fun handleOnBackPressed() { - val navHostFragment = - supportFragmentManager.findFragmentById(R.id.fragment_container) as? NavHostFragment - val navController = navHostFragment?.navController - val currentId = navController?.currentDestination?.id - val homeId = R.id.homeScreenFragment - - when { - currentId == homeId -> { - finish() - } - currentId == R.id.rethinkPlusDashboardFragment -> { - val btmNavView = findViewById(R.id.nav_view) - btmNavView.selectedItemId = homeId - navController?.navigate( - homeId, - null, - NavOptions.Builder().setPopUpTo(homeId, true).build() - ) - } - else -> { - // Any other non-home top-level destination (statistics, configure, - // about, rethinkPlus), navigate to home and clear the back stack. - val btmNavView = findViewById(R.id.nav_view) - btmNavView.selectedItemId = homeId - navController?.navigate( - homeId, - null, - NavOptions.Builder().setPopUpTo(homeId, true).build() - ) - } - } + + private sealed interface HomeDialog { + data class Restore(val uri: Uri) : HomeDialog + data class Download( + val source: AppUpdater.InstallSource, + val title: String, + val message: String + ) : HomeDialog + + data class AlwaysOnStop(val message: String) : HomeDialog + data object AlwaysOnDisable : HomeDialog + data object PrivateDns : HomeDialog + data class FirstTimeVpn(val intent: Intent) : HomeDialog + data class Stats(val displayText: String, val dump: String) : HomeDialog + data class Sponsor(val usageMessage: String, val amount: String) : HomeDialog + data object Contributors : HomeDialog + data object NoLog : HomeDialog + data object AccessibilityCrash : HomeDialog + data class NewFeatures(val title: String) : HomeDialog + } + + private fun openDetailedStatsUi(type: SummaryStatisticsType) { + val timeCategory = summaryViewModel.uiState.value.timeCategory.value + val category = + SummaryStatisticsViewModel.TimeCategory.fromValue(timeCategory) + ?: SummaryStatisticsViewModel.TimeCategory.ONE_HOUR + homeNavRequest = HomeNavRequest.DetailedStats(type, category) + } + + private fun promptForAppSponsorship() { + val installTime = packageManager.getPackageInfo(packageName, 0).firstInstallTime + val timeDiff = System.currentTimeMillis() - installTime + val days = (timeDiff / (1000L * 60L * 60L * 24L)).toDouble() + val month = days / 30.0 + val amount = month * (0.60 + 0.20) + + val msg = getString( + R.string.sponser_dialog_usage_msg, + days.toInt().toString(), + "%.2f".format(amount) + ) + val formattedAmount = + getString( + R.string.two_argument_no_space, + getString(R.string.symbol_dollar), + "%.2f".format(amount) + ) + homeDialogState = HomeDialog.Sponsor(msg, formattedAmount) + } + + private fun handleMainScreenBtnClickEvent() { + Utilities.delay(TimeUnit.MILLISECONDS.toMillis(500L), lifecycleScope) { } + handleVpnActivation() + } + + private fun handleVpnActivation() { + if (handleAlwaysOnVpn()) return + + if (VpnController.hasTunnel()) { + stopVpnService() + } else { + prepareAndStartVpn() + } + } + + private fun handleAlwaysOnVpn(): Boolean { + if (Utilities.isOtherVpnHasAlwaysOn(this)) { + showAlwaysOnDisableDialog() + return true + } + + if (VpnController.isAlwaysOn(this) && VpnController.hasTunnel()) { + showAlwaysOnStopDialog() + return true + } + + return false + } + + private fun showAlwaysOnStopDialog() { + val message = + if (VpnController.isVpnLockdown()) { + UIUtils.htmlToSpannedText(getString(R.string.always_on_dialog_lockdown_stop_message)) + .toString() + } else { + getString(R.string.always_on_dialog_stop_message) + } + homeDialogState = HomeDialog.AlwaysOnStop(message) + } + + private fun showAlwaysOnDisableDialog() { + homeDialogState = HomeDialog.AlwaysOnDisable + } + + private fun startDnsActivity(screenToLoad: Int) { + if (Utilities.isPrivateDnsActive(this)) { + showPrivateDnsDialog() + return + } + + if (canStartRethinkActivity()) { + io { + val endpoint = appConfig.getRemoteRethinkEndpoint() + val url = endpoint?.url ?: "" + val name = endpoint?.name ?: "" + uiCtx { + homeNavRequest = HomeNavRequest.ConfigureRethinkBasic( + ConfigureRethinkScreenType.DB_LIST, + name, + url + ) } } - ) + return + } + + homeNavRequest = HomeNavRequest.DnsDetail + } + + private fun navigateToDnsDetailIfAllowed() { + if (Utilities.isPrivateDnsActive(this)) { + showPrivateDnsDialog() + return + } + homeNavRequest = HomeNavRequest.DnsDetail + } + + private fun startCustomDnsActivity() { + homeNavRequest = HomeNavRequest.DnsList + } + + private fun startRethinkPlusDnsActivity() { + homeNavRequest = HomeNavRequest.ConfigureRethinkBasic(ConfigureRethinkScreenType.DB_LIST) + } + + private fun startLocalBlocklistConfigureActivity() { + homeNavRequest = HomeNavRequest.ConfigureRethinkBasic(ConfigureRethinkScreenType.LOCAL) + } + + private fun canStartRethinkActivity(): Boolean { + val dns = appConfig.getDnsType() + return dns.isRethinkRemote() && !WireguardManager.oneWireGuardEnabled() + } + + private fun showPrivateDnsDialog() { + homeDialogState = HomeDialog.PrivateDns + } + + private fun startFirewallActivity(screenToLoad: Int) { + homeNavRequest = HomeNavRequest.FirewallSettings + } + + private fun openUniversalFirewallScreen() { + homeNavRequest = HomeNavRequest.UniversalFirewallSettings + } + + private fun openCustomIpScreen() { + homeNavRequest = + HomeNavRequest.CustomRules( + uid = UID_EVERYBODY, + tab = CustomRulesTab.IP, + mode = CustomRulesMode.APP_SPECIFIC + ) + } + + private fun openAppWiseIpScreen() { + homeNavRequest = + HomeNavRequest.CustomRules( + uid = UID_EVERYBODY, + tab = CustomRulesTab.IP, + mode = CustomRulesMode.ALL_RULES + ) + } + + private fun startAppsActivity() { + homeNavRequest = HomeNavRequest.AppList + } + + private fun prepareAndStartVpn() { + if (prepareVpnService()) { + startVpnService() + } + } + + private fun stopVpnService() { + VpnController.stop("home", this) } + private fun startVpnService() { + getNotificationPermissionIfNeeded() + VpnController.start(this, true) + } + + private fun getNotificationPermissionIfNeeded() { + if (!Utilities.isAtleastT()) { + return + } - private fun setupNavigationItemSelectedListener() { - val btmNavView = findViewById(R.id.nav_view) ?: run { - Logger.w(LOG_TAG_UI, "setupNavigationItemSelectedListener: BottomNavigationView not found") + if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == + PackageManager.PERMISSION_GRANTED + ) { return } - val navHostFragment = - supportFragmentManager.findFragmentById(R.id.fragment_container) as? NavHostFragment - val navController = navHostFragment?.navController ?: run { - Logger.w(LOG_TAG_UI, "setupNavigationItemSelectedListener: NavController not found") + if (!persistentState.shouldRequestNotificationPermission) { + Logger.w(LOG_TAG_VPN, "User rejected notification permission for the app") return } - val homeId = R.id.homeScreenFragment + notificationPermissionResult.launch(Manifest.permission.POST_NOTIFICATIONS) + } - // Keep the rethinkPlus bottom-nav item highlighted whenever the user is on the - // dashboard (a child destination of rethinkPlus that is not itself a menu item). - navController.addOnDestinationChangedListener { _, destination, _ -> - when (destination.id) { - R.id.rethinkPlusDashboardFragment -> { - // Dashboard is a child of the rethinkPlus flow keep rethinkPlus checked. - btmNavView.menu.findItem(R.id.rethinkPlus)?.isChecked = true - } - R.id.rethinkPlus, - R.id.homeScreenFragment, - R.id.summaryStatisticsFragment, - R.id.configureFragment, - R.id.aboutFragment -> { - // These are direct menu items: BottomNavigationView updates isChecked - // automatically when selectedItemId is set; nothing extra needed here. - } - else -> { /* other destinations: no bottom-nav highlight change */ } + @Throws(ActivityNotFoundException::class) + private fun prepareVpnService(): Boolean { + val prepareVpnIntent: Intent? = + try { + Logger.i(LOG_TAG_VPN, "Preparing VPN service") + VpnService.prepare(this) + } catch (e: NullPointerException) { + Logger.e(LOG_TAG_VPN, "Device does not support system-wide VPN mode.", e) + return false } + if (prepareVpnIntent != null) { + Logger.i(LOG_TAG_VPN, "VPN service is prepared") + showFirstTimeVpnDialog(prepareVpnIntent) + return false } + Logger.i(LOG_TAG_VPN, "VPN service is prepared, starting VPN service") + return true + } - btmNavView.setOnItemSelectedListener { item -> - val currentId = navController.currentDestination?.id + private fun showFirstTimeVpnDialog(prepareVpnIntent: Intent) { + homeDialogState = HomeDialog.FirstTimeVpn(prepareVpnIntent) + } - // Prevent re-navigating if we are already on this destination (or its child). - // For rethinkPlus this also covers rethinkPlusDashboardFragment. - val alreadyThere = when (item.itemId) { - R.id.rethinkPlus -> - currentId == R.id.rethinkPlus || currentId == R.id.rethinkPlusDashboardFragment - else -> currentId == item.itemId - } - if (alreadyThere) return@setOnItemSelectedListener false + private fun registerForActivityResult() { + startForResult = + registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + when (result.resultCode) { + Activity.RESULT_OK -> { + startVpnService() + } - when (item.itemId) { - R.id.rethinkPlus -> { - // RPN is not available in alpha builds; show a "coming soon" - // toast and stay on the current destination. - if (Utilities.isAlphaBuild()) { + Activity.RESULT_CANCELED -> { showToastUiCentered( this, - getString(R.string.coming_soon_toast), - Toast.LENGTH_SHORT + getString(R.string.hsf_vpn_prepare_failure), + Toast.LENGTH_LONG ) - return@setOnItemSelectedListener false } - // Navigate to rethinkPlus (start destination of the nested nav graph). - // popUpTo homeId with inclusive=false keeps home in the back stack so - // that back from rethinkPlus returns to home, not to a prior tab. - navController.navigate( - R.id.rethinkPlus, - null, - NavOptions.Builder() - .setPopUpTo(homeId, false) - .build() - ) - true - } - homeId -> { - navController.navigate( - homeId, - null, - NavOptions.Builder().setPopUpTo(homeId, true).build() - ) - true + else -> { + stopVpnService() + } } + } - else -> { - navController.navigate( - item.itemId, - null, - NavOptions.Builder().setPopUpTo(homeId, false).build() - ) - true + notificationPermissionResult = + registerForActivityResult(ActivityResultContracts.RequestPermission()) { + persistentState.shouldRequestNotificationPermission = it + if (it) { + Logger.i(LOG_TAG_UI, "User accepted notification permission") + } else { + Logger.w(LOG_TAG_UI, "User rejected notification permission") + lifecycleScope.launch { + snackbarHostState?.showSnackbar( + message = getString(R.string.hsf_notification_permission_failure), + duration = SnackbarDuration.Long + ) + } } } + } + + private fun copyTokenToClipboard() { + val text = persistentState.firebaseUserToken + val clipboard = ContextCompat.getSystemService(this, ClipboardManager::class.java) + val clip = ClipData.newPlainText("token", text) + clipboard?.setPrimaryClip(clip) + Toast.makeText(this, "Copied to clipboard", Toast.LENGTH_SHORT).show() + } + + private fun initiateFlightRecord() { + io { VpnController.performFlightRecording() } + Toast.makeText(this, "Flight recording started", Toast.LENGTH_SHORT).show() + } + + private fun openEventLogs() { + homeNavRequest = HomeNavRequest.Events + } + + private fun getVersionName(): String { + return Utilities.getPackageMetadata(packageManager, packageName)?.versionName ?: "" + } + + private fun openStatsDialog() { + io { + val stat = VpnController.getNetStat() + val formatedStat = UIUtils.formatNetStat(stat) + val vpnStats = VpnController.vpnStats() + val stats = formatedStat + vpnStats + uiCtx { + val displayText = if (formatedStat == null) "No Stats" else stats + homeDialogState = HomeDialog.Stats(displayText, stats) + } } + } - // Tapping an already-selected tab is a no-op (don't re-navigate or recreate). - btmNavView.setOnItemReselectedListener { /* intentional no-op */ } + private fun copyToClipboard(label: String, text: String): ClipboardManager? { + val clipboard = ContextCompat.getSystemService(this, ClipboardManager::class.java) + clipboard?.setPrimaryClip(ClipData.newPlainText(label, text)) + return clipboard } - private fun io(f: suspend () -> Unit) { - lifecycleScope.launch(Dispatchers.IO) { f() } + private fun openDatabaseDumpDialog() { + homeNavRequest = HomeNavRequest.Database + } + + private fun hasAnyLogsAvailable(): Boolean { + val dir = filesDir + val bugReportDir = java.io.File(dir, BugReportZipper.BUG_REPORT_DIR_NAME) + if (bugReportDir.exists() && bugReportDir.isDirectory) { + val bugReportFiles = bugReportDir.listFiles() + if (bugReportFiles != null && bugReportFiles.any { it.isFile && it.length() > 0 }) { + return true + } + } + + return false + } + + private fun showNoLogDialog() { + homeDialogState = HomeDialog.NoLog + } + + private fun openNotificationSettings() { + val packageName = packageName + try { + val intent = Intent() + if (Utilities.isAtleastO()) { + intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS + intent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName) + } else { + intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS + intent.addCategory(Intent.CATEGORY_DEFAULT) + intent.data = android.net.Uri.fromParts("package", packageName, null) + } + startActivity(intent) + } catch (e: ActivityNotFoundException) { + showToastUiCentered( + this, + getString(R.string.notification_screen_error), + Toast.LENGTH_SHORT + ) + Logger.w(LOG_TAG_UI, "activity not found ${e.message}", e) + } + } + + private fun showNewFeaturesDialog() { + val v = getVersionName().slice(0..6) + val title = getString(R.string.about_whats_new, v) + homeDialogState = HomeDialog.NewFeatures(title) + } + + private fun showContributors() { + homeDialogState = HomeDialog.Contributors + } + + private fun promptCrashLogAction() { + if (Utilities.isAtleastO()) { + io { + try { + EnhancedBugReport.addLogsToZipFile(this@HomeScreenActivity) + } catch (e: Exception) { + Logger.w(LOG_TAG_UI, "err adding tombstone to zip: ${e.message}", e) + } + } + } + + val dir = filesDir + val zipPath = BugReportZipper.getZipFileName(dir) + val zipFile = java.io.File(zipPath) + + if (!zipFile.exists() || zipFile.length() <= 0) { + showToastUiCentered( + this, + getString(R.string.log_file_not_available), + Toast.LENGTH_SHORT + ) + return + } + + showBugReportSheet = true + } + + @OptIn(ExperimentalMaterial3Api::class) + @Composable + private fun BugReportFilesSheet(onDismiss: () -> Unit) { + val scope = rememberCoroutineScope() + val bugReportFiles = remember { mutableStateListOf() } + var isSending by remember { mutableStateOf(false) } + var progressText by remember { mutableStateOf("") } + var pendingDelete by remember { mutableStateOf(null) } + + LaunchedEffect(Unit) { + try { + val files = withContext(Dispatchers.IO) { collectAllBugReportFiles() } + bugReportFiles.clear() + bugReportFiles.addAll(files) + } catch (e: Exception) { + Logger.e(LOG_TAG_UI, "err loading bug report: ${e.message}", e) + showToastUiCentered( + this@HomeScreenActivity, + getString(R.string.bug_report_file_not_found), + Toast.LENGTH_SHORT + ) + onDismiss() + } + } + + val totalSize = bugReportFiles.filter { it.isSelected }.sumOf { it.file.length() } + val hasSelection = bugReportFiles.any { it.isSelected } + val allSelected = bugReportFiles.isNotEmpty() && bugReportFiles.all { it.isSelected } + + RethinkModalBottomSheet( + onDismissRequest = onDismiss, + contentPadding = PaddingValues(Dimensions.spacingNone), + verticalSpacing = Dimensions.spacingNone, + includeBottomSpacer = false + ) { + Column(modifier = Modifier.padding(Dimensions.spacingLg)) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(bottom = Dimensions.spacingMd), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Checkbox( + checked = allSelected, + onCheckedChange = { checked -> + bugReportFiles.forEach { it.isSelected = checked } + } + ) + Text( + text = + if (allSelected) { + getString(R.string.bug_report_deselect_all) + } else { + getString(R.string.lbl_select_all) + .replaceFirstChar(Char::titlecase) + }, + modifier = Modifier.clickable { + bugReportFiles.forEach { it.isSelected = !allSelected } + } + ) + } + Text( + text = formatFileSize(totalSize), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + + if (bugReportFiles.isEmpty()) { + Text(text = getString(R.string.bug_report_no_files_available)) + } else { + LazyColumn( + modifier = Modifier + .fillMaxWidth() + .weight(1f, fill = false) + ) { + items(bugReportFiles, key = { it.file.absolutePath }) { item -> + BugReportFileRow( + fileItem = item, + onShare = { openBugReportFile(item.file) }, + onDelete = { pendingDelete = item } + ) + } + } + } + + Spacer(modifier = Modifier.height(Dimensions.spacingMd)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + if (isSending) { + Row(verticalAlignment = Alignment.CenterVertically) { + CircularProgressIndicator(modifier = Modifier.size(Dimensions.iconSizeSm)) + Spacer(modifier = Modifier.width(Dimensions.spacingSm)) + Text(text = progressText) + } + } + Spacer(modifier = Modifier.weight(1f)) + TextButton( + onClick = { + if (!isSending) { + scope.launch { + sendBugReport( + bugReportFiles = bugReportFiles, + onSending = { sending, text -> + isSending = sending + progressText = text + }, + onDone = { + showBugReportSheet = false + } + ) + } + } + }, + enabled = hasSelection && !isSending + ) { + Text(text = getString(R.string.about_bug_report_dialog_positive_btn)) + } + } + } + } + + pendingDelete?.let { fileItem -> + RethinkConfirmDialog( + onDismissRequest = { pendingDelete = null }, + title = getString(R.string.lbl_delete), + message = getString(R.string.bug_report_delete_confirmation, fileItem.name), + confirmText = getString(R.string.lbl_delete), + dismissText = getString(R.string.lbl_cancel), + isConfirmDestructive = true, + onConfirm = { + pendingDelete = null + scope.launch { + deleteBugReportFile( + fileItem = fileItem, + bugReportFiles = bugReportFiles, + onDismiss = onDismiss + ) + } + }, + onDismiss = { pendingDelete = null } + ) + } + } + + @Composable + private fun BugReportFileRow( + fileItem: BugReportFile, + onShare: () -> Unit, + onDelete: () -> Unit + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = Dimensions.spacingSm) + .background( + MaterialTheme.colorScheme.surfaceVariant, + RoundedCornerShape(Dimensions.cornerRadiusMd) + ) + .padding(Dimensions.spacingMd), + verticalAlignment = Alignment.CenterVertically + ) { + Checkbox( + checked = fileItem.isSelected, + onCheckedChange = { checked -> fileItem.isSelected = checked } + ) + Column(modifier = Modifier.weight(1f)) { + Text( + text = fileItem.name, + style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.Medium) + ) + Text( + text = + "${formatFileSize(fileItem.file.length())} - ${formatDate(fileItem.file.lastModified())}", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + IconButton(onClick = onShare) { + Icon( + painter = painterResource(id = R.drawable.ic_share), + contentDescription = null + ) + } + IconButton(onClick = onDelete) { + Icon( + painter = painterResource(id = R.drawable.ic_delete), + contentDescription = null, + tint = MaterialTheme.colorScheme.error + ) + } + } + } + + private fun collectAllBugReportFiles(): List { + val files = mutableListOf() + val dir = filesDir + + val bugReportZip = File(BugReportZipper.getZipFileName(dir)) + if (bugReportZip.exists() && bugReportZip.length() > 0) { + files.add( + BugReportFile( + file = bugReportZip, + name = bugReportZip.name, + type = FileType.ZIP, + isSelected = true + ) + ) + } + + if (Utilities.isAtleastO()) { + val tombstoneZip = EnhancedBugReport.getTombstoneZipFile(this) + if (tombstoneZip != null && tombstoneZip.exists() && tombstoneZip.length() > 0) { + files.add( + BugReportFile( + file = tombstoneZip, + name = tombstoneZip.name, + type = FileType.ZIP, + isSelected = true + ) + ) + } + } + + val bugReportDir = File(dir, BugReportZipper.BUG_REPORT_DIR_NAME) + if (bugReportDir.exists() && bugReportDir.isDirectory) { + bugReportDir.listFiles()?.forEach { file -> + if (file.isFile && file.length() > 0) { + files.add( + BugReportFile( + file = file, + name = file.name, + type = getFileType(file), + isSelected = true + ) + ) + } + } + } + + if (Utilities.isAtleastO()) { + val tombstoneDir = File(dir, EnhancedBugReport.TOMBSTONE_DIR_NAME) + if (tombstoneDir.exists() && tombstoneDir.isDirectory) { + tombstoneDir.listFiles()?.forEach { file -> + if (file.isFile && file.length() > 0) { + files.add( + BugReportFile( + file = file, + name = file.name, + type = FileType.TEXT, + isSelected = true + ) + ) + } + } + } + } + + return files.sortedByDescending { it.file.lastModified() } + } + + private fun getFileType(file: File): FileType { + return when (file.extension.lowercase()) { + "zip" -> FileType.ZIP + "txt", "log" -> FileType.TEXT + else -> FileType.TEXT + } + } + + private suspend fun sendBugReport( + bugReportFiles: List, + onSending: (Boolean, String) -> Unit, + onDone: () -> Unit + ) { + val selectedFiles = bugReportFiles.filter { it.isSelected }.map { it.file } + + if (selectedFiles.isEmpty()) { + showToastUiCentered( + this, + getString(R.string.bug_report_no_files_selected), + Toast.LENGTH_SHORT + ) + return + } + + onSending(true, getString(R.string.bug_report_creating_zip)) + + try { + val attachmentUri = withContext(Dispatchers.IO) { + if (selectedFiles.size == 1) { + getFileUri(selectedFiles[0]) + } else { + createCombinedZip(selectedFiles) + } + } + + if (attachmentUri != null) { + val emailIntent = Intent(Intent.ACTION_SEND).apply { + type = "text/plain" + putExtra(Intent.EXTRA_EMAIL, arrayOf(getString(R.string.about_mail_to))) + putExtra( + Intent.EXTRA_SUBJECT, + getString(R.string.about_mail_bugreport_subject) + ) + putExtra(Intent.EXTRA_STREAM, attachmentUri) + flags = Intent.FLAG_GRANT_READ_URI_PERMISSION + } + startActivity( + Intent.createChooser( + emailIntent, + getString(R.string.about_mail_bugreport_share_title) + ) + ) + onDone() + } else { + showToastUiCentered( + this, + getString(R.string.error_loading_log_file), + Toast.LENGTH_SHORT + ) + } + } catch (e: Exception) { + Logger.e(LOG_TAG_UI, "err sending bug report: ${e.message}", e) + showToastUiCentered( + this, + getString(R.string.error_loading_log_file), + Toast.LENGTH_SHORT + ) + } finally { + onSending(false, "") + } + } + + private fun createCombinedZip(files: List): Uri? { + val tempDir = cacheDir + val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date()) + val zipFile = File(tempDir, "rethinkdns_bugreport_$timestamp.zip") + + try { + val addedEntries = mutableSetOf() + + ZipOutputStream(FileOutputStream(zipFile)).use { zos -> + files.forEach { file -> + if (file.extension == "zip") { + ZipFile(file).use { zf -> + val entries = zf.entries() + while (entries.hasMoreElements()) { + val entry = entries.nextElement() + if (!entry.isDirectory && !addedEntries.contains(entry.name)) { + addedEntries.add(entry.name) + + val newEntry = ZipEntry(entry.name) + zos.putNextEntry(newEntry) + zf.getInputStream(entry).use { input -> + input.copyTo(zos) + } + zos.closeEntry() + } + } + } + } else { + if (!addedEntries.contains(file.name)) { + addedEntries.add(file.name) + + val entry = ZipEntry(file.name) + zos.putNextEntry(entry) + FileInputStream(file).use { input -> + input.copyTo(zos) + } + zos.closeEntry() + } + } + } + } + + return getFileUri(zipFile) + } catch (e: Exception) { + Logger.e(LOG_TAG_UI, "err creating combined zip: ${e.message}", e) + zipFile.delete() + return null + } + } + + private fun getFileUri(file: File): Uri? { + return try { + FileProvider.getUriForFile( + this, + BugReportZipper.FILE_PROVIDER_NAME, + file + ) + } catch (e: Exception) { + Logger.e(LOG_TAG_UI, "err getting file uri: ${e.message}", e) + null + } + } + + private fun formatFileSize(size: Long): String { + return when { + size < BYTES_IN_KB -> "$size B" + size < BYTES_IN_MB -> "${size / BYTES_IN_KB} KB" + else -> String.format(Locale.US, "%.1f MB", size / MB_DIVISOR) + } + } + + private fun formatDate(timestamp: Long): String { + return SimpleDateFormat("MMM d, yyyy HH:mm", Locale.US).format(Date(timestamp)) + } + + private suspend fun deleteBugReportFile( + fileItem: BugReportFile, + bugReportFiles: MutableList, + onDismiss: () -> Unit + ) { + try { + val deleted = withContext(Dispatchers.IO) { fileItem.file.delete() } + + if (deleted) { + bugReportFiles.remove(fileItem) + + showToastUiCentered( + this, + getString(R.string.bug_report_file_deleted, fileItem.name), + Toast.LENGTH_SHORT + ) + + if (bugReportFiles.isEmpty()) { + showToastUiCentered( + this, + getString(R.string.bug_report_no_files_available), + Toast.LENGTH_SHORT + ) + onDismiss() + } + } else { + showToastUiCentered( + this, + getString(R.string.bug_report_delete_failed, fileItem.name), + Toast.LENGTH_SHORT + ) + } + } catch (e: Exception) { + Logger.e(LOG_TAG_UI, "err deleting file: ${e.message}", e) + showToastUiCentered( + this, + getString(R.string.bug_report_delete_failed, fileItem.name), + Toast.LENGTH_SHORT + ) + } + } + + private fun openBugReportFile(file: File) { + try { + val uri = getFileUri(file) ?: return + + val mimeType = when (file.extension.lowercase()) { + "zip" -> "application/zip" + "txt", "log" -> "text/plain" + else -> "text/plain" + } + + val intent = Intent(Intent.ACTION_VIEW).apply { + setDataAndType(uri, mimeType) + addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + } + + startActivity(Intent.createChooser(intent, getString(R.string.about_bug_report))) + } catch (e: Exception) { + Logger.e(LOG_TAG_UI, "err opening file: ${e.message}", e) + showToastUiCentered( + this, + getString(R.string.bug_report_error_opening_file), + Toast.LENGTH_SHORT + ) + } + } + + private fun handleShowAppExitInfo() { + if (WorkScheduler.isWorkRunning(this, WorkScheduler.APP_EXIT_INFO_JOB_TAG)) return + + workScheduler.scheduleOneTimeWorkForAppExitInfo() + + val workManager = WorkManager.getInstance(applicationContext) + workManager.getWorkInfosByTagLiveData(WorkScheduler.APP_EXIT_INFO_ONE_TIME_JOB_TAG).observe( + this + ) { workInfoList -> + val workInfo = workInfoList?.getOrNull(0) ?: return@observe + Logger.i( + Logger.LOG_TAG_SCHEDULER, + "WorkManager state: ${workInfo.state} for ${WorkScheduler.APP_EXIT_INFO_ONE_TIME_JOB_TAG}" + ) + if (WorkInfo.State.SUCCEEDED == workInfo.state) { + onAppExitInfoSuccess() + workManager.pruneWork() + } else if ( + WorkInfo.State.CANCELLED == workInfo.state || + WorkInfo.State.FAILED == workInfo.state + ) { + onAppExitInfoFailure() + workManager.pruneWork() + workManager.cancelAllWorkByTag(WorkScheduler.APP_EXIT_INFO_ONE_TIME_JOB_TAG) + } else { + // no-op + } + } + } + + data class BugReportFile( + val file: File, + val name: String, + val type: FileType, + var isSelected: Boolean + ) + + enum class FileType { + ZIP, + TEXT + } + + companion object { + private const val BYTES_IN_KB = 1024L + private const val BYTES_IN_MB = 1024L * 1024L + private const val MB_DIVISOR = 1024.0 * 1024.0 + const val EXTRA_NAV_TARGET = "extra_nav_target" + const val NAV_TARGET_DOMAIN_CONNECTIONS = "nav_target_domain_connections" + const val NAV_TARGET_APP_INFO = "nav_target_app_info" + const val NAV_TARGET_NETWORK_LOGS = "nav_target_network_logs" + const val NAV_TARGET_WG_MAIN = "nav_target_wg_main" + const val EXTRA_DC_TYPE = "extra_dc_type" + const val EXTRA_DC_FLAG = "extra_dc_flag" + const val EXTRA_DC_DOMAIN = "extra_dc_domain" + const val EXTRA_DC_ASN = "extra_dc_asn" + const val EXTRA_DC_IP = "extra_dc_ip" + const val EXTRA_DC_IS_BLOCKED = "extra_dc_is_blocked" + const val EXTRA_DC_TIME_CATEGORY = "extra_dc_time_category" + const val EXTRA_APP_INFO_UID = "extra_app_info_uid" + } + + @Composable + private fun WhatsNewDialogContent() { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(Dimensions.spacingLg) + .verticalScroll(rememberScrollState()) + ) { + HtmlText( + text = getString(R.string.whats_new_version_update), + textAlign = TextAlign.Start + ) + } + } + + @Composable + private fun HomeDialogHost() { + when (val dialog = homeDialogState) { + is HomeDialog.Restore -> { + HomeConfirmDialog( + onDismissRequest = { homeDialogState = null }, + title = getString(R.string.brbs_restore_dialog_title), + message = getString(R.string.brbs_restore_dialog_message), + confirmText = getString(R.string.brbs_restore_dialog_positive), + onConfirm = { + homeDialogState = null + startRestore(dialog.uri) + observeRestoreWorker() + }, + dismissText = getString(R.string.lbl_cancel), + onDismiss = { homeDialogState = null } + ) + } + + is HomeDialog.Download -> { + val isUpdateAvailable = + dialog.title == getString(R.string.download_update_dialog_title) + val resolvedMessage = + if (isUpdateAvailable && dialog.source == AppUpdater.InstallSource.STORE) { + "A new version is available. Please update from Play Store." + } else { + dialog.message + } + val primaryLabel = + if (isUpdateAvailable && dialog.source != AppUpdater.InstallSource.STORE) { + getString(R.string.hs_download_positive_website) + } else { + getString(R.string.hs_download_positive_default) + } + + HomeConfirmDialog( + onDismissRequest = { + if (!isUpdateAvailable) { + homeDialogState = null + } + }, + title = dialog.title, + message = resolvedMessage, + confirmText = primaryLabel, + dismissText = + if (isUpdateAvailable) { + getString(R.string.hs_download_negative_default) + } else { + null + }, + onConfirm = { + if (isUpdateAvailable) { + if (dialog.source == AppUpdater.InstallSource.STORE) { + appUpdateManager.completeUpdate() + } else { + initiateDownload() + } + } + homeDialogState = null + }, + onDismiss = { + if (isUpdateAvailable) { + persistentState.lastAppUpdateCheck = System.currentTimeMillis() + homeDialogState = null + } + } + ) + + } + + is HomeDialog.AlwaysOnStop -> { + HomeAlwaysOnStopDialog( + title = getString(R.string.always_on_dialog_stop_heading), + message = dialog.message, + stopText = getString(R.string.always_on_dialog_positive), + openSettingsText = getString(R.string.always_on_dialog_neutral), + cancelText = getString(R.string.lbl_cancel), + onStop = { + homeDialogState = null + stopVpnService() + }, + onOpenSettings = { + homeDialogState = null + openVpnProfile(this@HomeScreenActivity) + }, + onCancel = { + homeDialogState = null + } + ) + } + + HomeDialog.AlwaysOnDisable -> { + HomeConfirmDialog( + onDismissRequest = {}, + title = getString(R.string.always_on_dialog_heading), + message = getString(R.string.always_on_dialog), + confirmText = getString(R.string.always_on_dialog_positive_btn), + dismissText = getString(R.string.lbl_cancel), + onConfirm = { + homeDialogState = null + openVpnProfile(this@HomeScreenActivity) + }, + onDismiss = { homeDialogState = null } + ) + } + + HomeDialog.PrivateDns -> { + HomeConfirmDialog( + onDismissRequest = {}, + title = getString(R.string.private_dns_dialog_heading), + message = getString(R.string.private_dns_dialog_desc), + confirmText = getString(R.string.private_dns_dialog_positive), + dismissText = getString(R.string.lbl_dismiss), + onConfirm = { + homeDialogState = null + openNetworkSettings( + this@HomeScreenActivity, + Settings.ACTION_WIRELESS_SETTINGS + ) + }, + onDismiss = { homeDialogState = null } + ) + } + + is HomeDialog.FirstTimeVpn -> { + HomeConfirmDialog( + onDismissRequest = {}, + title = getString(R.string.hsf_vpn_dialog_header), + message = getString(R.string.hsf_vpn_dialog_message), + confirmText = getString(R.string.lbl_proceed), + dismissText = getString(R.string.lbl_cancel), + onConfirm = { + homeDialogState = null + try { + startForResult.launch(dialog.intent) + } catch (e: ActivityNotFoundException) { + Logger.e(LOG_TAG_VPN, "Activity not found to start VPN service", e) + showToastUiCentered( + this@HomeScreenActivity, + getString(R.string.hsf_vpn_prepare_failure), + Toast.LENGTH_LONG + ) + } + }, + onDismiss = { homeDialogState = null } + ) + } + + is HomeDialog.Stats -> { + HomeStatsDialog( + onDismissRequest = { homeDialogState = null }, + title = getString(R.string.title_statistics), + displayText = dialog.displayText, + dismissText = getString(R.string.fapps_info_dialog_positive_btn), + copyText = getString(R.string.dns_info_neutral), + onDismiss = { homeDialogState = null }, + onCopy = { + copyToClipboard("stats_dump", dialog.dump) + showToastUiCentered( + this@HomeScreenActivity, + getString(R.string.copied_clipboard), + Toast.LENGTH_SHORT + ) + } + ) + } + + is HomeDialog.Sponsor -> { + /* + * Sponsor dialog intentionally hidden for now. + * + * Dialog( + * onDismissRequest = { homeDialogState = null }, + * properties = DialogProperties(usePlatformDefaultWidth = false) + * ) { + * Surface(color = MaterialTheme.colorScheme.background) { + * Column(modifier = Modifier + * .fillMaxWidth() + * .padding(Dimensions.spacingLg)) { + * Text( + * text = getString(R.string.about_sponsor_link_text), + * style = MaterialTheme.typography.titleLarge + * ) + * Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + * SponsorInfoDialogContent( + * amount = dialog.amount, + * usageMessage = dialog.usageMessage, + * onSponsorClick = { + * openUrl( + * this@HomeScreenActivity, + * RETHINKDNS_SPONSOR_LINK + * ) + * } + * ) + * Spacer(modifier = Modifier.height(Dimensions.spacingMd)) + * Row( + * modifier = Modifier.fillMaxWidth(), + * horizontalArrangement = Arrangement.End + * ) { + * TextButton(onClick = { homeDialogState = null }) { + * Text(text = getString(R.string.lbl_cancel)) + * } + * } + * } + * } + * } + */ + LaunchedEffect(Unit) { + homeDialogState = null + } + } + + HomeDialog.Contributors -> { + Dialog( + onDismissRequest = { homeDialogState = null }, + properties = DialogProperties(usePlatformDefaultWidth = false) + ) { + Surface(color = MaterialTheme.colorScheme.background) { + ContributorsDialogContent(onDismiss = { homeDialogState = null }) + } + } + } + + HomeDialog.NoLog -> { + HomeConfirmDialog( + onDismissRequest = { homeDialogState = null }, + title = getString(R.string.about_bug_no_log_dialog_title), + message = getString(R.string.about_bug_no_log_dialog_message), + confirmText = getString(R.string.about_bug_no_log_dialog_positive_btn), + dismissText = getString(R.string.lbl_cancel), + onConfirm = { + homeDialogState = null + sendEmailIntent(this@HomeScreenActivity) + }, + onDismiss = { homeDialogState = null } + ) + } + + is HomeDialog.NewFeatures -> { + HomeNewFeaturesDialog( + onDismissRequest = { homeDialogState = null }, + title = dialog.title, + dismissText = getString(R.string.about_dialog_positive_button), + contactText = getString(R.string.about_dialog_neutral_button), + onDismiss = { homeDialogState = null }, + onContact = { + homeDialogState = null + sendEmailIntent(this@HomeScreenActivity) + }, + content = { WhatsNewDialogContent() } + ) + } + + HomeDialog.AccessibilityCrash -> { + HomeConfirmDialog( + onDismissRequest = { homeDialogState = null }, + title = getString(R.string.lbl_action_required), + message = getString(R.string.alert_firewall_accessibility_regrant_explanation), + confirmText = getString(R.string.univ_accessibility_crash_dialog_positive), + dismissText = getString(R.string.lbl_cancel), + onConfirm = { + UIUtils.openAndroidAppInfo(this@HomeScreenActivity, packageName) + homeDialogState = null + }, + onDismiss = { homeDialogState = null } + ) + } + + null -> Unit + } + } + + @Composable + private fun ContributorsDialogContent(onDismiss: () -> Unit) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(Dimensions.spacingXl) + .verticalScroll(rememberScrollState()), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Box(modifier = Modifier.fillMaxWidth()) { + IconButton(onClick = onDismiss, modifier = Modifier.align(Alignment.TopEnd)) { + Image( + painter = painterResource(id = android.R.drawable.ic_menu_close_clear_cancel), + contentDescription = getString(R.string.lbl_dismiss) + ) + } + Row( + modifier = Modifier.align(Alignment.Center), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center + ) { + Image( + painter = painterResource(id = R.drawable.ic_authors), + contentDescription = null, + modifier = Modifier.size(Dimensions.iconSizeMd) + ) + Spacer(modifier = Modifier.width(Dimensions.spacingSm)) + Text( + text = getString(R.string.contributors_dialog_title), + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onSurface + ) + } + } + + Spacer(modifier = Modifier.height(Dimensions.spacingMd)) + + HtmlText( + text = getString(R.string.contributors_list), + textAlign = TextAlign.Center + ) + } + } + + @Suppress("unused") + @Composable + private fun SponsorInfoDialogContent( + amount: String, + usageMessage: String, + onSponsorClick: () -> Unit + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Text(text = amount, style = MaterialTheme.typography.titleLarge) + Text(text = usageMessage, style = MaterialTheme.typography.bodyMedium) + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) { + TextButton(onClick = onSponsorClick) { + Text(text = getString(R.string.about_sponsor_link_text)) + } + } + } + } + + @Composable + private fun HtmlText(text: String, textAlign: TextAlign) { + val textValue = remember(text) { UIUtils.htmlToSpannedText(text).toString() } + Text( + text = textValue, + modifier = Modifier.fillMaxWidth(), + style = + MaterialTheme.typography.bodyLarge.copy( + color = MaterialTheme.colorScheme.onSurface, + textAlign = textAlign + ) + ) + } + + private fun onAppExitInfoFailure() { + showToastUiCentered( + this, + getString(R.string.log_file_not_available), + Toast.LENGTH_SHORT + ) + hideBugReportProgressUi() + } + + private fun onAppExitInfoSuccess() { + promptCrashLogAction() + } + + private fun hideBugReportProgressUi() { + aboutViewModel.setBugReportRunning(false) + } + + private fun io(f: suspend () -> Unit) { + lifecycleScope.launch(Dispatchers.IO) { f() } + } + + private suspend fun uiCtx(f: suspend () -> Unit) { + withContext(Dispatchers.Main) { f() } + } + + private fun launchFileImport() { + try { + tunnelFileImportResultLauncher.launch("*/*") + } catch (e: ActivityNotFoundException) { + showToastUiCentered( + this, + getString(R.string.blocklist_update_check_failure), + Toast.LENGTH_SHORT + ) + } catch (e: Exception) { + showToastUiCentered( + this, + getString(R.string.blocklist_update_check_failure), + Toast.LENGTH_SHORT + ) + } + } + + private fun launchQrScanner() { + try { + qrImportResultLauncher.launch( + ScanOptions() + .setOrientationLocked(false) + .setBeepEnabled(false) + .setPrompt(resources.getString(R.string.lbl_qr_code)) + ) + } catch (e: ActivityNotFoundException) { + showToastUiCentered( + this, + getString(R.string.blocklist_update_check_failure), + Toast.LENGTH_SHORT + ) + } catch (e: Exception) { + showToastUiCentered( + this, + getString(R.string.blocklist_update_check_failure), + Toast.LENGTH_SHORT + ) + } } } diff --git a/app/src/full/java/com/celzero/bravedns/ui/activity/BubbleActivity.kt b/app/src/full/java/com/celzero/bravedns/ui/activity/BubbleActivity.kt index d0eef2ac9..4ef986b9d 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/activity/BubbleActivity.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/activity/BubbleActivity.kt @@ -15,401 +15,155 @@ */ package com.celzero.bravedns.ui.activity -import Logger import android.content.Intent import android.os.Bundle -import android.view.View import androidx.activity.addCallback +import androidx.activity.compose.setContent +import androidx.appcompat.app.AppCompatActivity +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.lifecycle.lifecycleScope import androidx.paging.Pager import androidx.paging.PagingConfig +import androidx.paging.PagingData import androidx.paging.cachedIn -import androidx.recyclerview.widget.LinearLayoutManager -import by.kirich1409.viewbindingdelegate.viewBinding -import com.celzero.bravedns.R -import com.celzero.bravedns.adapter.BubbleAllowedAppsAdapter -import com.celzero.bravedns.adapter.BubbleBlockedAppsAdapter +import androidx.paging.compose.collectAsLazyPagingItems import com.celzero.bravedns.data.AllowedAppInfo import com.celzero.bravedns.data.BlockedAppInfo import com.celzero.bravedns.database.AppInfoRepository import com.celzero.bravedns.database.ConnectionTrackerDAO import com.celzero.bravedns.database.DnsLogDAO -import com.celzero.bravedns.databinding.ActivityBubbleBinding import com.celzero.bravedns.service.FirewallManager -import com.celzero.bravedns.service.PersistentState import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.ui.BaseActivity -import com.celzero.bravedns.util.Themes.Companion.getCurrentTheme +import com.celzero.bravedns.ui.compose.bubble.BubbleScreen +import com.celzero.bravedns.ui.compose.theme.RethinkTheme import com.celzero.bravedns.viewmodel.AllowedAppsBubbleViewModel import com.celzero.bravedns.viewmodel.BlockedAppsBubbleViewModel -import kotlinx.coroutines.CancellationException +import io.github.aakira.napier.Napier import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.koin.android.ext.android.inject /** - * BubbleActivity - Content activity for Android Bubble notifications - * - * This activity is launched by Android's Bubble API (Android 10+) when a user - * interacts with a bubble notification. It displays recently blocked apps with - * quick actions to temporarily allow them. - * - * The bubble is created via NotificationCompat.BubbleMetadata in BubbleHelper. - * This activity provides the content that appears when the bubble is expanded. - * - * Based on: https://developer.android.com/develop/ui/views/notifications/bubbles - * - * Key features: - * - Shows list of recently blocked apps - * - Quick action to temporarily allow apps for 15 minutes - * - Material Design 3 UI - * - Works with Android's system bubble framework (not custom overlays) + * BubbleActivity - Content activity for Android Bubble notifications. */ -class BubbleActivity : BaseActivity(R.layout.activity_bubble) { - private val b by viewBinding(ActivityBubbleBinding::bind) - - private val persistentState by inject() +// TODO-refactor: Consider migrating to navigation component +class BubbleActivity : AppCompatActivity() { private val connectionTrackerDAO by inject() private val appInfoRepository by inject() private val dnsLogDAO by inject() - private lateinit var blockedAdapter: BubbleBlockedAppsAdapter - private lateinit var allowedAdapter: BubbleAllowedAppsAdapter - - private var blockedCollectJob: kotlinx.coroutines.Job? = null - private var allowedCollectJob: kotlinx.coroutines.Job? = null - - private var recyclerDecorationsAdded: Boolean = false + private var vpnOn by mutableStateOf(false) + private var refreshKey by mutableIntStateOf(0) companion object { private const val TAG = "BubbleActivity" private const val PAGE_SIZE = 20 - private const val TEMP_ALLOW_DURATION_MINUTES = 15 - private const val MILLIS_PER_MINUTE = 60 - private const val MILLIS_PER_SECOND = 1000 - private const val ITEM_SPACING_DP = 4 } override fun onCreate(savedInstanceState: Bundle?) { - theme.applyStyle(getCurrentTheme(isDarkThemeOn(), persistentState.theme), true) super.onCreate(savedInstanceState) - Logger.d(TAG, "BubbleActivity onCreate, taskId: $taskId") - - // Handle back button press - minimize instead of close - onBackPressedDispatcher.addCallback(this) { - // Move to background, don't finish the activity - moveTaskToBack(true) + Napier.d("$TAG onCreate, taskId: $taskId") + + setContent { + RethinkTheme { + val allowedFlow = remember(vpnOn, refreshKey) { allowedAppsFlow() } + val blockedFlow = remember(vpnOn, refreshKey) { blockedAppsFlow() } + val allowedItems = allowedFlow.collectAsLazyPagingItems() + val blockedItems = blockedFlow.collectAsLazyPagingItems() + + BubbleScreen( + vpnOn = vpnOn, + allowedItems = allowedItems, + blockedItems = blockedItems, + onAllowApp = { app, onRefresh -> allowApp(app, onRefresh) }, + onRemoveAllowed = { app, onRefresh -> removeAllowedApp(app, onRefresh) } + ) + } } + + onBackPressedDispatcher.addCallback(this) { moveTaskToBack(true) } } override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) - Logger.d(TAG, "BubbleActivity onNewIntent - bubble clicked again") - // Don't do anything special - just let onResume handle the refresh + Napier.d("$TAG onNewIntent - bubble clicked again") } override fun onResume() { super.onResume() - - // If VPN is off, don't load anything / don't start collectors. - if (!VpnController.hasTunnel()) { - Logger.i(TAG, "VPN is off; not loading bubble lists") - stopCollectors() - showVpnOffState() - return - } - - showContentState() - setupRecyclerViews() - setupLoadStateListeners() - - // Start collectors once per resume; cancel previous collectors if any. - startAllowedCollector() - startBlockedCollector() - } - - override fun onStop() { - super.onStop() - // Don't stop the service when activity is minimized - // The bubble notification should remain visible - Logger.d(TAG, "BubbleActivity stopped (minimized)") - } - - override fun onDestroy() { - super.onDestroy() - // Don't stop the service when activity is destroyed - // The service manages its own lifecycle based on the toggle setting - Logger.d(TAG, "BubbleActivity destroyed") - } - - - private fun isDarkThemeOn(): Boolean { - return resources.configuration.uiMode and - android.content.res.Configuration.UI_MODE_NIGHT_MASK == - android.content.res.Configuration.UI_MODE_NIGHT_YES - } - - - private fun startAllowedCollector() { - allowedCollectJob?.cancel() - allowedCollectJob = lifecycleScope.launch { - try { - val now = System.currentTimeMillis() - - val allowedAppsPager = Pager( - config = PagingConfig( - pageSize = PAGE_SIZE, - enablePlaceholders = false - ), - pagingSourceFactory = { - AllowedAppsBubbleViewModel(appInfoRepository, now) - } - ).flow.cachedIn(lifecycleScope) - - allowedAppsPager.collect { pagingData -> - if (!isFinishing && !isDestroyed) { - allowedAdapter.submitData(lifecycle, pagingData) - } - } - } catch (_: CancellationException) { - Logger.d(TAG, "Allowed apps loading cancelled (activity destroyed)") - } catch (e: Exception) { - Logger.e(TAG, "err loading allowed apps: ${e.message}", e) - if (!isFinishing && !isDestroyed) { - b.bubbleAllowedAppsLl.visibility = View.GONE - } - } + vpnOn = VpnController.hasTunnel() + refreshKey++ + if (!vpnOn) { + Napier.i("$TAG VPN is off; showing empty state") } } - private fun startBlockedCollector() { - blockedCollectJob?.cancel() - blockedCollectJob = lifecycleScope.launch { - try { - val now = System.currentTimeMillis() - val last15Mins = now - (TEMP_ALLOW_DURATION_MINUTES * MILLIS_PER_MINUTE * MILLIS_PER_SECOND) - - val tempAllowedApps = withContext(Dispatchers.IO) { - appInfoRepository.getAllTempAllowedApps(now) - } - val tempAllowedUids = tempAllowedApps.map { it.uid }.toSet() - - val blockedAppsPager = Pager( - config = PagingConfig( - pageSize = PAGE_SIZE, - enablePlaceholders = false - ), - pagingSourceFactory = { - BlockedAppsBubbleViewModel( - connectionTrackerDAO, - dnsLogDAO, - appInfoRepository, - last15Mins, - tempAllowedUids - ) - } - ).flow.cachedIn(lifecycleScope) - - blockedAppsPager.collect { pagingData -> - if (!isFinishing && !isDestroyed) { - blockedAdapter.submitData(lifecycle, pagingData) - } - } - - } catch (_: CancellationException) { - Logger.d(TAG, "Blocked apps loading cancelled (activity destroyed)") - } catch (e: Exception) { - Logger.e(TAG, "err loading blocked apps: ${e.message}", e) - if (!isFinishing && !isDestroyed) { - b.bubbleProgressCard.visibility = View.GONE - b.bubbleProgressBar.visibility = View.GONE - b.bubbleEmptyState.visibility = View.VISIBLE - b.bubbleRecyclerView.visibility = View.GONE - } - } - } - } - - private fun allowApp(blockedApp: BlockedAppInfo) { - // Optimistic UI update: remove right away from blocked list for fast feedback. - // PagingDataAdapter doesn't support direct removal; we force a refresh after DB update, - // but also hide the row by refreshing immediately. + private fun allowApp(blockedApp: BlockedAppInfo, onRefresh: () -> Unit) { lifecycleScope.launch { try { - Logger.i(TAG, "Temporarily allowing app for 15 minutes: ${blockedApp.appName} (uid: ${blockedApp.uid})") + Napier.i("Temporarily allowing app for 15 minutes: ${blockedApp.appName} (uid: ${blockedApp.uid})") - withContext(Dispatchers.IO) { + withContext(Dispatchers.IO) { FirewallManager.updateTempAllow(blockedApp.uid, true) } - if (!isFinishing && !isDestroyed) { - // Refresh BOTH lists: remove from blocked and show in allowed. - blockedAdapter.refresh() - allowedAdapter.refresh() - } - - Logger.i(TAG, "App temporarily allowed successfully for 15 minutes") + onRefresh() + Napier.i("App temporarily allowed successfully for 15 minutes") } catch (e: Exception) { - Logger.e(TAG, "err allowing app: ${e.message}", e) + Napier.e("err allowing app: ${e.message}") } } } - private fun removeAllowedApp(allowedApp: AllowedAppInfo) { + private fun removeAllowedApp(allowedApp: AllowedAppInfo, onRefresh: () -> Unit) { lifecycleScope.launch { try { - Logger.i(TAG, "Removing temp allow for app: ${allowedApp.appName} (uid: ${allowedApp.uid})") + Napier.i("Removing temp allow for app: ${allowedApp.appName} (uid: ${allowedApp.uid})") withContext(Dispatchers.IO) { - // Clear temp allow status appInfoRepository.clearTempAllowByUid(allowedApp.uid) } - if (!isFinishing && !isDestroyed) { - // Refresh BOTH lists: remove from allowed and allow it to appear again in blocked. - allowedAdapter.refresh() - blockedAdapter.refresh() - } - - Logger.i(TAG, "Temp allow removed successfully") + onRefresh() + Napier.i("Temp allow removed successfully") } catch (e: Exception) { - Logger.e(TAG, "err removing allowed app: ${e.message}", e) + Napier.e("err removing allowed app: ${e.message}") } } } - private fun setupRecyclerViews() { - // Setup blocked apps RecyclerView - blockedAdapter = BubbleBlockedAppsAdapter { blockedApp -> - allowApp(blockedApp) - } - b.bubbleRecyclerView.apply { - layoutManager = LinearLayoutManager(this@BubbleActivity) - adapter = blockedAdapter - if (!recyclerDecorationsAdded) { - addItemDecoration(object : - androidx.recyclerview.widget.RecyclerView.ItemDecoration() { - override fun getItemOffsets( - outRect: android.graphics.Rect, - view: View, - parent: androidx.recyclerview.widget.RecyclerView, - state: androidx.recyclerview.widget.RecyclerView.State - ) { - outRect.bottom = ITEM_SPACING_DP // 4dp - } - }) + private fun allowedAppsFlow(): Flow> { + if (!vpnOn) return flowOf(PagingData.empty()) + val now = System.currentTimeMillis() + return Pager( + config = PagingConfig(pageSize = PAGE_SIZE, enablePlaceholders = false), + pagingSourceFactory = { AllowedAppsBubbleViewModel(appInfoRepository, now) } + ).flow.cachedIn(lifecycleScope) + } + + private fun blockedAppsFlow(): Flow> { + if (!vpnOn) return flowOf(PagingData.empty()) + val now = System.currentTimeMillis() + val last15Mins = now - (15 * 60 * 1000) + return Pager( + config = PagingConfig(pageSize = PAGE_SIZE, enablePlaceholders = false), + pagingSourceFactory = { + BlockedAppsBubbleViewModel( + connectionTrackerDAO, + dnsLogDAO, + appInfoRepository, + last15Mins, + emptySet() + ) } - } - - // Setup allowed apps RecyclerView - allowedAdapter = BubbleAllowedAppsAdapter { allowedApp -> - removeAllowedApp(allowedApp) - } - b.bubbleAllowedRecyclerView.apply { - layoutManager = LinearLayoutManager(this@BubbleActivity) - adapter = allowedAdapter - if (!recyclerDecorationsAdded) { - addItemDecoration(object : - androidx.recyclerview.widget.RecyclerView.ItemDecoration() { - override fun getItemOffsets( - outRect: android.graphics.Rect, - view: View, - parent: androidx.recyclerview.widget.RecyclerView, - state: androidx.recyclerview.widget.RecyclerView.State - ) { - outRect.bottom = ITEM_SPACING_DP // 4dp - } - }) - recyclerDecorationsAdded = true - } - } - } - - private fun setupLoadStateListeners() { - // Set up load state listener for allowed apps - allowedAdapter.addLoadStateListener { loadState -> - if (!isFinishing && !isDestroyed) { - // Check if data is loaded (not loading and no errors) - val isLoaded = loadState.refresh is androidx.paging.LoadState.NotLoading - - if (isLoaded) { - // Show/hide allowed apps card based on item count - val itemCount = allowedAdapter.itemCount - if (itemCount == 0) { - b.bubbleAllowedAppsLl.visibility = View.GONE - } else { - b.bubbleAllowedAppsLl.visibility = View.VISIBLE - b.bubbleAllowedCount.text = itemCount.toString() - } - } - } - } - - // Set up load state listener for blocked apps - blockedAdapter.addLoadStateListener { loadState -> - if (!isFinishing && !isDestroyed) { - val isLoading = loadState.refresh is androidx.paging.LoadState.Loading - val isError = loadState.refresh is androidx.paging.LoadState.Error - val isLoaded = loadState.refresh is androidx.paging.LoadState.NotLoading - - when { - isLoading -> { - // Show loading state - b.bubbleProgressCard.visibility = View.VISIBLE - b.bubbleProgressBar.visibility = View.VISIBLE - b.bubbleEmptyState.visibility = View.GONE - b.bubbleRecyclerView.visibility = View.GONE - } - isError -> { - // Show error/empty state - b.bubbleProgressCard.visibility = View.GONE - b.bubbleProgressBar.visibility = View.GONE - b.bubbleEmptyState.visibility = View.VISIBLE - b.bubbleRecyclerView.visibility = View.GONE - } - isLoaded -> { - // Hide loading, show content or empty state based on item count - b.bubbleProgressCard.visibility = View.GONE - b.bubbleProgressBar.visibility = View.GONE - - val itemCount = blockedAdapter.itemCount - if (itemCount == 0) { - b.bubbleEmptyState.visibility = View.VISIBLE - b.bubbleRecyclerView.visibility = View.GONE - } else { - b.bubbleEmptyState.visibility = View.GONE - b.bubbleRecyclerView.visibility = View.VISIBLE - } - } - } - } - } - } - - private fun showVpnOffState() { - // Avoid loading spinners if VPN isn't running. - runCatching { - b.bubbleProgressCard.visibility = View.GONE - b.bubbleProgressBar.visibility = View.GONE - b.bubbleAllowedAppsLl.visibility = View.GONE - b.bubbleRecyclerView.visibility = View.GONE - b.bubbleEmptyState.visibility = View.VISIBLE - b.bubbleEmptyTitle.setText(R.string.bubble_empty_state_title) - } - } - - private fun showContentState() { - runCatching { - b.bubbleEmptyState.visibility = View.GONE - } - } - - private fun stopCollectors() { - blockedCollectJob?.cancel() - blockedCollectJob = null - allowedCollectJob?.cancel() - allowedCollectJob = null + ).flow.cachedIn(lifecycleScope) } } diff --git a/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/AppDomainRulesDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/AppDomainRulesDialog.kt new file mode 100644 index 000000000..151603e38 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/AppDomainRulesDialog.kt @@ -0,0 +1,291 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.bottomsheet + + +import android.graphics.drawable.Drawable +import android.widget.Toast +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import com.celzero.bravedns.R +import com.celzero.bravedns.database.CustomDomain +import com.celzero.bravedns.database.WgConfigFilesImmutable +import com.celzero.bravedns.service.DomainRulesManager +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.service.ProxyManager.ID_WG_BASE +import com.celzero.bravedns.util.Constants.Companion.INVALID_UID +import com.celzero.bravedns.util.UIUtils +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import com.celzero.bravedns.ui.compose.theme.Dimensions +import io.github.aakira.napier.Napier +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items + +private const val TAG = "AppDomainBtmSht" + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AppDomainRulesSheet( + uid: Int, + domain: String, + eventLogger: EventLogger, + onDismiss: () -> Unit, + onUpdated: () -> Unit +) { + val context = LocalContext.current + val configAddSuccessToast = stringResource(R.string.config_add_success_toast) + val scope = rememberCoroutineScope() + + var domainRule by remember { mutableStateOf(DomainRulesManager.Status.NONE) } + var customDomain by remember { mutableStateOf(null) } + var appNames by remember { mutableStateOf>(emptyList()) } + var appIcon by remember { mutableStateOf(null) } + var showWgSheet by remember { mutableStateOf(false) } + var wgConfigs by remember { mutableStateOf>(emptyList()) } + + LaunchedEffect(uid, domain) { + if (uid == INVALID_UID) { + onDismiss() + return@LaunchedEffect + } + val (names, icon) = withContext(Dispatchers.IO) { fetchRuleSheetAppIdentity(context, uid) } + appNames = names + appIcon = icon + domainRule = withContext(Dispatchers.IO) { DomainRulesManager.status(domain, uid) } + customDomain = + withContext(Dispatchers.IO) { + DomainRulesManager.getObj(uid, domain) ?: DomainRulesManager.makeCustomDomain(uid, domain) + } + } + + RuleSheetModal(onDismissRequest = onDismiss) { + val appName = formatRuleSheetAppName(context, appNames) + RuleSheetLayout(bottomPadding = RuleSheetBottomPaddingWithActions) { + RuleSheetAppHeader(appName = appName, appIcon = appIcon) + + RuleSheetSectionTitle( + text = stringResource(R.string.bsct_block_domain), + ) + + RuleSheetTrustBlockRow( + value = domain, + isTrustSelected = domainRule == DomainRulesManager.Status.TRUST, + isBlockSelected = domainRule == DomainRulesManager.Status.BLOCK, + onTrustClick = { + val target = + if (domainRule == DomainRulesManager.Status.TRUST) { + DomainRulesManager.Status.NONE + } else { + DomainRulesManager.Status.TRUST + } + applyDomainRule( + domain, + uid, + target, + scope, + eventLogger, + onUpdated + ) { domainRule = it } + }, + onBlockClick = { + val target = + if (domainRule == DomainRulesManager.Status.BLOCK) { + DomainRulesManager.Status.NONE + } else { + DomainRulesManager.Status.BLOCK + } + applyDomainRule( + domain, + uid, + target, + scope, + eventLogger, + onUpdated + ) { domainRule = it } + } + ) + + RuleSheetSupportingText( + text = stringResource(R.string.bsac_title_desc), + ) + } + + if (showWgSheet) { + WireguardListSheet( + inputLabel = customDomain?.domain, + selectedProxyId = customDomain?.proxyId.orEmpty(), + wgConfigs = wgConfigs, + onDismiss = { showWgSheet = false }, + onSelected = { conf -> + scope.launch(Dispatchers.IO) { + val current = customDomain + if (current == null) { + Napier.w("$TAG: Custom domain is null") + return@launch + } + val id = + if (conf == null) { + "" + } else { + ID_WG_BASE + conf.id + } + DomainRulesManager.setProxyId(current, id) + current.proxyId = id + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + configAddSuccessToast, + Toast.LENGTH_SHORT + ) + } + } + } + ) + } + } +} + +private fun applyDomainRule( + domain: String, + uid: Int, + status: DomainRulesManager.Status, + scope: CoroutineScope, + eventLogger: EventLogger, + onUpdated: () -> Unit, + onSetStatus: (DomainRulesManager.Status) -> Unit +) { + onSetStatus(status) + val details = "Domain rule applied: $domain, $uid, ${status.name}" + logFirewallRuleChange(eventLogger, "App domain rule", details) + scope.launch(Dispatchers.IO) { + DomainRulesManager.changeStatus( + domain, + uid, + "", + DomainRulesManager.DomainType.DOMAIN, + status + ) + withContext(Dispatchers.Main) { onUpdated() } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun WireguardListSheet( + inputLabel: String?, + selectedProxyId: String, + wgConfigs: List, + onDismiss: () -> Unit, + onSelected: (WgConfigFilesImmutable?) -> Unit +) { + val context = LocalContext.current + var currentProxyId by remember(inputLabel, selectedProxyId) { mutableStateOf(selectedProxyId) } + RuleSheetModal(onDismissRequest = onDismiss) { + Column( + modifier = + Modifier.fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal, vertical = Dimensions.spacingLg), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + inputLabel?.let { + Text( + text = it, + style = MaterialTheme.typography.titleLarge, + modifier = Modifier.fillMaxWidth(), + color = MaterialTheme.colorScheme.onSurface + ) + } + + LazyColumn { + items(wgConfigs, key = { it?.id ?: -1 }) { conf -> + val proxyId = conf?.let { ID_WG_BASE + it.id } ?: "" + val isSelected = currentProxyId == proxyId + val name = + conf?.name ?: stringResource(R.string.settings_app_list_default_app) + val idSuffix = conf?.id?.toString()?.padStart(3, '0') + val desc = + if (conf == null) { + stringResource(R.string.settings_app_list_default_app) + } else { + stringResource(R.string.settings_app_list_default_app) + " $idSuffix" + } + + Row( + modifier = + Modifier.fillMaxWidth() + .clickable { + currentProxyId = proxyId + onSelected(conf) + onDismiss() + } + .padding(vertical = Dimensions.spacingSm, horizontal = Dimensions.spacingXs), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + Text( + text = ID_WG_BASE.uppercase(), + style = MaterialTheme.typography.titleMedium + ) + Column(modifier = Modifier.weight(1f)) { + Text(text = name, style = MaterialTheme.typography.bodyLarge) + Text( + text = desc, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + RadioButton(selected = isSelected, onClick = null) + } + } + } + + Spacer(modifier = Modifier.size(Dimensions.spacingSm)) + } + } +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/AppIpRulesDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/AppIpRulesDialog.kt new file mode 100644 index 000000000..c509be0d6 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/AppIpRulesDialog.kt @@ -0,0 +1,254 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.bottomsheet + + +import android.graphics.drawable.Drawable +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import com.celzero.bravedns.R +import com.celzero.bravedns.service.DomainRulesManager +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.service.IpRulesManager +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import com.celzero.bravedns.ui.compose.theme.Dimensions +import io.github.aakira.napier.Napier +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +private const val TAG = "AppIpBtmSht" + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AppIpRulesSheet( + uid: Int, + ipAddress: String, + domains: String, + eventLogger: EventLogger, + onDismiss: () -> Unit, + onUpdated: () -> Unit +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + + var ipRule by remember { mutableStateOf(IpRulesManager.IpRuleStatus.NONE) } + var appNames by remember { mutableStateOf>(emptyList()) } + var appIcon by remember { mutableStateOf(null) } + val domainList = remember(domains) { domains.split(",").map { it.trim() }.filter { it.isNotEmpty() } } + val domainRules = remember { mutableStateMapOf() } + + LaunchedEffect(uid, ipAddress, domains) { + val (names, icon) = withContext(Dispatchers.IO) { fetchRuleSheetAppIdentity(context, uid) } + appNames = names + appIcon = icon + ipRule = withContext(Dispatchers.IO) { + IpRulesManager.getMostSpecificRuleMatch(uid, ipAddress) + } + val statuses = + withContext(Dispatchers.IO) { + domainList.associateWith { DomainRulesManager.getDomainRule(it, uid) } + } + domainRules.clear() + domainRules.putAll(statuses) + } + + RuleSheetModal(onDismissRequest = onDismiss) { + val appName = formatRuleSheetAppName(context, appNames) + RuleSheetLayout(bottomPadding = RuleSheetBottomPaddingWithActions) { + RuleSheetAppHeader(appName = appName, appIcon = appIcon) + + RuleSheetSectionTitle( + text = stringResource(R.string.bsct_block_ip), + ) + + RuleSheetTrustBlockRow( + value = ipAddress, + isTrustSelected = ipRule == IpRulesManager.IpRuleStatus.TRUST, + isBlockSelected = ipRule == IpRulesManager.IpRuleStatus.BLOCK, + onTrustClick = { + val target = + if (ipRule == IpRulesManager.IpRuleStatus.TRUST) { + IpRulesManager.IpRuleStatus.NONE + } else { + IpRulesManager.IpRuleStatus.TRUST + } + applyIpRule( + uid, + ipAddress, + target, + scope, + eventLogger, + onUpdated + ) { ipRule = it } + }, + onBlockClick = { + val target = + if (ipRule == IpRulesManager.IpRuleStatus.BLOCK) { + IpRulesManager.IpRuleStatus.NONE + } else { + IpRulesManager.IpRuleStatus.BLOCK + } + applyIpRule( + uid, + ipAddress, + target, + scope, + eventLogger, + onUpdated + ) { ipRule = it } + } + ) + + if (domainList.isNotEmpty()) { + RuleSheetSectionTitle( + text = stringResource(R.string.bsct_block_domain), + ) + LazyColumn( + modifier = Modifier.fillMaxWidth().padding(horizontal = Dimensions.screenPaddingHorizontal) + ) { + items(domainList, key = { it }) { domain -> + val status = domainRules[domain] ?: DomainRulesManager.Status.NONE + DomainRuleRow( + domain = domain, + status = status, + onUpdate = { newStatus -> + domainRules[domain] = newStatus + applyDomainRule(domain, uid, newStatus, scope) + } + ) + } + } + } + + RuleSheetSupportingText( + text = stringResource(R.string.bsac_title_desc), + ) + } + } +} + +@Composable +private fun DomainRuleRow( + domain: String, + status: DomainRulesManager.Status, + onUpdate: (DomainRulesManager.Status) -> Unit +) { + Row( + modifier = Modifier.fillMaxWidth().padding(vertical = Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = domain, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.weight(1f) + ) + TrustBlockToggleStrip( + isTrustSelected = status == DomainRulesManager.Status.TRUST, + isBlockSelected = status == DomainRulesManager.Status.BLOCK, + onTrustClick = { + if (status == DomainRulesManager.Status.TRUST) { + onUpdate(DomainRulesManager.Status.NONE) + } else { + onUpdate(DomainRulesManager.Status.TRUST) + } + }, + onBlockClick = { + if (status == DomainRulesManager.Status.BLOCK) { + onUpdate(DomainRulesManager.Status.NONE) + } else { + onUpdate(DomainRulesManager.Status.BLOCK) + } + }, + iconSize = Dimensions.iconSizeMd, + spacingBefore = Dimensions.spacingSmMd, + spacingBetween = Dimensions.spacingSmMd + ) + } +} + +private fun applyDomainRule( + domain: String, + uid: Int, + status: DomainRulesManager.Status, + scope: CoroutineScope +) { + scope.launch(Dispatchers.IO) { + DomainRulesManager.addDomainRule( + domain.trim(), + status, + DomainRulesManager.DomainType.DOMAIN, + uid + ) + } +} + +private fun applyIpRule( + uid: Int, + ipAddress: String, + status: IpRulesManager.IpRuleStatus, + scope: CoroutineScope, + eventLogger: EventLogger, + onUpdated: () -> Unit, + onSetStatus: (IpRulesManager.IpRuleStatus) -> Unit +) { + onSetStatus(status) + val details = "IP Rule set to ${status.name} for IP: $ipAddress, UID: $uid" + logFirewallRuleChange(eventLogger, "Custom IP", details) + scope.launch(Dispatchers.IO) { + val ipPair = IpRulesManager.getIpNetPort(ipAddress) + val ip = ipPair.first ?: run { + Napier.w("$TAG invalid ip for $ipAddress") + return@launch + } + IpRulesManager.addIpRule(uid, ip, null, status, proxyId = "", proxyCC = "") + withContext(Dispatchers.Main) { onUpdated() } + } +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/BackupRestoreDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/BackupRestoreDialog.kt new file mode 100644 index 000000000..b1f15c94f --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/BackupRestoreDialog.kt @@ -0,0 +1,479 @@ +/* + * Copyright 2022 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.bottomsheet + + +import android.app.Activity +import android.content.Context +import android.content.Intent +import android.content.pm.PackageInfo +import android.content.pm.PackageManager +import android.net.Uri +import android.widget.Toast +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.ActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.fragment.app.FragmentActivity +import androidx.lifecycle.lifecycleScope +import androidx.work.BackoffPolicy +import androidx.work.Data +import androidx.work.OneTimeWorkRequestBuilder +import androidx.work.WorkInfo +import androidx.work.WorkManager +import androidx.work.WorkRequest +import com.celzero.bravedns.R +import com.celzero.bravedns.backup.BackupAgent +import com.celzero.bravedns.backup.BackupHelper +import com.celzero.bravedns.backup.BackupHelper.Companion.BACKUP_FILE_EXTN +import com.celzero.bravedns.backup.BackupHelper.Companion.BACKUP_FILE_NAME +import com.celzero.bravedns.backup.BackupHelper.Companion.BACKUP_FILE_NAME_DATETIME +import com.celzero.bravedns.backup.BackupHelper.Companion.DATA_BUILDER_BACKUP_URI +import com.celzero.bravedns.backup.BackupHelper.Companion.DATA_BUILDER_RESTORE_URI +import com.celzero.bravedns.backup.BackupHelper.Companion.INTENT_RESTART_APP +import com.celzero.bravedns.backup.BackupHelper.Companion.INTENT_TYPE_OCTET +import com.celzero.bravedns.backup.BackupHelper.Companion.INTENT_TYPE_XZIP +import com.celzero.bravedns.backup.RestoreAgent +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.util.UIUtils +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.delay +import io.github.aakira.napier.Napier +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.concurrent.TimeUnit + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun BackupRestoreSheet( + onDismiss: () -> Unit +) { + val context = LocalContext.current + val activity = context as? FragmentActivity ?: return + val workManager = remember { WorkManager.getInstance(activity.applicationContext) } + var versionText by remember { mutableStateOf("") } + var showBackupDialog by remember { mutableStateOf(false) } + var showRestoreDialog by remember { mutableStateOf(false) } + var showBackupFailureDialog by remember { mutableStateOf(false) } + var showRestoreFailureDialog by remember { mutableStateOf(false) } + + val backupLauncher = + rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + handleBackupResult( + activity, + result, + onFailure = { showBackupFailureDialog = true }, + onBackup = { uri -> startBackupProcess(activity, uri, workManager) } + ) + } + val restoreLauncher = + rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + handleRestoreResult( + activity, + result, + onFailure = { showRestoreFailureDialog = true }, + onRestore = { uri -> startRestoreProcess(activity, uri, workManager) } + ) + } + + LaunchedEffect(Unit) { + versionText = showVersion(activity) + observeBackupWorker(activity, workManager, onFailure = { showBackupFailureDialog = true }) + observeRestoreWorker(activity, workManager, onFailure = { showRestoreFailureDialog = true }) + } + + RuleSheetModal(onDismissRequest = onDismiss) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal) + .padding(top = Dimensions.spacingXs, bottom = Dimensions.spacing3xl), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + Column(verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs)) { + Text( + text = stringResource(R.string.brbs_title), + style = MaterialTheme.typography.titleLarge + ) + Text( + text = stringResource(R.string.brbs_backup_restore_desc), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + + RethinkListGroup { + RethinkListItem( + headline = stringResource(R.string.brbs_backup_title), + supporting = stringResource(R.string.brbs_backup_desc), + leadingIconPainter = painterResource(id = R.drawable.ic_backup), + position = CardPosition.First, + onClick = { showBackupDialog = true } + ) + RethinkListItem( + headline = stringResource(R.string.brbs_restore_title), + supporting = stringResource(R.string.brbs_restore_desc), + leadingIconPainter = painterResource(id = R.drawable.ic_restore), + position = CardPosition.Last, + onClick = { showRestoreDialog = true } + ) + } + + Surface( + shape = RoundedCornerShape(Dimensions.cardCornerRadius), + color = MaterialTheme.colorScheme.surfaceContainerHigh + ) { + Text( + text = versionText, + style = MaterialTheme.typography.labelMedium.copy(fontFamily = FontFamily.Monospace), + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.fillMaxWidth().padding(Dimensions.spacingMd) + ) + } + } + + if (showBackupDialog) { + RethinkConfirmDialog( + onDismissRequest = { showBackupDialog = false }, + title = stringResource(R.string.brbs_backup_dialog_title), + message = stringResource(R.string.brbs_backup_dialog_message), + confirmText = stringResource(R.string.brbs_backup_dialog_positive), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + showBackupDialog = false + backup(activity, backupLauncher) + }, + onDismiss = { showBackupDialog = false } + ) + } + + if (showRestoreDialog) { + RethinkConfirmDialog( + onDismissRequest = { showRestoreDialog = false }, + title = stringResource(R.string.brbs_restore_dialog_title), + message = stringResource(R.string.brbs_restore_dialog_message), + confirmText = stringResource(R.string.brbs_restore_dialog_positive), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + showRestoreDialog = false + restore(activity, restoreLauncher) + }, + onDismiss = { showRestoreDialog = false } + ) + } + + if (showBackupFailureDialog) { + RethinkConfirmDialog( + onDismissRequest = { showBackupFailureDialog = false }, + title = stringResource(R.string.brbs_backup_dialog_failure_title), + message = stringResource(R.string.brbs_backup_dialog_failure_message), + confirmText = stringResource(R.string.brbs_backup_dialog_failure_positive), + dismissText = stringResource(R.string.lbl_dismiss), + onConfirm = { + showBackupFailureDialog = false + backup(activity, backupLauncher) + }, + onDismiss = { showBackupFailureDialog = false } + ) + } + + if (showRestoreFailureDialog) { + RethinkConfirmDialog( + onDismissRequest = { showRestoreFailureDialog = false }, + title = stringResource(R.string.brbs_restore_dialog_failure_title), + message = stringResource(R.string.brbs_restore_dialog_failure_message), + confirmText = stringResource(R.string.brbs_restore_dialog_failure_positive), + dismissText = stringResource(R.string.lbl_dismiss), + onConfirm = { + showRestoreFailureDialog = false + restore(activity, restoreLauncher) + }, + onDismiss = { showRestoreFailureDialog = false } + ) + } + } +} + +private fun showVersion(activity: FragmentActivity): String { + val version = getVersionName(activity) + return activity.getString( + R.string.about_version_install_source, + version, + getDownloadSource(activity) + ) +} + +private fun getVersionName(activity: FragmentActivity): String { + val pInfo: PackageInfo? = + Utilities.getPackageMetadata(activity.packageManager, activity.packageName) + return pInfo?.versionName ?: "" +} + +private fun getDownloadSource(activity: FragmentActivity): String { + if (Utilities.isFdroidFlavour()) return activity.getString(R.string.build__flavor_fdroid) + if (Utilities.isPlayStoreFlavour()) return activity.getString(R.string.build__flavor_play_store) + return activity.getString(R.string.build__flavor_website) +} + +private fun backup( + activity: FragmentActivity, + launcher: androidx.activity.result.ActivityResultLauncher +) { + try { + val intent = Intent(Intent.ACTION_CREATE_DOCUMENT) + intent.addCategory(Intent.CATEGORY_OPENABLE) + intent.type = INTENT_TYPE_OCTET + val sdf = SimpleDateFormat(BACKUP_FILE_NAME_DATETIME, Locale.ROOT) + val version = getVersionName(activity).replace(' ', '_') + val zipFileName: String = + BACKUP_FILE_NAME + version + sdf.format(Date()) + BACKUP_FILE_EXTN + + intent.putExtra(Intent.EXTRA_TITLE, zipFileName) + + try { + if (intent.resolveActivity(activity.packageManager) != null) { + launcher.launch(intent) + } else { + Napier.e("No activity found to handle CREATE_DOCUMENT intent") + Utilities.showToastUiCentered( + activity, + activity.getString(R.string.brbs_backup_dialog_failure_message), + Toast.LENGTH_LONG + ) + } + } catch (e: android.content.ActivityNotFoundException) { + Napier.e("Activity not found for CREATE_DOCUMENT: ${e.message}") + Utilities.showToastUiCentered( + activity, + activity.getString(R.string.brbs_backup_dialog_failure_message), + Toast.LENGTH_LONG + ) + } + } catch (e: Exception) { + Napier.e("err opening file picker for backup: ${e.message}") + Utilities.showToastUiCentered( + activity, + activity.getString(R.string.brbs_backup_dialog_failure_message), + Toast.LENGTH_LONG + ) + } +} + +private fun restore( + activity: FragmentActivity, + launcher: androidx.activity.result.ActivityResultLauncher +) { + try { + val intent = Intent(Intent.ACTION_OPEN_DOCUMENT) + intent.addCategory(Intent.CATEGORY_OPENABLE) + intent.type = "*/*" + val mimeTypes = arrayOf(INTENT_TYPE_OCTET, INTENT_TYPE_XZIP) + intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes) + + launcher.launch(intent) + } catch (e: Exception) { + Napier.e("err opening file picker: ${e.message}") + Utilities.showToastUiCentered( + activity, + activity.getString(R.string.blocklist_update_check_failure), + Toast.LENGTH_SHORT + ) + } +} + +private fun handleBackupResult( + activity: FragmentActivity, + result: ActivityResult, + onFailure: () -> Unit, + onBackup: (Uri?) -> Unit +) { + when (result.resultCode) { + Activity.RESULT_OK -> { + var backupFileUri: Uri? = null + result.data?.also { uri -> backupFileUri = uri.data } + Napier.i("activity result for backup process with uri: $backupFileUri") + onBackup(backupFileUri) + } + Activity.RESULT_CANCELED -> { + onFailure() + } + else -> { + onFailure() + } + } +} + +private fun handleRestoreResult( + activity: FragmentActivity, + result: ActivityResult, + onFailure: () -> Unit, + onRestore: (Uri?) -> Unit +) { + when (result.resultCode) { + Activity.RESULT_OK -> { + var fileUri: Uri? = null + result.data?.also { uri -> fileUri = uri.data } + Napier.i("activity result for restore process with uri: $fileUri") + onRestore(fileUri) + } + Activity.RESULT_CANCELED -> { + onFailure() + } + else -> { + onFailure() + } + } +} + +private fun startRestoreProcess(activity: FragmentActivity, fileUri: Uri?, workManager: WorkManager) { + if (fileUri == null) { + Napier.w("uri received from activity result is null, cancel restore process") + return + } + + Napier.i("invoke worker to initiate the restore process") + val data = Data.Builder() + data.putString(DATA_BUILDER_RESTORE_URI, fileUri.toString()) + + val importWorker = + OneTimeWorkRequestBuilder() + .setInputData(data.build()) + .setBackoffCriteria( + BackoffPolicy.LINEAR, + WorkRequest.MIN_BACKOFF_MILLIS, + TimeUnit.MILLISECONDS + ) + .addTag(RestoreAgent.TAG) + .build() + workManager.beginWith(importWorker).enqueue() +} + +private fun startBackupProcess(activity: FragmentActivity, backupUri: Uri?, workManager: WorkManager) { + if (backupUri == null) { + Napier.w("uri received from activity result is null, cancel backup process") + return + } + + BackupHelper.stopVpn(activity) + + Napier.i("invoke worker to initiate the backup process") + val data = Data.Builder() + data.putString(DATA_BUILDER_BACKUP_URI, backupUri.toString()) + val downloadWatcher = + OneTimeWorkRequestBuilder() + .setInputData(data.build()) + .setBackoffCriteria( + BackoffPolicy.LINEAR, + WorkRequest.MIN_BACKOFF_MILLIS, + TimeUnit.MILLISECONDS + ) + .addTag(BackupAgent.TAG) + .build() + workManager.beginWith(downloadWatcher).enqueue() +} + +private fun observeBackupWorker( + activity: FragmentActivity, + workManager: WorkManager, + onFailure: () -> Unit +) { + workManager.getWorkInfosByTagLiveData(BackupAgent.TAG).observe(activity) { workInfoList -> + val workInfo = workInfoList?.getOrNull(0) ?: return@observe + Napier.i("WorkManager state: ${workInfo.state} for ${BackupAgent.TAG}") + when (workInfo.state) { + WorkInfo.State.SUCCEEDED -> { + Utilities.showToastUiCentered( + activity, + activity.getString(R.string.brbs_backup_complete_toast), + Toast.LENGTH_SHORT + ) + workManager.pruneWork() + } + WorkInfo.State.CANCELLED, WorkInfo.State.FAILED -> { + onFailure() + workManager.pruneWork() + workManager.cancelAllWorkByTag(BackupAgent.TAG) + } + else -> { + // no-op + } + } + } +} + +private fun observeRestoreWorker( + activity: FragmentActivity, + workManager: WorkManager, + onFailure: () -> Unit +) { + workManager.getWorkInfosByTagLiveData(RestoreAgent.TAG).observe(activity) { workInfoList -> + val workInfo = workInfoList?.getOrNull(0) ?: return@observe + Napier.i("WorkManager state: ${workInfo.state} for ${RestoreAgent.TAG}") + if (WorkInfo.State.SUCCEEDED == workInfo.state) { + Utilities.showToastUiCentered( + activity, + activity.getString(R.string.brbs_restore_complete_toast), + Toast.LENGTH_LONG + ) + delay(TimeUnit.MILLISECONDS.toMillis(1000), activity.lifecycleScope) { + restartApp(activity) + } + workManager.pruneWork() + } else if ( + WorkInfo.State.CANCELLED == workInfo.state || + WorkInfo.State.FAILED == workInfo.state + ) { + onFailure() + workManager.pruneWork() + workManager.cancelAllWorkByTag(RestoreAgent.TAG) + } + } +} + +private fun restartApp(context: Context) { + val packageManager: PackageManager = context.packageManager + val intent = packageManager.getLaunchIntentForPackage(context.packageName) + val componentName = intent!!.component + val mainIntent = Intent.makeRestartActivityTask(componentName) + mainIntent.putExtra(INTENT_RESTART_APP, true) + context.startActivity(mainIntent) + Runtime.getRuntime().exit(0) +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/BottomSheetShared.kt b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/BottomSheetShared.kt new file mode 100644 index 000000000..d20df5c0b --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/BottomSheetShared.kt @@ -0,0 +1,672 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.bottomsheet + +import android.content.Context +import android.graphics.drawable.Drawable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.background +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkFilterChip +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkModalBottomSheet +import com.celzero.bravedns.ui.compose.theme.RethinkTwoOptionSegmentedRow +import com.celzero.bravedns.util.Constants.Companion.UID_EVERYBODY +import com.celzero.bravedns.util.Utilities +import io.github.aakira.napier.Napier +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class RuleSheetChipColors( + val neutralText: Color, + val neutralBg: Color, + val negativeText: Color, + val negativeBg: Color, + val positiveText: Color, + val positiveBg: Color +) + +data class RuleSheetChipOption( + val label: String, + val selected: Boolean, + val selectedText: Color, + val selectedContainer: Color, + val onClick: () -> Unit +) + +val RuleSheetBottomPaddingWithActions: Dp = Dimensions.spacing3xl + Dimensions.spacingMd +val RuleSheetBottomPaddingCompact: Dp = Dimensions.spacing2xl + Dimensions.spacingSm + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RuleSheetModal( + onDismissRequest: () -> Unit, + content: @Composable ColumnScope.() -> Unit +) { + RethinkModalBottomSheet( + onDismissRequest = onDismissRequest, + contentPadding = PaddingValues(0.dp), + verticalSpacing = 0.dp, + includeBottomSpacer = false, + content = content + ) +} + +@Composable +fun RuleSheetLayout( + modifier: Modifier = Modifier, + bottomPadding: Dp, + verticalSpacing: Dp = Dimensions.spacingMd, + content: @Composable ColumnScope.() -> Unit +) { + Column( + modifier = modifier + .fillMaxWidth() + .padding(bottom = bottomPadding), + verticalArrangement = Arrangement.spacedBy(verticalSpacing) + ) { + content() + } +} + +@Composable +fun RuleSheetLabeledControlRow( + label: @Composable () -> Unit, + control: (@Composable () -> Unit)? = null, + modifier: Modifier = Modifier, + labelWeight: Float = 1f, + controlWeight: Float = 1f, + horizontalPadding: Dp = Dimensions.spacingMd, + spacing: Dp = Dimensions.spacingSmMd, + controlAlignment: Alignment = Alignment.CenterEnd +) { + Row( + modifier = modifier.fillMaxWidth().padding(horizontal = horizontalPadding), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(spacing) + ) { + Box( + modifier = Modifier.weight(if (control == null) 1f else labelWeight), + contentAlignment = Alignment.CenterStart + ) { + label() + } + if (control != null) { + Box( + modifier = Modifier.weight(controlWeight), + contentAlignment = controlAlignment + ) { + control() + } + } + } +} + +@Composable +fun RuleSheetTextFieldRow( + value: String, + onValueChange: (String) -> Unit, + modifier: Modifier = Modifier, + enabled: Boolean = true, + keyboardType: KeyboardType = KeyboardType.Text, + label: (@Composable (() -> Unit))? = null, + placeholder: (@Composable (() -> Unit))? = null, + fieldWeight: Float = 1f, + spacing: Dp = Dimensions.spacingSm, + trailingTopPadding: Dp = Dimensions.spacingMd, + trailing: (@Composable (() -> Unit))? = null +) { + Row( + modifier = modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(spacing), + verticalAlignment = Alignment.Top + ) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + modifier = Modifier.weight(fieldWeight), + singleLine = true, + enabled = enabled, + keyboardOptions = KeyboardOptions(keyboardType = keyboardType), + label = label, + placeholder = placeholder + ) + if (trailing != null) { + Box( + modifier = Modifier.padding(top = trailingTopPadding), + contentAlignment = Alignment.Center + ) { + trailing() + } + } + } +} + +@Composable +fun RuleSheetDualTextFieldRow( + primaryValue: String, + onPrimaryValueChange: (String) -> Unit, + secondaryValue: String, + onSecondaryValueChange: (String) -> Unit, + primaryLabel: @Composable (() -> Unit), + secondaryLabel: @Composable (() -> Unit), + modifier: Modifier = Modifier, + enabled: Boolean = true, + primaryWeight: Float = 2f, + secondaryWeight: Float = 1f, + spacing: Dp = Dimensions.spacingSm, + primaryKeyboardType: KeyboardType = KeyboardType.Text, + secondaryKeyboardType: KeyboardType = KeyboardType.Number +) { + Row( + modifier = modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(spacing) + ) { + OutlinedTextField( + value = primaryValue, + onValueChange = onPrimaryValueChange, + modifier = Modifier.weight(primaryWeight), + singleLine = true, + label = primaryLabel, + enabled = enabled, + keyboardOptions = KeyboardOptions(keyboardType = primaryKeyboardType) + ) + OutlinedTextField( + value = secondaryValue, + onValueChange = onSecondaryValueChange, + modifier = Modifier.weight(secondaryWeight), + singleLine = true, + label = secondaryLabel, + enabled = enabled, + keyboardOptions = KeyboardOptions(keyboardType = secondaryKeyboardType) + ) + } +} + +@Composable +fun rememberRuleSheetChipColors(): RuleSheetChipColors { + return RuleSheetChipColors( + neutralText = MaterialTheme.colorScheme.onSurfaceVariant, + neutralBg = MaterialTheme.colorScheme.surfaceVariant, + negativeText = MaterialTheme.colorScheme.error, + negativeBg = MaterialTheme.colorScheme.errorContainer, + positiveText = MaterialTheme.colorScheme.tertiary, + positiveBg = MaterialTheme.colorScheme.tertiaryContainer + ) +} + +@Composable +fun RuleSheetAppHeader( + appName: String?, + appIcon: Drawable?, + modifier: Modifier = Modifier, + iconSize: Dp = Dimensions.iconSizeSm, + textStyle: TextStyle = MaterialTheme.typography.bodyMedium, + horizontalPadding: Dp = Dimensions.screenPaddingHorizontal, + onClick: (() -> Unit)? = null +) { + if (appName.isNullOrBlank()) return + + val clickableModifier = + if (onClick != null) { + Modifier.clickable(onClick = onClick) + } else { + Modifier + } + + Row( + modifier = modifier + .fillMaxWidth() + .then(clickableModifier) + .padding(horizontal = horizontalPadding), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center + ) { + appIcon?.let { icon -> + val painter = rememberDrawablePainter(icon) + if (painter != null) { + Image( + painter = painter, + contentDescription = null, + modifier = Modifier.size(iconSize) + ) + Spacer(modifier = Modifier.width(Dimensions.spacingSmMd)) + } + } + Text( + text = appName, + style = textStyle, + color = MaterialTheme.colorScheme.onSurface + ) + } +} + +@Composable +fun RuleSheetSummaryPill( + text: String, + modifier: Modifier = Modifier, + containerColor: Color = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.72f), + textColor: Color = MaterialTheme.colorScheme.onSecondaryContainer, + textStyle: TextStyle = MaterialTheme.typography.labelMedium, + fontWeight: FontWeight = FontWeight.SemiBold, + horizontalPadding: Dp = Dimensions.spacingMd, + verticalPadding: Dp = Dimensions.spacingSm +) { + androidx.compose.material3.Surface( + modifier = modifier, + shape = MaterialTheme.shapes.extraLarge, + color = containerColor + ) { + Text( + text = text, + style = textStyle, + color = textColor, + fontWeight = fontWeight, + modifier = Modifier.padding(horizontal = horizontalPadding, vertical = verticalPadding) + ) + } +} + +@Composable +fun RuleSheetFlagDestinationRow( + flag: String, + destination: String, + modifier: Modifier = Modifier, + destinationStyle: TextStyle = MaterialTheme.typography.titleLarge, + destinationFontFamily: FontFamily = FontFamily.Monospace, + horizontalPadding: Dp = Dimensions.spacingMd +) { + if (destination.isBlank()) return + + Row( + modifier = modifier.fillMaxWidth().padding(horizontal = horizontalPadding), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center + ) { + if (flag.isNotBlank()) { + Text( + text = flag, + style = MaterialTheme.typography.headlineSmall, + modifier = Modifier.padding(end = Dimensions.spacingSm) + ) + } + SelectionContainer { + Text( + text = destination, + style = destinationStyle, + fontFamily = destinationFontFamily, + color = MaterialTheme.colorScheme.onSurface + ) + } + } +} + +@Composable +fun RuleSheetSplitDetailsRow( + modifier: Modifier = Modifier, + horizontalPadding: Dp = Dimensions.spacingXl, + dividerColor: Color = MaterialTheme.colorScheme.onSurfaceVariant, + dividerHeight: Dp = 32.dp, + leftContent: @Composable ColumnScope.() -> Unit, + rightContent: @Composable ColumnScope.() -> Unit +) { + Row( + modifier = modifier.fillMaxWidth().padding(horizontal = horizontalPadding), + verticalAlignment = Alignment.CenterVertically + ) { + Column( + modifier = Modifier.weight(1f), + horizontalAlignment = Alignment.End, + content = leftContent + ) + Spacer(modifier = Modifier.width(Dimensions.spacingSmMd)) + Box(modifier = Modifier.width(1.dp).height(dividerHeight).background(dividerColor)) + Spacer(modifier = Modifier.width(Dimensions.spacingSmMd)) + Column( + modifier = Modifier.weight(1f), + horizontalAlignment = Alignment.Start, + content = rightContent + ) + } +} + +@Composable +fun TrustBlockToggleStrip( + isTrustSelected: Boolean, + isBlockSelected: Boolean, + onTrustClick: () -> Unit, + onBlockClick: () -> Unit, + iconSize: Dp = 28.dp, + spacingBefore: Dp = Dimensions.spacingLg, + spacingBetween: Dp = Dimensions.spacingMd +) { + val trustIcon = if (isTrustSelected) R.drawable.ic_trust_accent else R.drawable.ic_trust + val blockIcon = if (isBlockSelected) R.drawable.ic_block_accent else R.drawable.ic_block + + Spacer(modifier = Modifier.width(spacingBefore)) + Icon( + painter = painterResource(id = trustIcon), + contentDescription = null, + modifier = Modifier.size(iconSize).clickable(onClick = onTrustClick) + ) + Spacer(modifier = Modifier.width(spacingBetween)) + Icon( + painter = painterResource(id = blockIcon), + contentDescription = null, + modifier = Modifier.size(iconSize).clickable(onClick = onBlockClick) + ) +} + +@Composable +fun RuleSheetSectionTitle( + text: String, + modifier: Modifier = Modifier, + horizontalPadding: Dp = Dimensions.screenPaddingHorizontal +) { + Text( + text = text, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = modifier.fillMaxWidth().padding(horizontal = horizontalPadding) + ) +} + +@Composable +fun RuleSheetSupportingText( + text: String, + modifier: Modifier = Modifier, + horizontalPadding: Dp = Dimensions.screenPaddingHorizontal +) { + Text( + text = text, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = modifier.fillMaxWidth().padding(horizontal = horizontalPadding) + ) +} + +@Composable +fun RuleSheetDeleteAction( + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + Row( + modifier = modifier.fillMaxWidth().padding(horizontal = Dimensions.screenPaddingHorizontal), + horizontalArrangement = Arrangement.End + ) { + TextButton( + onClick = onClick, + colors = ButtonDefaults.textButtonColors(contentColor = MaterialTheme.colorScheme.error) + ) { + Text(text = stringResource(R.string.lbl_delete)) + } + } +} + +@Composable +fun RuleSheetSelectionValue( + text: String, + modifier: Modifier = Modifier, + textStyle: TextStyle = MaterialTheme.typography.titleMedium +) { + SelectionContainer(modifier = modifier.fillMaxWidth()) { + Text( + text = text, + style = textStyle, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.fillMaxWidth().padding(horizontal = Dimensions.screenPaddingHorizontal) + ) + } +} + +@Composable +fun RuleSheetTrustBlockRow( + value: String, + isTrustSelected: Boolean, + isBlockSelected: Boolean, + onTrustClick: () -> Unit, + onBlockClick: () -> Unit, + modifier: Modifier = Modifier, + valueTextStyle: TextStyle = MaterialTheme.typography.titleMedium +) { + Row( + modifier = + modifier + .fillMaxWidth() + .padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingSm + ), + verticalAlignment = Alignment.CenterVertically + ) { + SelectionContainer(modifier = Modifier.weight(1f)) { + Text( + text = value, + style = valueTextStyle, + color = MaterialTheme.colorScheme.onSurface + ) + } + TrustBlockToggleStrip( + isTrustSelected = isTrustSelected, + isBlockSelected = isBlockSelected, + onTrustClick = onTrustClick, + onBlockClick = onBlockClick + ) + } +} + +@Composable +fun RuleSheetChipOptionsRow( + options: List, + modifier: Modifier = Modifier +) { + Row( + modifier = modifier.fillMaxWidth().padding(horizontal = Dimensions.screenPaddingHorizontal), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + options.forEach { option -> + Box(modifier = Modifier.weight(1f).widthIn(min = 0.dp)) { + RuleSheetFilterChip( + label = option.label, + selected = option.selected, + selectedText = option.selectedText, + selectedContainer = option.selectedContainer + ) { + option.onClick() + } + } + } + } +} + +@Composable +fun RuleSheetDeleteDialog( + title: String, + message: String, + onDismiss: () -> Unit, + onConfirm: () -> Unit +) { + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = title, + message = message, + confirmText = stringResource(R.string.lbl_delete), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = onConfirm, + onDismiss = onDismiss, + isConfirmDestructive = true + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RuleSheetFilterChip( + label: String, + selected: Boolean, + selectedText: Color, + selectedContainer: Color, + modifier: Modifier = Modifier, + onClick: () -> Unit +) { + RethinkFilterChip( + label = label, + selected = selected, + onClick = onClick, + selectedLabelColor = selectedText, + selectedContainerColor = selectedContainer, + modifier = modifier, + minHeight = Dimensions.touchTargetSm + ) +} + +@Composable +fun RuleSheetModeToggle( + autoLabel: String, + manualLabel: String, + isAutoSelected: Boolean, + onAutoClick: () -> Unit, + onManualClick: () -> Unit, + modifier: Modifier = Modifier +) { + RethinkTwoOptionSegmentedRow( + leftLabel = autoLabel, + rightLabel = manualLabel, + leftSelected = isAutoSelected, + onLeftClick = onAutoClick, + onRightClick = onManualClick, + modifier = modifier, + minHeight = Dimensions.touchTargetSm + ) +} + +suspend fun fetchRuleSheetAppIdentity( + context: Context, + uid: Int +): Pair, Drawable?> { + val appNames = FirewallManager.getAppNamesByUid(uid) + val packageName = appNames.firstOrNull()?.let { FirewallManager.getPackageNameByAppName(it) } + val icon = + if (packageName.isNullOrEmpty()) { + null + } else { + Utilities.getIcon(context, packageName) + } + + return appNames to icon +} + +fun formatRuleSheetAppName(context: Context, appNames: List): String? { + return when { + appNames.isEmpty() -> null + appNames.size >= 2 -> + context.getString( + R.string.ctbs_app_other_apps, + appNames[0], + appNames.size.minus(1).toString() + ) + else -> appNames[0] + } +} + +fun formatCustomRuleSheetAppName(context: Context, uid: Int, appNames: List): String { + return when { + uid == UID_EVERYBODY -> + context.getString(R.string.firewall_act_universal_tab) + appNames.isEmpty() -> + context.getString(R.string.network_log_app_name_unknown) + " ($uid)" + appNames.size >= 2 -> + context.getString( + R.string.ctbs_app_other_apps, + appNames[0], + appNames.size.minus(1).toString() + ) + else -> appNames[0] + } +} + +fun logFirewallRuleChange( + eventLogger: EventLogger, + title: String, + details: String, + tag: String? = null +) { + eventLogger.log( + EventType.FW_RULE_MODIFIED, + Severity.LOW, + title, + EventSource.UI, + false, + details + ) + tag?.let { Napier.v("$it $details") } +} + +fun launchRuleMutation( + scope: CoroutineScope, + mutation: suspend () -> T, + onUpdated: (T) -> Unit +) { + scope.launch(Dispatchers.IO) { + val result = mutation() + withContext(Dispatchers.Main) { + onUpdated(result) + } + } +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/CustomDomainRulesDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/CustomDomainRulesDialog.kt new file mode 100644 index 000000000..e7e7bdcda --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/CustomDomainRulesDialog.kt @@ -0,0 +1,204 @@ +package com.celzero.bravedns.ui.bottomsheet + + +import android.graphics.drawable.Drawable +import android.text.format.DateUtils +import android.widget.Toast +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.database.CustomDomain +import com.celzero.bravedns.service.DomainRulesManager +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.util.Constants.Companion.UID_EVERYBODY +import com.celzero.bravedns.util.Utilities +import io.github.aakira.napier.Napier +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +private const val TAG = "CDRDialog" + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CustomDomainRulesSheet( + customDomain: CustomDomain, + eventLogger: EventLogger, + onDismiss: () -> Unit, + onDeleted: () -> Unit +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + var appNames by remember { mutableStateOf>(emptyList()) } + var appIcon by remember { mutableStateOf(null) } + var status by remember { mutableStateOf(DomainRulesManager.Status.NONE) } + var showDeleteDialog by remember { mutableStateOf(false) } + + LaunchedEffect(customDomain.uid, customDomain.domain) { + val uid = customDomain.uid + if (uid != UID_EVERYBODY) { + val (names, icon) = withContext(Dispatchers.IO) { fetchRuleSheetAppIdentity(context, uid) } + appNames = names + appIcon = icon + } else { + appNames = emptyList() + appIcon = null + } + + val rules = DomainRulesManager.getDomainRule(customDomain.domain, uid) + status = rules + } + + RuleSheetModal(onDismissRequest = onDismiss) { + val appName = formatCustomRuleSheetAppName(context, customDomain.uid, appNames) + + val now = System.currentTimeMillis() + val time = + DateUtils.getRelativeTimeSpanString( + customDomain.modifiedTs, + now, + DateUtils.MINUTE_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE + ) + val statusLabel = + when (status) { + DomainRulesManager.Status.TRUST -> stringResource(R.string.ci_trust_txt) + DomainRulesManager.Status.BLOCK -> stringResource(R.string.lbl_blocked) + DomainRulesManager.Status.NONE -> stringResource(R.string.cd_no_rule_txt) + } + val statusText = stringResource(R.string.ci_desc, statusLabel, time) + val deletedToast = stringResource(R.string.cd_toast_deleted) + val chipColors = rememberRuleSheetChipColors() + + RuleSheetLayout(bottomPadding = RuleSheetBottomPaddingCompact) { + RuleSheetDeleteAction(onClick = { showDeleteDialog = true }) + + RuleSheetAppHeader(appName = appName, appIcon = appIcon) + + RuleSheetSectionTitle( + text = stringResource(R.string.lbl_domain), + ) + + RuleSheetSelectionValue(text = customDomain.domain) + + RuleSheetSupportingText( + text = statusText, + ) + + RuleSheetChipOptionsRow( + options = + listOf( + RuleSheetChipOption( + label = stringResource(R.string.ci_no_rule), + selected = status == DomainRulesManager.Status.NONE, + selectedText = chipColors.neutralText, + selectedContainer = chipColors.neutralBg, + onClick = { + updateRule( + customDomain, + DomainRulesManager.Status.NONE, + scope, + eventLogger + ) { newStatus -> + status = newStatus + } + } + ), + RuleSheetChipOption( + label = stringResource(R.string.ci_block), + selected = status == DomainRulesManager.Status.BLOCK, + selectedText = chipColors.negativeText, + selectedContainer = chipColors.negativeBg, + onClick = { + updateRule( + customDomain, + DomainRulesManager.Status.BLOCK, + scope, + eventLogger + ) { newStatus -> + status = newStatus + } + } + ), + RuleSheetChipOption( + label = stringResource(R.string.ci_trust_rule), + selected = status == DomainRulesManager.Status.TRUST, + selectedText = chipColors.positiveText, + selectedContainer = chipColors.positiveBg, + onClick = { + updateRule( + customDomain, + DomainRulesManager.Status.TRUST, + scope, + eventLogger + ) { newStatus -> + status = newStatus + } + } + ) + ) + ) + } + + if (showDeleteDialog) { + RuleSheetDeleteDialog( + title = stringResource(R.string.cd_remove_dialog_title), + message = stringResource(R.string.cd_remove_dialog_message), + onDismiss = { showDeleteDialog = false }, + onConfirm = { + showDeleteDialog = false + scope.launch(Dispatchers.IO) { + DomainRulesManager.deleteDomain(customDomain) + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + deletedToast, + Toast.LENGTH_SHORT + ) + } + } + logEvent( + eventLogger, + "Deleted custom domain rule for ${customDomain.domain}" + ) + onDeleted() + onDismiss() + }, + ) + } + } +} + +private fun updateRule( + customDomain: CustomDomain, + rule: DomainRulesManager.Status, + scope: kotlinx.coroutines.CoroutineScope, + eventLogger: EventLogger, + onUpdated: (DomainRulesManager.Status) -> Unit +) { + launchRuleMutation(scope, mutation = { + when (rule) { + DomainRulesManager.Status.NONE -> DomainRulesManager.noRule(customDomain) + DomainRulesManager.Status.BLOCK -> DomainRulesManager.block(customDomain) + DomainRulesManager.Status.TRUST -> DomainRulesManager.trust(customDomain) + } + val status = DomainRulesManager.Status.getStatus(customDomain.status) + logEvent(eventLogger, "Domain rule for ${customDomain.domain} set to ${status.name}") + status + }, onUpdated = onUpdated) +} + +private fun logEvent(eventLogger: EventLogger, details: String) { + logFirewallRuleChange(eventLogger, "Custom Domain", details, TAG) +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/CustomIpRulesDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/CustomIpRulesDialog.kt new file mode 100644 index 000000000..bab1235d5 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/bottomsheet/CustomIpRulesDialog.kt @@ -0,0 +1,235 @@ +package com.celzero.bravedns.ui.bottomsheet + + +import android.graphics.drawable.Drawable +import android.text.format.DateUtils +import android.widget.Toast +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.database.CustomIp +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.IpRulesManager +import com.celzero.bravedns.service.IpRulesManager.IpRuleStatus +import com.celzero.bravedns.util.Constants.Companion.UID_EVERYBODY +import com.celzero.bravedns.util.Utilities +import io.github.aakira.napier.Napier +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +private const val TAG = "CIRDialog" + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CustomIpRulesSheet( + customIp: CustomIp, + eventLogger: EventLogger, + onDismiss: () -> Unit, + onDeleted: () -> Unit +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + var appNames by remember { mutableStateOf>(emptyList()) } + var appIcon by remember { mutableStateOf(null) } + var status by remember { mutableStateOf(IpRuleStatus.getStatus(customIp.status)) } + var showDeleteDialog by remember { mutableStateOf(false) } + + LaunchedEffect(customIp.uid, customIp.ipAddress) { + val uid = customIp.uid + if (uid == UID_EVERYBODY) { + appNames = emptyList() + appIcon = null + } else { + val (names, icon) = withContext(Dispatchers.IO) { fetchRuleSheetAppIdentity(context, uid) } + appNames = names + appIcon = icon + } + status = IpRuleStatus.getStatus(customIp.status) + } + + RuleSheetModal(onDismissRequest = onDismiss) { + val appName = formatCustomRuleSheetAppName(context, customIp.uid, appNames) + val now = System.currentTimeMillis() + val uptime = System.currentTimeMillis() - customIp.modifiedDateTime + val time = + DateUtils.getRelativeTimeSpanString( + now - uptime, + now, + DateUtils.MINUTE_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE + ) + val statusLabel = + when (status) { + IpRuleStatus.TRUST -> stringResource(R.string.ci_trust_txt) + IpRuleStatus.BLOCK -> stringResource(R.string.lbl_blocked) + IpRuleStatus.NONE -> stringResource(R.string.cd_no_rule_txt) + IpRuleStatus.BYPASS_UNIVERSAL -> stringResource(R.string.ci_bypass_universal_txt) + } + val statusText = stringResource(R.string.ci_desc, statusLabel, time) + val deleteToast = stringResource(R.string.univ_ip_delete_individual_toast, customIp.ipAddress) + val chipColors = rememberRuleSheetChipColors() + + RuleSheetLayout(bottomPadding = RuleSheetBottomPaddingCompact) { + RuleSheetDeleteAction(onClick = { showDeleteDialog = true }) + + RuleSheetAppHeader(appName = appName, appIcon = appIcon) + + RuleSheetSelectionValue( + text = customIp.ipAddress, + textStyle = androidx.compose.material3.MaterialTheme.typography.titleLarge + ) + + RuleSheetSupportingText( + text = statusText, + ) + + val thirdOption = + if (customIp.uid == UID_EVERYBODY) { + RuleSheetChipOption( + label = stringResource(R.string.ci_bypass_universal), + selected = status == IpRuleStatus.BYPASS_UNIVERSAL, + selectedText = chipColors.positiveText, + selectedContainer = chipColors.positiveBg, + onClick = { + updateRule(customIp, IpRuleStatus.BYPASS_UNIVERSAL, scope, eventLogger) { + newStatus -> + status = newStatus + } + } + ) + } else { + RuleSheetChipOption( + label = stringResource(R.string.ci_trust_rule), + selected = status == IpRuleStatus.TRUST, + selectedText = chipColors.positiveText, + selectedContainer = chipColors.positiveBg, + onClick = { + updateRule(customIp, IpRuleStatus.TRUST, scope, eventLogger) { newStatus -> + status = newStatus + } + } + ) + } + + RuleSheetChipOptionsRow( + options = + listOf( + RuleSheetChipOption( + label = stringResource(R.string.ci_no_rule), + selected = status == IpRuleStatus.NONE, + selectedText = chipColors.neutralText, + selectedContainer = chipColors.neutralBg, + onClick = { + updateRule(customIp, IpRuleStatus.NONE, scope, eventLogger) { newStatus -> + status = newStatus + } + } + ), + RuleSheetChipOption( + label = stringResource(R.string.ci_block), + selected = status == IpRuleStatus.BLOCK, + selectedText = chipColors.negativeText, + selectedContainer = chipColors.negativeBg, + onClick = { + updateRule(customIp, IpRuleStatus.BLOCK, scope, eventLogger) { newStatus -> + status = newStatus + } + } + ), + thirdOption + ) + ) + } + + if (showDeleteDialog) { + RuleSheetDeleteDialog( + title = stringResource(R.string.univ_firewall_dialog_title), + message = stringResource(R.string.univ_firewall_dialog_message), + onDismiss = { showDeleteDialog = false }, + onConfirm = { + showDeleteDialog = false + scope.launch(Dispatchers.IO) { + IpRulesManager.removeIpRule(customIp.uid, customIp.ipAddress, customIp.port) + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + deleteToast, + Toast.LENGTH_SHORT + ) + } + } + logEvent(eventLogger, "Deleted custom IP rule for ${customIp.ipAddress}") + onDeleted() + onDismiss() + }, + ) + } + } +} + +private fun updateRule( + customIp: CustomIp, + rule: IpRuleStatus, + scope: kotlinx.coroutines.CoroutineScope, + eventLogger: EventLogger, + onUpdated: (IpRuleStatus) -> Unit +) { + launchRuleMutation(scope, mutation = { + val updated = + when (rule) { + IpRuleStatus.NONE -> noRuleIp(customIp, eventLogger) + IpRuleStatus.BLOCK -> blockIp(customIp, eventLogger) + IpRuleStatus.BYPASS_UNIVERSAL -> byPassUniversal(customIp, eventLogger) + IpRuleStatus.TRUST -> byPassAppRule(customIp, eventLogger) + } + Napier.v("$TAG changeIpStatus: ${updated.ipAddress}, status: ${rule.name}") + rule + }, onUpdated = onUpdated) +} + +private suspend fun byPassUniversal(orig: CustomIp, eventLogger: EventLogger): CustomIp { + Napier.i("$TAG set ${orig.ipAddress} to bypass universal") + val copy = orig.deepCopy() + IpRulesManager.updateBypass(copy) + logEvent(eventLogger, "Set IP ${copy.ipAddress} to bypass universal") + return copy +} + +private suspend fun byPassAppRule(orig: CustomIp, eventLogger: EventLogger): CustomIp { + Napier.i("$TAG set ${orig.ipAddress} to bypass app") + val copy = orig.deepCopy() + IpRulesManager.updateTrust(copy) + logEvent(eventLogger, "Set IP ${copy.ipAddress} to trust") + return copy +} + +private suspend fun blockIp(orig: CustomIp, eventLogger: EventLogger): CustomIp { + Napier.i("$TAG block ${orig.ipAddress}") + val copy = orig.deepCopy() + IpRulesManager.updateBlock(copy) + logEvent(eventLogger, "Blocked IP ${copy.ipAddress}") + return copy +} + +private suspend fun noRuleIp(orig: CustomIp, eventLogger: EventLogger): CustomIp { + Napier.i("$TAG no rule for ${orig.ipAddress}") + val copy = orig.deepCopy() + IpRulesManager.updateNoRule(copy) + logEvent(eventLogger, "Set no rule for IP ${copy.ipAddress}") + return copy +} + +private fun logEvent(eventLogger: EventLogger, details: String) { + logFirewallRuleChange(eventLogger, "Custom IP", details) +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/compose/ComposeUtils.kt b/app/src/full/java/com/celzero/bravedns/ui/compose/ComposeUtils.kt new file mode 100644 index 000000000..eb5b7ec02 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/compose/ComposeUtils.kt @@ -0,0 +1,14 @@ +package com.celzero.bravedns.ui.compose + +import android.graphics.drawable.Drawable +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.graphics.painter.BitmapPainter +import androidx.compose.ui.graphics.painter.Painter +import androidx.core.graphics.drawable.toBitmap + +@Composable +fun rememberDrawablePainter(drawable: Drawable?): Painter? { + return remember(drawable) { drawable?.toBitmap()?.asImageBitmap()?.let { BitmapPainter(it) } } +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/compose/app/AppInfoNav.kt b/app/src/full/java/com/celzero/bravedns/ui/compose/app/AppInfoNav.kt new file mode 100644 index 000000000..ce7c29204 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/compose/app/AppInfoNav.kt @@ -0,0 +1,7 @@ +package com.celzero.bravedns.ui.compose.app + +object AppInfoNav { + const val EXTRA_UID = "UID" + const val EXTRA_ACTIVE_CONNS = "ACTIVE_CONNS" + const val EXTRA_ASN = "ASN" +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/compose/app/AppInfoScreen.kt b/app/src/full/java/com/celzero/bravedns/ui/compose/app/AppInfoScreen.kt new file mode 100644 index 000000000..28afb9977 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/compose/app/AppInfoScreen.kt @@ -0,0 +1,1087 @@ +/* + * Copyright 2021 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.app + +import android.content.Context +import android.content.Intent +import android.graphics.drawable.Drawable +import android.widget.Toast +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.MobileOff +import androidx.compose.material.icons.rounded.PhoneAndroid +import androidx.compose.material.icons.rounded.Wifi +import androidx.compose.material.icons.rounded.WifiOff +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.lifecycle.asFlow +import androidx.paging.LoadState +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.CloseConnsDialog +import com.celzero.bravedns.data.AppConnection +import com.celzero.bravedns.database.AppInfo +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.service.ProxyManager +import com.celzero.bravedns.service.ProxyManager.ID_NONE +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.ui.bottomsheet.AppDomainRulesSheet +import com.celzero.bravedns.ui.bottomsheet.AppIpRulesSheet +import com.celzero.bravedns.ui.compose.apps.DiagonalWipeIcon +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.CompactEmptyState +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkActionListItem +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkToggleListItem +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import com.celzero.bravedns.util.Constants.Companion.INVALID_UID +import com.celzero.bravedns.util.Constants.Companion.RETHINK_PACKAGE +import com.celzero.bravedns.util.UIUtils.openAndroidAppInfo +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.showToastUiCentered +import com.celzero.bravedns.viewmodel.AppConnectionsViewModel +import com.celzero.bravedns.viewmodel.CustomDomainViewModel +import com.celzero.bravedns.viewmodel.CustomIpViewModel +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AppInfoScreen( + uid: Int, + eventLogger: EventLogger, + ipRulesViewModel: CustomIpViewModel, + domainRulesViewModel: CustomDomainViewModel, + networkLogsViewModel: AppConnectionsViewModel, + onBackClick: () -> Unit, + onAppWiseIpLogsClick: (Int, Boolean) -> Unit, + onCustomIpRulesClick: (Int) -> Unit, + onCustomDomainRulesClick: (Int) -> Unit +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + + var appInfo by remember(uid) { mutableStateOf(null) } + var appStatus by remember(uid) { mutableStateOf(FirewallManager.FirewallStatus.NONE) } + var connStatus by remember(uid) { mutableStateOf(FirewallManager.ConnectionStatus.ALLOW) } + var baselineConnStatus by remember(uid) { mutableStateOf(FirewallManager.ConnectionStatus.ALLOW) } + var firewallStatusText by remember(uid) { mutableStateOf("") } + var firewallUpdateVersion by remember(uid) { mutableStateOf(0) } + var isProxyExcluded by remember(uid) { mutableStateOf(false) } + var isTempAllowed by remember(uid) { mutableStateOf(false) } + var proxyDetails by remember(uid) { mutableStateOf("") } + var showNoAppFoundDialog by remember(uid) { mutableStateOf(false) } + + var showDomainRulesSheet by remember { mutableStateOf(false) } + var selectedDomain by remember { mutableStateOf("") } + var showIpRulesSheet by remember { mutableStateOf(false) } + var selectedIp by remember { mutableStateOf("") } + var selectedDomains by remember { mutableStateOf("") } + + var refreshToken by remember(uid) { mutableStateOf(0) } + var closeDialogConn by remember(uid) { mutableStateOf(null) } + + val wireguardAppsProxyMapDesc = stringResource(R.string.wireguard_apps_proxy_map_desc) + val excludeNoPackageErrToast = stringResource(R.string.exclude_no_package_err_toast) + val adaAppStatusBlockMd = stringResource(R.string.ada_app_status_block_md) + val adaAppStatusBlockWifi = stringResource(R.string.ada_app_status_block_wifi) + val adaAppStatusBlock = stringResource(R.string.ada_app_status_block) + val adaAppStatusAllow = stringResource(R.string.ada_app_status_allow) + val adaAppStatusExclude = stringResource(R.string.ada_app_status_exclude) + val adaAppStatusWhitelist = stringResource(R.string.ada_app_status_whitelist) + val adaAppStatusIsolate = stringResource(R.string.ada_app_status_isolate) + val adaAppStatusBypassDnsFirewall = stringResource(R.string.ada_app_status_bypass_dns_firewall) + val adaAppStatusUnknown = stringResource(R.string.ada_app_status_unknown) + val getFirewallStatusText: (FirewallManager.FirewallStatus, FirewallManager.ConnectionStatus) -> String = + { firewallStatus, connectionStatus -> + when (firewallStatus) { + FirewallManager.FirewallStatus.NONE -> { + when (connectionStatus) { + FirewallManager.ConnectionStatus.METERED -> adaAppStatusBlockMd + FirewallManager.ConnectionStatus.UNMETERED -> adaAppStatusBlockWifi + FirewallManager.ConnectionStatus.BOTH -> adaAppStatusBlock + FirewallManager.ConnectionStatus.ALLOW -> adaAppStatusAllow + } + } + FirewallManager.FirewallStatus.EXCLUDE -> adaAppStatusExclude + FirewallManager.FirewallStatus.BYPASS_UNIVERSAL -> adaAppStatusWhitelist + FirewallManager.FirewallStatus.ISOLATE -> adaAppStatusIsolate + FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL -> adaAppStatusBypassDnsFirewall + FirewallManager.FirewallStatus.UNTRACKED -> adaAppStatusUnknown + } + } + + LaunchedEffect(uid) { + if (uid == INVALID_UID) { + showNoAppFoundDialog = true + return@LaunchedEffect + } + ipRulesViewModel.setUid(uid) + domainRulesViewModel.setUid(uid) + networkLogsViewModel.setUid(uid) + loadAppInfo( + uid = uid, + wireguardAppsProxyMapDesc = wireguardAppsProxyMapDesc, + getFirewallStatusText = getFirewallStatusText, + onLoaded = { + appInfo = it.info + appStatus = it.appStatus + connStatus = it.connStatus + if (it.appStatus == FirewallManager.FirewallStatus.NONE) { + baselineConnStatus = it.connStatus + } + isProxyExcluded = it.isProxyExcluded + isTempAllowed = it.isTempAllowed + proxyDetails = it.proxyDetails + firewallStatusText = it.firewallStatusText + }, + onMissing = { showNoAppFoundDialog = true } + ) + } + + // CloseConnsDialog displayed when user long-presses an active connection + closeDialogConn?.let { conn -> + CloseConnsDialog( + conn = conn, + onConfirm = { + closeDialogConn = null + refreshToken++ + }, + onDismiss = { closeDialogConn = null } + ) + } + + if (showNoAppFoundDialog) { + RethinkConfirmDialog( + onDismissRequest = { showNoAppFoundDialog = false }, + title = stringResource(id = R.string.ada_noapp_dialog_title), + message = stringResource(id = R.string.ada_noapp_dialog_message), + confirmText = stringResource(id = R.string.fapps_info_dialog_positive_btn), + onConfirm = { + showNoAppFoundDialog = false + onBackClick() + } + ) + } + + if (showDomainRulesSheet && selectedDomain.isNotEmpty()) { + AppDomainRulesSheet( + uid = uid, + domain = selectedDomain, + eventLogger = eventLogger, + onDismiss = { showDomainRulesSheet = false }, + onUpdated = { refreshToken++ } + ) + } + if (showIpRulesSheet && selectedIp.isNotEmpty()) { + AppIpRulesSheet( + uid = uid, + ipAddress = selectedIp, + domains = selectedDomains, + eventLogger = eventLogger, + onDismiss = { showIpRulesSheet = false }, + onUpdated = { refreshToken++ } + ) + } + + val isRethink = appInfo?.packageName == RETHINK_PACKAGE + val uptime = VpnController.uptimeMs() + val activeConns = + if (isRethink) { + networkLogsViewModel.getRethinkActiveConnsLimited(uptime) + } else { + networkLogsViewModel.fetchTopActiveConnections(uid, uptime) + } + val activeItems = activeConns.asFlow().collectAsLazyPagingItems() + val domainItems = + if (isRethink) { + networkLogsViewModel.getRethinkDomainLogsLimited().asFlow().collectAsLazyPagingItems() + } else { + networkLogsViewModel.getDomainLogsLimited(uid).asFlow().collectAsLazyPagingItems() + } + val ipItems = + if (isRethink) { + networkLogsViewModel.getRethinkIpLogsLimited().asFlow().collectAsLazyPagingItems() + } else { + networkLogsViewModel.getIpLogsLimited(uid).asFlow().collectAsLazyPagingItems() + } + val activePreview = + remember(activeItems.itemSnapshotList.items, refreshToken) { + activeItems.itemSnapshotList.items.take(8) + } + val domainPreview = + remember(domainItems.itemSnapshotList.items, refreshToken) { + domainItems.itemSnapshotList.items.take(8) + } + val ipPreview = + remember(ipItems.itemSnapshotList.items, refreshToken) { + ipItems.itemSnapshotList.items.take(8) + } + val density = LocalDensity.current + val bottomInset = with(density) { WindowInsets.navigationBars.getBottom(density).toDp() } + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + val info = appInfo + val title = info?.appName?.takeIf { it.isNotBlank() } ?: stringResource(id = R.string.bsct_app_info) + val subtitle = info?.packageName?.takeIf { it.isNotBlank() } + val wifiBlocked = + connStatus == FirewallManager.ConnectionStatus.UNMETERED || + connStatus == FirewallManager.ConnectionStatus.BOTH + val mobileBlocked = + connStatus == FirewallManager.ConnectionStatus.METERED || + connStatus == FirewallManager.ConnectionStatus.BOTH + val isIsolated = appStatus == FirewallManager.FirewallStatus.ISOLATE + val isBypassDnsFirewall = appStatus == FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL + val isBypassUniversal = appStatus == FirewallManager.FirewallStatus.BYPASS_UNIVERSAL + val isExcluded = appStatus == FirewallManager.FirewallStatus.EXCLUDE + var appIcon by remember(uid) { mutableStateOf(null) } + + LaunchedEffect(info?.packageName, info?.appName) { + if (info == null) { + appIcon = null + return@LaunchedEffect + } + appIcon = + withContext(Dispatchers.IO) { + Utilities.getIcon(context, info.packageName, info.appName) + } + } + + fun applyFirewallRule( + firewallStatus: FirewallManager.FirewallStatus, + connectionStatus: FirewallManager.ConnectionStatus + ) { + val requestVersion = firewallUpdateVersion + 1 + firewallUpdateVersion = requestVersion + + // Optimistic update to keep UI deterministic and avoid stale rapid-tap states. + val optimisticText = getFirewallStatusText(firewallStatus, connectionStatus) + firewallStatusText = optimisticText + appStatus = firewallStatus + connStatus = connectionStatus + if (firewallStatus == FirewallManager.FirewallStatus.NONE) { + baselineConnStatus = connectionStatus + } + + updateFirewallStatus( + scope = scope, + context = context, + uid = uid, + appInfo = info, + aStat = firewallStatus, + cStat = connectionStatus, + eventLogger = eventLogger, + excludeNoPackageErrToast = excludeNoPackageErrToast, + getFirewallStatusText = getFirewallStatusText + ) { statusText, updatedAppStatus, updatedConnStatus -> + if (requestVersion != firewallUpdateVersion) return@updateFirewallStatus + firewallStatusText = statusText + appStatus = updatedAppStatus + connStatus = updatedConnStatus + if (updatedAppStatus == FirewallManager.FirewallStatus.NONE) { + baselineConnStatus = updatedConnStatus + } + } + } + + fun toggleExclusiveStatus(target: FirewallManager.FirewallStatus) { + val turningOff = appStatus == target + if (!turningOff && appStatus == FirewallManager.FirewallStatus.NONE) { + baselineConnStatus = connStatus + } + val nextStatus = + if (turningOff) { + FirewallManager.FirewallStatus.NONE + } else { + target + } + val nextConnStatus = + if (nextStatus == FirewallManager.FirewallStatus.NONE) { + baselineConnStatus + } else { + FirewallManager.ConnectionStatus.ALLOW + } + applyFirewallRule(nextStatus, nextConnStatus) + } + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + contentWindowInsets = WindowInsets(0, 0, 0, 0), + topBar = { + RethinkLargeTopBar( + title = title, + subtitle = subtitle, + onBackClick = onBackClick, + scrollBehavior = scrollBehavior, + titleLeading = { + val iconPainter = + rememberDrawablePainter(appIcon ?: Utilities.getDefaultIcon(context)) + iconPainter?.let { painter -> + Image( + painter = painter, + contentDescription = null, + modifier = + Modifier + .size(Dimensions.iconSizeXl) + .clip(RoundedCornerShape(Dimensions.cornerRadiusMd)) + ) + } + } + ) + } + ) { paddingValues -> + LazyColumn( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues), + contentPadding = + PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = Dimensions.screenPaddingHorizontal + bottomInset + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + if (info == null) { + item { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadius2xl), + color = MaterialTheme.colorScheme.surfaceContainerLow + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(20.dp), + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + CompactEmptyState(message = stringResource(id = R.string.ada_noapp_dialog_message)) + RethinkActionListItem( + title = stringResource(id = R.string.ada_noapp_dialog_positive), + iconRes = R.drawable.ic_arrow_back_24, + position = CardPosition.Single, + onClick = onBackClick + ) + } + } + } + return@LazyColumn + } + + item { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadius3xl), + color = MaterialTheme.colorScheme.surfaceContainerLow + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = 14.dp, vertical = 14.dp), + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + Text( + text = stringResource(id = R.string.lbl_status), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Row( + horizontalArrangement = Arrangement.spacedBy(6.dp), + verticalAlignment = Alignment.CenterVertically + ) { + AppInfoStatusBadge( + label = firewallStatusText, + active = true + ) + if (isTempAllowed) { + AppInfoStatusBadge( + label = stringResource(id = R.string.temp_allow_label), + active = true + ) + } + } + if (proxyDetails.isNotBlank()) { + Text( + text = proxyDetails, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } + } + + item { SectionHeader(title = stringResource(id = R.string.lbl_firewall)) } + item { + AppFirewallPairRow( + leftTitle = stringResource(id = R.string.ada_app_unmetered), + leftDescription = stringResource(id = R.string.firewall_status_block_unmetered), + leftEnabled = wifiBlocked, + leftAllowedIcon = Icons.Rounded.Wifi, + leftBlockedIcon = Icons.Rounded.WifiOff, + onLeftClick = { + val newConnStatus = + when (connStatus) { + FirewallManager.ConnectionStatus.UNMETERED -> FirewallManager.ConnectionStatus.ALLOW + FirewallManager.ConnectionStatus.BOTH -> FirewallManager.ConnectionStatus.METERED + FirewallManager.ConnectionStatus.METERED -> FirewallManager.ConnectionStatus.BOTH + FirewallManager.ConnectionStatus.ALLOW -> FirewallManager.ConnectionStatus.UNMETERED + } + applyFirewallRule(FirewallManager.FirewallStatus.NONE, newConnStatus) + }, + rightTitle = stringResource(id = R.string.lbl_mobile_data), + rightDescription = stringResource(id = R.string.firewall_status_block_metered), + rightEnabled = mobileBlocked, + rightAllowedIcon = Icons.Rounded.PhoneAndroid, + rightBlockedIcon = Icons.Rounded.MobileOff, + onRightClick = { + val newConnStatus = + when (connStatus) { + FirewallManager.ConnectionStatus.METERED -> FirewallManager.ConnectionStatus.ALLOW + FirewallManager.ConnectionStatus.UNMETERED -> FirewallManager.ConnectionStatus.BOTH + FirewallManager.ConnectionStatus.BOTH -> FirewallManager.ConnectionStatus.UNMETERED + FirewallManager.ConnectionStatus.ALLOW -> FirewallManager.ConnectionStatus.METERED + } + applyFirewallRule(FirewallManager.FirewallStatus.NONE, newConnStatus) + } + ) + } + item { + RethinkListGroup { + RethinkActionListItem( + title = stringResource(id = R.string.ada_app_isolate), + description = stringResource(id = R.string.firewall_status_isolate), + iconRes = R.drawable.ic_firewall_lockdown_off, + accentColor = MaterialTheme.colorScheme.error, + position = cardPositionFor(0, 3), + trailing = { + AppInfoStatusBadge( + label = + stringResource( + id = if (isIsolated) R.string.lbbs_enabled else R.string.lbl_disabled + ), + active = isIsolated + ) + }, + onClick = { + toggleExclusiveStatus(FirewallManager.FirewallStatus.ISOLATE) + } + ) + RethinkActionListItem( + title = stringResource(id = R.string.ada_app_bypass_dns_firewall), + description = stringResource(id = R.string.firewall_status_bypass_dns_firewall), + iconRes = R.drawable.ic_bypass_dns_firewall_off, + accentColor = MaterialTheme.colorScheme.tertiary, + position = cardPositionFor(1, 3), + trailing = { + AppInfoStatusBadge( + label = + stringResource( + id = if (isBypassDnsFirewall) R.string.lbbs_enabled else R.string.lbl_disabled + ), + active = isBypassDnsFirewall + ) + }, + onClick = { + toggleExclusiveStatus(FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL) + } + ) + RethinkActionListItem( + title = stringResource(id = R.string.ada_app_bypass_univ), + description = stringResource(id = R.string.firewall_status_whitelisted), + iconRes = R.drawable.ic_firewall_bypass_off, + accentColor = MaterialTheme.colorScheme.tertiary, + position = cardPositionFor(2, 3), + trailing = { + AppInfoStatusBadge( + label = + stringResource( + id = if (isBypassUniversal) R.string.lbbs_enabled else R.string.lbl_disabled + ), + active = isBypassUniversal + ) + }, + onClick = { + toggleExclusiveStatus(FirewallManager.FirewallStatus.BYPASS_UNIVERSAL) + } + ) + RethinkActionListItem( + title = stringResource(id = R.string.ada_app_exclude), + description = stringResource(id = R.string.firewall_status_excluded), + iconRes = R.drawable.ic_firewall_exclude_off, + accentColor = MaterialTheme.colorScheme.secondary, + position = cardPositionFor(3, 3), + trailing = { + AppInfoStatusBadge( + label = + stringResource( + id = if (isExcluded) R.string.lbbs_enabled else R.string.lbl_disabled + ), + active = isExcluded + ) + }, + onClick = { + toggleExclusiveStatus(FirewallManager.FirewallStatus.EXCLUDE) + } + ) + } + } + + item { SectionHeader(title = stringResource(id = R.string.lbl_advanced)) } + item { + RethinkListGroup { + RethinkToggleListItem( + title = stringResource(id = R.string.exclude_apps_from_proxy), + description = stringResource(id = R.string.settings_exclude_proxy_apps_desc), + checked = isProxyExcluded, + onCheckedChange = { enabled -> + isProxyExcluded = enabled + scope.launch(Dispatchers.IO) { + FirewallManager.updateIsProxyExcluded(uid, enabled) + } + }, + iconRes = R.drawable.ic_proxy, + accentColor = MaterialTheme.colorScheme.secondary, + position = cardPositionFor(0, 1) + ) + RethinkToggleListItem( + title = stringResource(id = R.string.temp_allow_label), + description = stringResource(id = R.string.temp_allow_desc), + checked = isTempAllowed, + onCheckedChange = { enabled -> + isTempAllowed = enabled + scope.launch(Dispatchers.IO) { + FirewallManager.updateTempAllow(uid, enabled) + } + }, + iconRes = R.drawable.ic_timeout, + accentColor = MaterialTheme.colorScheme.tertiary, + position = cardPositionFor(1, 1) + ) + } + } + + item { SectionHeader(title = stringResource(id = R.string.lbl_rules)) } + item { + RethinkListGroup { + RethinkActionListItem( + title = stringResource(id = R.string.about_settings_app_info), + iconRes = R.drawable.ic_app_info, + position = cardPositionFor(0, 2), + trailing = { + Icon( + painter = painterResource(id = R.drawable.ic_right_arrow_small), + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + }, + onClick = { openAndroidAppInfo(context, info.packageName) } + ) + RethinkActionListItem( + title = stringResource(id = R.string.lbl_ip_rules), + iconRes = R.drawable.ic_ip_info, + position = cardPositionFor(1, 2), + trailing = { + Icon( + painter = painterResource(id = R.drawable.ic_right_arrow_small), + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + }, + onClick = { onCustomIpRulesClick(uid) } + ) + RethinkActionListItem( + title = stringResource(id = R.string.lbl_domain_rules), + iconRes = R.drawable.ic_dns_rules_as_firewall, + position = cardPositionFor(2, 2), + trailing = { + Icon( + painter = painterResource(id = R.drawable.ic_right_arrow_small), + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + }, + onClick = { onCustomDomainRulesClick(uid) } + ) + } + } + + item { + LogSectionCard( + title = stringResource(id = R.string.top_active_conns), + badgeCount = activeItems.itemCount, + onClick = { onAppWiseIpLogsClick(uid, false) } + ) { + if (activeItems.loadState.refresh is LoadState.Loading && activeItems.itemCount == 0) { + CompactEmptyState(message = stringResource(id = R.string.lbl_loading)) + } else if (activeItems.itemCount == 0) { + CompactEmptyState(message = stringResource(id = R.string.fapps_empty_subtitle)) + } else { + AppInfoLogPreviewList( + items = activePreview, + title = { beautifyCommaSeparated(it.ipAddress) }, + subtitle = { beautifyCommaSeparated(it.appOrDnsName) }, + onClick = { closeDialogConn = it } + ) + } + } + } + + item { + LogSectionCard( + title = stringResource(id = R.string.ssv_most_contacted_domain_heading), + badgeCount = domainItems.itemCount, + onClick = { onAppWiseIpLogsClick(uid, false) } + ) { + if (domainItems.loadState.refresh is LoadState.Loading && domainItems.itemCount == 0) { + CompactEmptyState(message = stringResource(id = R.string.lbl_loading)) + } else if (domainItems.itemCount == 0) { + CompactEmptyState(message = stringResource(id = R.string.fapps_empty_subtitle)) + } else { + AppInfoLogPreviewList( + items = domainPreview, + title = { + val domain = beautifyCommaSeparated(it.appOrDnsName) + if (domain.isNotBlank()) domain else beautifyCommaSeparated(it.ipAddress) + }, + subtitle = { + val ip = beautifyCommaSeparated(it.ipAddress) + ip.takeIf { value -> value.isNotBlank() && value != beautifyCommaSeparated(it.appOrDnsName) } + }, + onClick = { + selectedDomain = it.appOrDnsName.orEmpty() + showDomainRulesSheet = true + } + ) + } + } + } + + item { + LogSectionCard( + title = stringResource(id = R.string.ssv_most_contacted_ips_heading), + badgeCount = ipItems.itemCount, + onClick = { onAppWiseIpLogsClick(uid, false) } + ) { + if (ipItems.loadState.refresh is LoadState.Loading && ipItems.itemCount == 0) { + CompactEmptyState(message = stringResource(id = R.string.lbl_loading)) + } else if (ipItems.itemCount == 0) { + CompactEmptyState(message = stringResource(id = R.string.fapps_empty_subtitle)) + } else { + AppInfoLogPreviewList( + items = ipPreview, + title = { beautifyCommaSeparated(it.ipAddress) }, + subtitle = { beautifyCommaSeparated(it.appOrDnsName) }, + onClick = { + selectedIp = it.ipAddress + selectedDomains = it.appOrDnsName.orEmpty() + showIpRulesSheet = true + } + ) + } + } + } + + item { Spacer(modifier = Modifier.height(Dimensions.spacingSm)) } + } + } +} + +@Composable +private fun AppInfoStatusBadge( + label: String, + active: Boolean +) { + Surface( + shape = RoundedCornerShape(100.dp), + color = + if (active) MaterialTheme.colorScheme.primaryContainer + else MaterialTheme.colorScheme.surfaceContainerHighest + ) { + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + color = + if (active) MaterialTheme.colorScheme.onPrimaryContainer + else MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(horizontal = 8.dp, vertical = 3.dp), + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } +} + +@Composable +private fun AppFirewallPairRow( + leftTitle: String, + leftDescription: String, + leftEnabled: Boolean, + leftAllowedIcon: androidx.compose.ui.graphics.vector.ImageVector, + leftBlockedIcon: androidx.compose.ui.graphics.vector.ImageVector, + onLeftClick: () -> Unit, + rightTitle: String, + rightDescription: String, + rightEnabled: Boolean, + rightAllowedIcon: androidx.compose.ui.graphics.vector.ImageVector, + rightBlockedIcon: androidx.compose.ui.graphics.vector.ImageVector, + onRightClick: () -> Unit +) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(2.dp) + ) { + AppFirewallTile( + modifier = Modifier.weight(1f), + title = leftTitle, + description = leftDescription, + enabled = leftEnabled, + allowedIcon = leftAllowedIcon, + blockedIcon = leftBlockedIcon, + shape = RoundedCornerShape(topStart = 22.dp, topEnd = 8.dp, bottomStart = 22.dp, bottomEnd = 8.dp), + onClick = onLeftClick + ) + AppFirewallTile( + modifier = Modifier.weight(1f), + title = rightTitle, + description = rightDescription, + enabled = rightEnabled, + allowedIcon = rightAllowedIcon, + blockedIcon = rightBlockedIcon, + shape = RoundedCornerShape(topStart = 8.dp, topEnd = 22.dp, bottomStart = 8.dp, bottomEnd = 22.dp), + onClick = onRightClick + ) + } +} + +@Composable +private fun AppFirewallTile( + modifier: Modifier = Modifier, + title: String, + description: String, + enabled: Boolean, + allowedIcon: androidx.compose.ui.graphics.vector.ImageVector, + blockedIcon: androidx.compose.ui.graphics.vector.ImageVector, + shape: RoundedCornerShape, + onClick: () -> Unit +) { + val blockedTint = MaterialTheme.colorScheme.error + val allowedTint = MaterialTheme.colorScheme.onSurfaceVariant + Surface( + modifier = modifier, + shape = shape, + color = MaterialTheme.colorScheme.surfaceContainerLow, + onClick = onClick + ) { + Column( + modifier = Modifier.padding(horizontal = 12.dp, vertical = 12.dp), + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + Box( + modifier = + Modifier + .size(28.dp), + contentAlignment = Alignment.Center + ) { + DiagonalWipeIcon( + blocked = enabled, + allowedIcon = allowedIcon, + blockedIcon = blockedIcon, + allowedTint = allowedTint, + blockedTint = blockedTint, + contentDescription = title, + modifier = Modifier.size(22.dp) + ) + } + Text( + text = title, + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + text = description, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 2, + overflow = TextOverflow.Ellipsis + ) + AppInfoStatusBadge( + label = stringResource(id = if (enabled) R.string.lbbs_enabled else R.string.lbl_disabled), + active = enabled + ) + } + } +} + +@Composable +private fun LogSectionCard( + title: String, + badgeCount: Int = 0, + onClick: () -> Unit, + content: @Composable () -> Unit +) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadius3xl), + color = MaterialTheme.colorScheme.surfaceContainerLow + ) { + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .clickable(onClick = onClick) + .padding(horizontal = 14.dp, vertical = 10.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Row( + modifier = Modifier.weight(1f), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Text( + text = title, + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + if (badgeCount > 0) { + AppInfoStatusBadge( + label = badgeCount.toString(), + active = true + ) + } + } + Icon( + painter = painterResource(id = R.drawable.ic_right_arrow_small), + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + Box( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = 6.dp, vertical = 6.dp) + ) { + content() + } + } + } +} + +@Composable +private fun AppInfoLogPreviewList( + items: List, + title: (AppConnection) -> String, + subtitle: (AppConnection) -> String?, + onClick: (AppConnection) -> Unit +) { + RethinkListGroup { + items.forEachIndexed { index, conn -> + AppInfoLogPreviewRow( + title = title(conn), + subtitle = subtitle(conn), + count = conn.count, + flag = conn.flag, + position = cardPositionFor(index, items.lastIndex), + onClick = { onClick(conn) } + ) + } + } +} + +@Composable +private fun AppInfoLogPreviewRow( + title: String, + subtitle: String?, + count: Int, + flag: String, + position: CardPosition, + onClick: () -> Unit +) { + RethinkListItem( + headline = title.ifBlank { "-" }, + supporting = subtitle?.takeIf { it.isNotBlank() }, + position = position, + leadingContent = { + Surface( + shape = RoundedCornerShape(12.dp), + color = MaterialTheme.colorScheme.surfaceContainerHighest, + modifier = Modifier.size(34.dp) + ) { + Box(contentAlignment = Alignment.Center) { + Text( + text = flag.takeIf { it.isNotBlank() } ?: "\u2022", + style = MaterialTheme.typography.titleSmall + ) + } + } + }, + trailing = { + AppInfoStatusBadge( + label = count.toString(), + active = false + ) + }, + onClick = onClick + ) +} + +private fun beautifyCommaSeparated(value: String?): String { + if (value.isNullOrBlank()) return "" + return value + .split(",") + .map { it.trim() } + .filter { it.isNotBlank() } + .joinToString(", ") +} + +private data class AppInfoLoad( + val info: AppInfo, + val appStatus: FirewallManager.FirewallStatus, + val connStatus: FirewallManager.ConnectionStatus, + val isProxyExcluded: Boolean, + val isTempAllowed: Boolean, + val proxyDetails: String, + val firewallStatusText: String +) + +private suspend fun loadAppInfo( + uid: Int, + wireguardAppsProxyMapDesc: String, + getFirewallStatusText: (FirewallManager.FirewallStatus, FirewallManager.ConnectionStatus) -> String, + onLoaded: (AppInfoLoad) -> Unit, + onMissing: () -> Unit +) { + val info = withContext(Dispatchers.IO) { FirewallManager.getAppInfoByUid(uid) } + if (info == null || uid == INVALID_UID || info.tombstoneTs > 0) { + onMissing() + return + } + val status = FirewallManager.appStatus(info.uid) + val conn = FirewallManager.connectionStatus(info.uid) + val proxy = + ProxyManager.getProxyIdForApp(uid).takeIf { it.isNotEmpty() && it != ID_NONE } + ?.let { wireguardAppsProxyMapDesc.format(it) } + .orEmpty() + val firewallStatusText = getFirewallStatusText(status, conn) + onLoaded( + AppInfoLoad( + info = info, + appStatus = status, + connStatus = conn, + isProxyExcluded = info.isProxyExcluded, + isTempAllowed = FirewallManager.isTempAllowed(info.uid), + proxyDetails = proxy, + firewallStatusText = firewallStatusText + ) + ) +} + +private fun updateFirewallStatus( + scope: CoroutineScope, + context: Context, + uid: Int, + appInfo: AppInfo?, + aStat: FirewallManager.FirewallStatus, + cStat: FirewallManager.ConnectionStatus, + eventLogger: EventLogger, + excludeNoPackageErrToast: String, + getFirewallStatusText: (FirewallManager.FirewallStatus, FirewallManager.ConnectionStatus) -> String, + onUpdated: (String, FirewallManager.FirewallStatus, FirewallManager.ConnectionStatus) -> Unit +) { + val info = appInfo ?: return + if (aStat == FirewallManager.FirewallStatus.EXCLUDE && FirewallManager.isUnknownPackage(uid)) { + showToastUiCentered(context, excludeNoPackageErrToast, Toast.LENGTH_LONG) + return + } + scope.launch(Dispatchers.IO) { + FirewallManager.updateFirewallStatus(info.uid, aStat, cStat) + val statusText = getFirewallStatusText(aStat, cStat) + withContext(Dispatchers.Main) { + onUpdated(statusText, aStat, cStat) + } + eventLogger.log( + type = EventType.FW_RULE_MODIFIED, + severity = Severity.LOW, + message = "Firewall status changed", + source = EventSource.MANAGER, + userAction = true, + details = "Firewall status changed for ${info.appName} (${info.uid}), new status: $aStat, conn status: $cStat" + ) + } +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/compose/dns/DnsDetailScreen.kt b/app/src/full/java/com/celzero/bravedns/ui/compose/dns/DnsDetailScreen.kt new file mode 100644 index 000000000..fd4cea8b1 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/compose/dns/DnsDetailScreen.kt @@ -0,0 +1,1165 @@ +/* + * Copyright 2020 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.dns + + +import Logger +import Logger.LOG_TAG_DNS +import android.content.Context +import android.net.Uri +import android.widget.Toast +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material3.Checkbox +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver +import androidx.lifecycle.asFlow +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.compose.LocalLifecycleOwner +import androidx.work.WorkInfo +import androidx.work.WorkManager +import com.celzero.bravedns.R +import com.celzero.bravedns.customdownloader.LocalBlocklistCoordinator +import com.celzero.bravedns.data.AppConfig.Companion.DOH_INDEX +import com.celzero.bravedns.data.AppConfig.Companion.DOT_INDEX +import com.celzero.bravedns.download.AppDownloadManager +import com.celzero.bravedns.download.DownloadConstants +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.ui.bottomsheet.RuleSheetModal +import com.celzero.bravedns.ui.bottomsheet.RuleSheetSummaryPill +import com.celzero.bravedns.ui.compose.theme.RethinkActionListItem +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetCard +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkMultiActionDialog +import com.celzero.bravedns.ui.compose.theme.RethinkTwoOptionSegmentedRow +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.util.Constants +import com.celzero.bravedns.util.Constants.Companion.INIT_TIME_MS +import com.celzero.bravedns.util.Constants.Companion.LOCAL_BLOCKLIST_DOWNLOAD_FOLDER_NAME +import com.celzero.bravedns.util.Constants.Companion.RETHINK_SEARCH_URL +import com.celzero.bravedns.util.ResourceRecordTypes +import com.celzero.bravedns.util.UIUtils +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.blocklistCanonicalPath +import com.celzero.bravedns.util.Utilities.convertLongToTime +import com.celzero.bravedns.util.Utilities.deleteRecursive +import com.celzero.bravedns.util.Utilities.tos +import com.celzero.firestack.backend.Backend +import io.github.aakira.napier.Napier +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File + +/** + * DNS Detail Screen - A composable screen that shows DNS settings and configuration. + * This is the Compose equivalent of DnsDetailActivity. + * + * @param viewModel The DnsSettingsViewModel for managing DNS settings state + * @param persistentState The PersistentState for accessing app preferences + * @param appDownloadManager The AppDownloadManager for handling blocklist downloads + * @param onCustomDnsClick Callback when custom DNS is clicked (navigates to DNS list) + * @param onRethinkPlusDnsClick Callback when Rethink Plus DNS is clicked + * @param onLocalBlocklistConfigureClick Callback when local blocklist configure is clicked + * @param onBackClick Optional callback for back navigation + */ +@Composable +fun DnsDetailScreen( + viewModel: DnsSettingsViewModel, + persistentState: PersistentState, + appDownloadManager: AppDownloadManager, + initialFocusKey: String? = null, + onCustomDnsClick: () -> Unit, + onRethinkPlusDnsClick: () -> Unit, + onLocalBlocklistConfigureClick: () -> Unit, + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val lifecycleOwner = LocalLifecycleOwner.current + val scope = rememberCoroutineScope() + + val uiState by viewModel.uiState.collectAsStateWithLifecycle() + + // Dialog/Sheet state + var showRecordTypesSheet by remember { mutableStateOf(false) } + var showSystemDnsDialog by remember { mutableStateOf(false) } + var systemDnsDialogText by remember { mutableStateOf("") } + var showSmartDnsDialog by remember { mutableStateOf(false) } + var smartDnsDialogText by remember { mutableStateOf("") } + var showLocalBlocklistsSheet by remember { mutableStateOf(false) } + + // Local blocklist state + var showDownloadDialog by remember { mutableStateOf(false) } + var downloadDialogIsRedownload by remember { mutableStateOf(false) } + var showDeleteDialog by remember { mutableStateOf(false) } + var showLockdownDialog by remember { mutableStateOf(false) } + + var headingText by remember { mutableStateOf("") } + var versionText by remember { mutableStateOf("") } + var canConfigure by remember { mutableStateOf(false) } + var canCopy by remember { mutableStateOf(false) } + var canSearch by remember { mutableStateOf(false) } + var showCheckDownload by remember { mutableStateOf(true) } + var showDownload by remember { mutableStateOf(false) } + var showRedownload by remember { mutableStateOf(false) } + var isChecking by remember { mutableStateOf(false) } + var isDownloading by remember { mutableStateOf(false) } + var isRedownloading by remember { mutableStateOf(false) } + val localBlocklistInUseText = stringResource( + R.string.settings_local_blocklist_in_use, + persistentState.numberOfLocalBlocklists.toString(), + ) + val localBlocklistHeadingText = stringResource(R.string.lbbs_heading) + val localBlocklistVersionText = + if (persistentState.localBlocklistTimestamp == INIT_TIME_MS) { + "" + } else { + stringResource( + R.string.settings_local_blocklist_version, + convertLongToTime( + persistentState.localBlocklistTimestamp, + Constants.TIME_FORMAT_2, + ), + ) + } + val blocklistUpdateFailureText = stringResource(R.string.blocklist_update_check_failure) + val blocklistUpdateNotRequiredText = stringResource(R.string.blocklist_update_check_not_required) + val blocklistNotAvailableToastText = stringResource(R.string.blocklist_not_available_toast) + val configAddSuccessToastText = stringResource(R.string.config_add_success_toast) + val ssvToastStartRethinkText = stringResource(R.string.ssv_toast_start_rethink) + val smartDnsDescriptionText = stringResource(R.string.smart_dns_desc) + val symbolStarText = stringResource(R.string.symbol_star) + val copyClipboardLabelText = stringResource(R.string.copy_clipboard_label) + val infoDialogUrlCopyToastText = stringResource(R.string.info_dialog_url_copy_toast_msg) + val infoDialogRethinkToastText = stringResource(R.string.info_dialog_rethink_toast_msg) + // Helper functions for local blocklist UI state + fun showCheckUpdateUi() { + showCheckDownload = true + showDownload = false + showRedownload = false + isChecking = false + isDownloading = false + isRedownloading = false + } + + fun showUpdateUi() { + showCheckDownload = false + showDownload = true + showRedownload = false + isChecking = false + isDownloading = false + isRedownloading = false + } + + fun showRedownloadUi() { + showCheckDownload = false + showDownload = false + showRedownload = true + isChecking = false + isDownloading = false + isRedownloading = false + } + + fun enableBlocklistUi() { + headingText = localBlocklistInUseText + canConfigure = true + canCopy = true + canSearch = true + } + + fun disableBlocklistUi() { + headingText = localBlocklistHeadingText + canConfigure = false + canCopy = false + canSearch = false + } + + fun updateLocalBlocklistUi() { + if (Utilities.isPlayStoreFlavour()) { + return + } + + if (persistentState.blocklistEnabled) { + enableBlocklistUi() + return + } + + disableBlocklistUi() + } + + fun initLocalBlocklistVersion() { + if (persistentState.localBlocklistTimestamp == INIT_TIME_MS) { + showCheckUpdateUi() + versionText = "" + return + } + + versionText = localBlocklistVersionText + + if (persistentState.newestRemoteBlocklistTimestamp == INIT_TIME_MS) { + showCheckUpdateUi() + return + } + + if (persistentState.newestLocalBlocklistTimestamp > persistentState.localBlocklistTimestamp) { + showUpdateUi() + return + } + + showCheckUpdateUi() + } + + fun handleDownloadStatus(status: AppDownloadManager.DownloadManagerStatus) { + when (status) { + AppDownloadManager.DownloadManagerStatus.IN_PROGRESS -> { + isChecking = true + } + AppDownloadManager.DownloadManagerStatus.STARTED -> { + isChecking = true + } + AppDownloadManager.DownloadManagerStatus.NOT_STARTED -> { + // no-op + } + AppDownloadManager.DownloadManagerStatus.SUCCESS -> { + showUpdateUi() + isChecking = false + isDownloading = false + isRedownloading = false + appDownloadManager.downloadRequired.postValue( + AppDownloadManager.DownloadManagerStatus.NOT_STARTED + ) + } + AppDownloadManager.DownloadManagerStatus.FAILURE -> { + isChecking = false + isDownloading = false + isRedownloading = false + Utilities.showToastUiCentered( + context, + blocklistUpdateFailureText, + Toast.LENGTH_SHORT + ) + appDownloadManager.downloadRequired.postValue( + AppDownloadManager.DownloadManagerStatus.NOT_STARTED + ) + } + AppDownloadManager.DownloadManagerStatus.NOT_REQUIRED -> { + showRedownloadUi() + isChecking = false + Utilities.showToastUiCentered( + context, + blocklistUpdateNotRequiredText, + Toast.LENGTH_SHORT + ) + appDownloadManager.downloadRequired.postValue( + AppDownloadManager.DownloadManagerStatus.NOT_STARTED + ) + } + AppDownloadManager.DownloadManagerStatus.NOT_AVAILABLE -> { + Utilities.showToastUiCentered( + context, + blocklistNotAvailableToastText, + Toast.LENGTH_SHORT + ) + } + } + } + + fun dismissLocalBlocklistsSheet() { + showLocalBlocklistsSheet = false + viewModel.updateUiState() + } + + fun proceedWithDownload(isRedownload: Boolean) { + scope.launch(Dispatchers.Main) { + var status = AppDownloadManager.DownloadManagerStatus.NOT_STARTED + isDownloading = !isRedownload + isRedownloading = isRedownload + val currentTs = persistentState.localBlocklistTimestamp + withContext(Dispatchers.IO) { + status = appDownloadManager.downloadLocalBlocklist(currentTs, isRedownload) + } + handleDownloadStatus(status) + } + } + + fun downloadLocalBlocklist(isRedownload: Boolean) { + if (VpnController.isVpnLockdown() && !persistentState.useCustomDownloadManager) { + showLockdownDialog = true + return + } + proceedWithDownload(isRedownload) + } + + fun deleteLocalBlocklist() { + scope.launch(Dispatchers.Main) { + withContext(Dispatchers.IO) { + val path = blocklistCanonicalPath(context, LOCAL_BLOCKLIST_DOWNLOAD_FOLDER_NAME) + val dir = File(path) + deleteRecursive(dir) + persistentState.localBlocklistTimestamp = INIT_TIME_MS + persistentState.localBlocklistStamp = "" + persistentState.newestLocalBlocklistTimestamp = INIT_TIME_MS + } + + updateLocalBlocklistUi() + showCheckUpdateUi() + Utilities.showToastUiCentered( + context, + configAddSuccessToastText, + Toast.LENGTH_SHORT + ) + } + } + + fun isBlocklistUpdateAvailable() { + scope.launch(Dispatchers.IO) { + appDownloadManager.isDownloadRequired( + com.celzero.bravedns.service.RethinkBlocklistManager.DownloadType.LOCAL + ) + } + } + + fun isLocalBlocklistStampAvailable(): Boolean { + return persistentState.localBlocklistStamp.isNotEmpty() + } + + fun setBraveDnsLocal() { + persistentState.blocklistEnabled = true + } + + fun removeBraveDnsLocal() { + persistentState.blocklistEnabled = false + } + + fun enableBlocklist() { + if (persistentState.blocklistEnabled) { + removeBraveDnsLocal() + updateLocalBlocklistUi() + return + } + + if (!VpnController.hasTunnel()) { + Utilities.showToastUiCentered( + context, + ssvToastStartRethinkText, + Toast.LENGTH_SHORT + ) + return + } + + scope.launch(Dispatchers.Main) { + val blocklistsExist = withContext(Dispatchers.Default) { + Utilities.hasLocalBlocklists( + context, + persistentState.localBlocklistTimestamp + ) + } + + if (blocklistsExist) { + setBraveDnsLocal() + if (isLocalBlocklistStampAvailable()) { + updateLocalBlocklistUi() + } else { + dismissLocalBlocklistsSheet() + onLocalBlocklistConfigureClick() + } + } else { + dismissLocalBlocklistsSheet() + onLocalBlocklistConfigureClick() + } + } + } + + fun invokeLocalBlocklistActivity() { + if (!VpnController.hasTunnel()) { + Utilities.showToastUiCentered( + context, + ssvToastStartRethinkText, + Toast.LENGTH_SHORT + ) + return + } + + dismissLocalBlocklistsSheet() + onLocalBlocklistConfigureClick() + } + + fun openLocalBlocklist() { + updateLocalBlocklistUi() + initLocalBlocklistVersion() + showLocalBlocklistsSheet = true + } + + fun showSystemDnsDialog(dns: String) { + systemDnsDialogText = dns + showSystemDnsDialog = true + } + + fun showSmartDnsInfoDialog() { + scope.launch(Dispatchers.IO) { + val ids = VpnController.getPlusResolvers() + val dnsList: MutableList = mutableListOf() + ids.forEach { + val index = it.substringAfter(Backend.Plus).getOrNull(0) + if (index == null) { + Logger.w(LOG_TAG_DNS, "smart(plus) dns resolver id is empty: $it") + return@forEach + } + if (index != DOH_INDEX && index != DOT_INDEX) { + Logger.w(LOG_TAG_DNS, "smart(plus) dns resolver id is not doh or dot: $it") + return@forEach + } + val transport = VpnController.getPlusTransportById(it) + val address = transport?.addr?.tos() ?: "" + if (address.isNotEmpty()) dnsList.add(address) + } + + Logger.i(LOG_TAG_DNS, "smart(plus) dns list size: ${dnsList.size}") + withContext(Dispatchers.Main) { + val stringBuilder = StringBuilder() + val desc = smartDnsDescriptionText + stringBuilder.append(desc).append("\n\n") + dnsList.forEach { + val txt = "$symbolStarText $it" + stringBuilder.append(txt).append("\n") + } + smartDnsDialogText = stringBuilder.toString() + showSmartDnsDialog = true + } + } + } + + // Initialize local blocklist state + LaunchedEffect(Unit) { + updateLocalBlocklistUi() + initLocalBlocklistVersion() + } + + val workManager = WorkManager.getInstance(context) + val downloadRequiredStatus by appDownloadManager.downloadRequired + .asFlow() + .collectAsStateWithLifecycle(initialValue = AppDownloadManager.DownloadManagerStatus.NOT_STARTED) + val customDownloadWorkInfos by workManager + .getWorkInfosByTagLiveData(LocalBlocklistCoordinator.CUSTOM_DOWNLOAD) + .asFlow() + .collectAsStateWithLifecycle(initialValue = emptyList()) + val downloadTagWorkInfos by workManager + .getWorkInfosByTagLiveData(DownloadConstants.DOWNLOAD_TAG) + .asFlow() + .collectAsStateWithLifecycle(initialValue = emptyList()) + val fileTagWorkInfos by workManager + .getWorkInfosByTagLiveData(DownloadConstants.FILE_TAG) + .asFlow() + .collectAsStateWithLifecycle(initialValue = emptyList()) + + LaunchedEffect(downloadRequiredStatus) { + Napier.i("Check for blocklist update, status: $downloadRequiredStatus") + if (downloadRequiredStatus != AppDownloadManager.DownloadManagerStatus.NOT_STARTED) { + handleDownloadStatus(downloadRequiredStatus) + } + } + + LaunchedEffect(customDownloadWorkInfos) { + val workInfo = customDownloadWorkInfos.getOrNull(0) ?: return@LaunchedEffect + Napier.i("WorkManager state: ${workInfo.state} for ${LocalBlocklistCoordinator.CUSTOM_DOWNLOAD}") + if (workInfo.state == WorkInfo.State.ENQUEUED || workInfo.state == WorkInfo.State.RUNNING) { + isDownloading = true + } else if (workInfo.state == WorkInfo.State.SUCCEEDED) { + isDownloading = false + showUpdateUi() + workManager.pruneWork() + } else if (workInfo.state == WorkInfo.State.CANCELLED || workInfo.state == WorkInfo.State.FAILED) { + isDownloading = false + Utilities.showToastUiCentered( + context, + blocklistUpdateFailureText, + Toast.LENGTH_SHORT + ) + workManager.pruneWork() + workManager.cancelAllWorkByTag(LocalBlocklistCoordinator.CUSTOM_DOWNLOAD) + } + } + + LaunchedEffect(downloadTagWorkInfos) { + val workInfo = downloadTagWorkInfos.getOrNull(0) ?: return@LaunchedEffect + Napier.i("WorkManager state: ${workInfo.state} for ${DownloadConstants.DOWNLOAD_TAG}") + if (workInfo.state == WorkInfo.State.ENQUEUED || workInfo.state == WorkInfo.State.RUNNING) { + isDownloading = true + } else if (workInfo.state == WorkInfo.State.CANCELLED || workInfo.state == WorkInfo.State.FAILED) { + isDownloading = false + Utilities.showToastUiCentered( + context, + blocklistUpdateFailureText, + Toast.LENGTH_SHORT + ) + workManager.pruneWork() + workManager.cancelAllWorkByTag(DownloadConstants.DOWNLOAD_TAG) + workManager.cancelAllWorkByTag(DownloadConstants.FILE_TAG) + } + } + + LaunchedEffect(fileTagWorkInfos) { + val workInfo = fileTagWorkInfos.getOrNull(0) ?: return@LaunchedEffect + if (workInfo.state == WorkInfo.State.SUCCEEDED) { + isDownloading = false + showUpdateUi() + workManager.pruneWork() + } else if (workInfo.state == WorkInfo.State.CANCELLED || workInfo.state == WorkInfo.State.FAILED) { + isDownloading = false + Utilities.showToastUiCentered( + context, + blocklistUpdateFailureText, + Toast.LENGTH_SHORT + ) + workManager.pruneWork() + workManager.cancelAllWorkByTag(DownloadConstants.FILE_TAG) + } + } + + // Observe lifecycle for onResume + DisposableEffect(lifecycleOwner) { + val observer = LifecycleEventObserver { _, event -> + if (event == Lifecycle.Event.ON_RESUME) { + viewModel.updateUiState() + } + } + lifecycleOwner.lifecycle.addObserver(observer) + onDispose { + lifecycleOwner.lifecycle.removeObserver(observer) + } + } + + // Main content + DnsSettingsScreen( + uiState = uiState, + initialFocusKey = initialFocusKey, + onRefreshClick = { viewModel.refreshDns() }, + onSystemDnsClick = { viewModel.enableSystemDns() }, + onSystemDnsInfoClick = { + scope.launch(Dispatchers.IO) { + val sysDns = VpnController.getSystemDns() + withContext(Dispatchers.Main) { + showSystemDnsDialog(sysDns) + } + } + }, + onCustomDnsClick = onCustomDnsClick, + onRethinkPlusDnsClick = onRethinkPlusDnsClick, + onSmartDnsClick = { viewModel.enableSmartDns() }, + onSmartDnsInfoClick = { showSmartDnsInfoDialog() }, + onLocalBlocklistClick = { openLocalBlocklist() }, + onCustomDownloaderChange = { viewModel.setUseCustomDownloadManager(it) }, + onPeriodicUpdateChange = { viewModel.setPeriodicallyCheckBlocklistUpdate(it) }, + onDnsAlgChange = { viewModel.setDnsAlgEnabled(it) }, + onSplitDnsChange = { viewModel.setSplitDns(it) }, + onBypassDnsBlockChange = { viewModel.setBypassBlockInDns(it) }, + onAllowedRecordTypesClick = { showRecordTypesSheet = true }, + onFavIconChange = { viewModel.setFavIconEnabled(it) }, + onDnsCacheChange = { viewModel.setEnableDnsCache(it) }, + onProxyDnsChange = { viewModel.setProxyDns(it) }, + onUndelegatedDomainsChange = { viewModel.setUseSystemDnsForUndelegatedDomains(it) }, + onFallbackChange = { viewModel.setUseFallbackDnsToBypass(it) }, + onPreventLeaksChange = { viewModel.setPreventDnsLeaksEnabled(it) } + ) + + // DNS Record Types Sheet + if (showRecordTypesSheet) { + DnsRecordTypesSheet( + persistentState = persistentState, + onDismiss = { showRecordTypesSheet = false } + ) + } + + // System DNS Dialog + if (showSystemDnsDialog) { + RethinkMultiActionDialog( + onDismissRequest = { showSystemDnsDialog = false }, + title = stringResource(R.string.network_dns), + message = systemDnsDialogText, + primaryText = stringResource(R.string.ada_noapp_dialog_positive), + onPrimary = { showSystemDnsDialog = false }, + secondaryText = stringResource(R.string.dns_info_neutral), + onSecondary = { + UIUtils.clipboardCopy( + context, + systemDnsDialogText, + copyClipboardLabelText + ) + Utilities.showToastUiCentered( + context, + infoDialogUrlCopyToastText, + Toast.LENGTH_SHORT + ) + showSystemDnsDialog = false + } + ) + } + + // Smart DNS Dialog + if (showSmartDnsDialog) { + RethinkMultiActionDialog( + onDismissRequest = { showSmartDnsDialog = false }, + title = stringResource(R.string.smart_dns), + message = smartDnsDialogText, + primaryText = stringResource(R.string.ada_noapp_dialog_positive), + onPrimary = { showSmartDnsDialog = false }, + secondaryText = stringResource(R.string.dns_info_neutral), + onSecondary = { + UIUtils.clipboardCopy( + context, + smartDnsDialogText, + copyClipboardLabelText + ) + Utilities.showToastUiCentered( + context, + infoDialogUrlCopyToastText, + Toast.LENGTH_SHORT + ) + showSmartDnsDialog = false + } + ) + } + + // Local Blocklists Sheet + if (showLocalBlocklistsSheet) { + LocalBlocklistsSheet( + headingText = headingText, + versionText = versionText, + canConfigure = canConfigure, + canCopy = canCopy, + canSearch = canSearch, + showCheckDownload = showCheckDownload, + showDownload = showDownload, + showRedownload = showRedownload, + isChecking = isChecking, + isDownloading = isDownloading, + isRedownloading = isRedownloading, + isBlocklistEnabled = persistentState.blocklistEnabled, + onDismiss = { dismissLocalBlocklistsSheet() }, + onEnableBlocklist = { enableBlocklist() }, + onConfigure = { invokeLocalBlocklistActivity() }, + onCopy = { + val url = Constants.RETHINK_BASE_URL_MAX + persistentState.localBlocklistStamp + UIUtils.clipboardCopy( + context, + url, + copyClipboardLabelText + ) + Utilities.showToastUiCentered( + context, + infoDialogRethinkToastText, + Toast.LENGTH_SHORT + ) + }, + onSearch = { + dismissLocalBlocklistsSheet() + val url = RETHINK_SEARCH_URL + Uri.encode(persistentState.localBlocklistStamp) + UIUtils.openUrl(context, url) + }, + onCheckUpdate = { + isChecking = true + isBlocklistUpdateAvailable() + }, + onDownload = { + downloadDialogIsRedownload = false + showDownloadDialog = true + }, + onRedownload = { + downloadDialogIsRedownload = true + showDownloadDialog = true + }, + onDelete = { showDeleteDialog = true } + ) + } + + // Download Dialog + if (showDownloadDialog) { + val title = if (downloadDialogIsRedownload) { + stringResource(R.string.local_blocklist_redownload) + } else { + stringResource(R.string.local_blocklist_download) + } + val message = if (downloadDialogIsRedownload) { + stringResource( + R.string.local_blocklist_redownload_desc, + convertLongToTime( + persistentState.localBlocklistTimestamp, + Constants.TIME_FORMAT_2 + ) + ) + } else { + stringResource(R.string.local_blocklist_download_desc) + } + RethinkConfirmDialog( + onDismissRequest = { showDownloadDialog = false }, + title = title, + message = message, + confirmText = stringResource(R.string.settings_local_blocklist_dialog_positive), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + showDownloadDialog = false + downloadLocalBlocklist(downloadDialogIsRedownload) + }, + onDismiss = { showDownloadDialog = false } + ) + } + + // Delete Dialog + if (showDeleteDialog) { + RethinkConfirmDialog( + onDismissRequest = { showDeleteDialog = false }, + title = stringResource(R.string.lbl_delete), + message = stringResource(R.string.local_blocklist_delete_desc), + confirmText = stringResource(R.string.lbl_delete), + dismissText = stringResource(R.string.lbl_cancel), + isConfirmDestructive = true, + onConfirm = { + showDeleteDialog = false + deleteLocalBlocklist() + }, + onDismiss = { showDeleteDialog = false } + ) + } + + // Lockdown Dialog + if (showLockdownDialog) { + RethinkConfirmDialog( + onDismissRequest = { showLockdownDialog = false }, + title = stringResource(R.string.lockdown_download_enable_inapp), + message = stringResource(R.string.lockdown_download_message), + confirmText = stringResource(R.string.lockdown_download_enable_inapp), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + showLockdownDialog = false + persistentState.useCustomDownloadManager = true + downloadLocalBlocklist(downloadDialogIsRedownload) + }, + onDismiss = { + showLockdownDialog = false + proceedWithDownload(downloadDialogIsRedownload) + } + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun DnsRecordTypesSheet( + persistentState: PersistentState, + onDismiss: () -> Unit +) { + var isAutoMode by remember { mutableStateOf(persistentState.dnsRecordTypesAutoMode) } + val selected = remember { + mutableStateListOf().apply { + addAll(getInitialRecordSelection(persistentState)) + } + } + + val allTypes = remember { + ResourceRecordTypes.entries.filter { it != ResourceRecordTypes.UNKNOWN } + } + + val sortedTypes by remember { + derivedStateOf { allTypes.sortedBy { it.name } } + } + val selectedCount = if (isAutoMode) allTypes.size else selected.size + + RuleSheetModal(onDismissRequest = onDismiss) { + RethinkBottomSheetCard( + modifier = Modifier.padding(horizontal = Dimensions.screenPaddingHorizontal), + contentPadding = PaddingValues(Dimensions.cardPadding) + ) { + Row( + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingMd), + verticalAlignment = Alignment.Top + ) { + Surface( + shape = MaterialTheme.shapes.medium, + color = MaterialTheme.colorScheme.primaryContainer, + modifier = Modifier.size(Dimensions.iconContainerMd) + ) { + Box(contentAlignment = Alignment.Center) { + Icon( + painter = painterResource(id = R.drawable.ic_allow_dns_records), + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimaryContainer, + modifier = Modifier.size(Dimensions.iconSizeSm) + ) + } + } + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + Text( + text = stringResource(R.string.cd_allowed_dns_record_types_heading), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface, + fontWeight = FontWeight.SemiBold + ) + Text( + text = stringResource(R.string.cd_allowed_dns_record_types_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + Row(horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm)) { + RuleSheetSummaryPill( + text = if (isAutoMode) { + stringResource(R.string.settings_ip_text_ipv46) + } else { + stringResource(R.string.lbl_manual) + } + ) + RuleSheetSummaryPill( + text = "${stringResource(R.string.rt_filter_parent_selected)} $selectedCount/${allTypes.size}" + ) + } + + RethinkTwoOptionSegmentedRow( + leftLabel = stringResource(R.string.settings_ip_text_ipv46), + rightLabel = stringResource(R.string.lbl_manual), + leftSelected = isAutoMode, + onLeftClick = { + if (!isAutoMode) { + isAutoMode = true + persistentState.dnsRecordTypesAutoMode = true + } + }, + onRightClick = { + if (isAutoMode) { + isAutoMode = false + persistentState.dnsRecordTypesAutoMode = false + } + } + ) + } + + SectionHeader(title = stringResource(R.string.lbl_allowed)) + + LazyColumn( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + contentPadding = PaddingValues(bottom = Dimensions.spacing2xl), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + itemsIndexed( + items = sortedTypes, + key = { _, type -> type.value } + ) { index, type -> + val position = when { + sortedTypes.size == 1 -> CardPosition.Single + index == 0 -> CardPosition.First + index == sortedTypes.lastIndex -> CardPosition.Last + else -> CardPosition.Middle + } + RecordTypeRow( + type = type, + isAutoMode = isAutoMode, + isSelected = selected.contains(type.name), + position = position, + onToggle = { + if (isAutoMode) return@RecordTypeRow + if (selected.contains(type.name)) { + selected.remove(type.name) + } else { + selected.add(type.name) + } + persistentState.setAllowedDnsRecordTypes(selected.toSet()) + } + ) + } + } + } +} + +@Composable +private fun RecordTypeRow( + type: ResourceRecordTypes, + isAutoMode: Boolean, + isSelected: Boolean, + position: CardPosition, + onToggle: () -> Unit +) { + val containerColor = if (isSelected && !isAutoMode) { + MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.48f) + } else { + MaterialTheme.colorScheme.surfaceContainerLow + } + + RethinkListItem( + headline = type.name, + supporting = type.desc, + position = position, + defaultContainerColor = containerColor, + enabled = !isAutoMode, + onClick = onToggle, + trailing = { + Box( + modifier = Modifier.width(Dimensions.touchTargetMin), + contentAlignment = Alignment.CenterEnd + ) { + Checkbox( + checked = isSelected, + onCheckedChange = { _ -> + if (!isAutoMode) { + onToggle() + } + }, + enabled = !isAutoMode + ) + } + } + ) +} + +private fun getInitialRecordSelection(persistentState: PersistentState): List { + if (!persistentState.dnsRecordTypesAutoMode) { + return persistentState.getAllowedDnsRecordTypes().toList() + } + val storedSelection = persistentState.allowedDnsRecordTypesString + if (storedSelection.isNotEmpty()) { + return storedSelection.split(",").filter { it.isNotEmpty() } + } + return listOf( + ResourceRecordTypes.A.name, + ResourceRecordTypes.AAAA.name, + ResourceRecordTypes.CNAME.name, + ResourceRecordTypes.HTTPS.name, + ResourceRecordTypes.SVCB.name + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun LocalBlocklistsSheet( + headingText: String, + versionText: String, + canConfigure: Boolean, + canCopy: Boolean, + canSearch: Boolean, + showCheckDownload: Boolean, + showDownload: Boolean, + showRedownload: Boolean, + isChecking: Boolean, + isDownloading: Boolean, + isRedownloading: Boolean, + isBlocklistEnabled: Boolean, + onDismiss: () -> Unit, + onEnableBlocklist: () -> Unit, + onConfigure: () -> Unit, + onCopy: () -> Unit, + onSearch: () -> Unit, + onCheckUpdate: () -> Unit, + onDownload: () -> Unit, + onRedownload: () -> Unit, + onDelete: () -> Unit +) { + RuleSheetModal(onDismissRequest = onDismiss) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingSm + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + RethinkBottomSheetCard(contentPadding = PaddingValues(Dimensions.cardPadding)) { + Text( + text = headingText, + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface + ) + if (versionText.isNotEmpty()) { + Text( + text = versionText, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + SectionHeader(title = stringResource(R.string.lbbs_state_header)) + RethinkListGroup { + RethinkActionListItem( + title = if (isBlocklistEnabled) { + stringResource(R.string.lbbs_toggle_off) + } else { + stringResource(R.string.lbbs_toggle_on) + }, + description = stringResource(R.string.lbbs_toggle_desc), + iconRes = R.drawable.ic_local_blocklist, + position = CardPosition.Single, + onClick = onEnableBlocklist + ) + } + + SectionHeader(title = stringResource(R.string.lbbs_actions_header)) + RethinkListGroup { + RethinkActionListItem( + title = stringResource(R.string.lbbs_configure), + iconRes = R.drawable.ic_settings, + position = CardPosition.First, + enabled = canConfigure, + onClick = onConfigure + ) + RethinkActionListItem( + title = stringResource(R.string.lbbs_copy), + iconRes = R.drawable.ic_copy, + position = CardPosition.Middle, + enabled = canCopy, + onClick = onCopy + ) + RethinkActionListItem( + title = stringResource(R.string.lbbs_search), + iconRes = R.drawable.ic_search, + position = CardPosition.Last, + enabled = canSearch, + onClick = onSearch + ) + } + + SectionHeader(title = stringResource(R.string.lbbs_maintenance_header)) + RethinkListGroup { + var maintenanceIndex = 0 + val maintenanceCount = + (if (showCheckDownload) 1 else 0) + + (if (showDownload) 1 else 0) + + (if (showRedownload) 1 else 0) + + 1 + + fun pos(): CardPosition { + return when { + maintenanceCount == 1 -> CardPosition.Single + maintenanceIndex == 0 -> CardPosition.First + maintenanceIndex == maintenanceCount - 1 -> CardPosition.Last + else -> CardPosition.Middle + } + } + + if (showCheckDownload) { + RethinkActionListItem( + title = stringResource(R.string.lbbs_update_check), + iconRes = R.drawable.ic_blocklist_update_check, + position = pos(), + enabled = !isChecking, + trailing = if (isChecking) { + { + CircularProgressIndicator( + modifier = Modifier.size(18.dp), + strokeWidth = 2.dp + ) + } + } else { + null + }, + onClick = onCheckUpdate + ) + maintenanceIndex += 1 + } + if (showDownload) { + RethinkActionListItem( + title = stringResource(R.string.local_blocklist_download), + iconRes = R.drawable.ic_update, + position = pos(), + enabled = !isDownloading, + trailing = if (isDownloading) { + { + CircularProgressIndicator( + modifier = Modifier.size(18.dp), + strokeWidth = 2.dp + ) + } + } else { + null + }, + onClick = onDownload + ) + maintenanceIndex += 1 + } + if (showRedownload) { + RethinkActionListItem( + title = stringResource(R.string.local_blocklist_redownload), + iconRes = R.drawable.ic_update, + position = pos(), + enabled = !isRedownloading, + trailing = if (isRedownloading) { + { + CircularProgressIndicator( + modifier = Modifier.size(18.dp), + strokeWidth = 2.dp + ) + } + } else { + null + }, + onClick = onRedownload + ) + maintenanceIndex += 1 + } + RethinkActionListItem( + title = stringResource(R.string.lbl_delete), + iconRes = R.drawable.ic_delete, + position = pos(), + onClick = onDelete + ) + } + } + } +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/compose/logs/DomainConnectionsScreen.kt b/app/src/full/java/com/celzero/bravedns/ui/compose/logs/DomainConnectionsScreen.kt new file mode 100644 index 000000000..d772cc742 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/compose/logs/DomainConnectionsScreen.kt @@ -0,0 +1,250 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.logs + +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.lifecycle.asFlow +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.ConnectionRow +import com.celzero.bravedns.ui.compose.theme.RethinkTopBar +import com.celzero.bravedns.util.UIUtils.getCountryNameFromFlag +import com.celzero.bravedns.viewmodel.DomainConnectionsViewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DomainConnectionsScreen( + viewModel: DomainConnectionsViewModel, + type: DomainConnectionsInputType, + flag: String, + domain: String, + asn: String, + ip: String, + isBlocked: Boolean, + timeCategory: DomainConnectionsViewModel.TimeCategory, + onBackClick: () -> Unit +) { + val titleText = + when (type) { + DomainConnectionsInputType.DOMAIN -> domain + DomainConnectionsInputType.FLAG -> + stringResource(R.string.two_argument_space, flag, getCountryNameFromFlag(flag)) + DomainConnectionsInputType.ASN -> asn + DomainConnectionsInputType.IP -> ip + } + val subtitleText = subtitleFor(timeCategory) + + LaunchedEffect(type, flag, domain, asn, ip, isBlocked) { + when (type) { + DomainConnectionsInputType.DOMAIN -> { + viewModel.setDomain(domain, isBlocked) + } + DomainConnectionsInputType.FLAG -> { + viewModel.setFlag(flag) + } + DomainConnectionsInputType.ASN -> { + viewModel.setAsn(asn, isBlocked) + } + DomainConnectionsInputType.IP -> { + viewModel.setIp(ip, isBlocked) + } + } + } + + LaunchedEffect(timeCategory) { + viewModel.timeCategoryChanged(timeCategory) + } + + Scaffold( + topBar = { + RethinkTopBar( + title = stringResource(id = R.string.app_name_small_case), + onBackClick = onBackClick + ) + } + ) { paddingValues -> + Column(modifier = Modifier.fillMaxSize().padding(paddingValues)) { + Header(titleText, subtitleText) + Box(modifier = Modifier.fillMaxSize()) { + ConnectionsList(viewModel, type) + if (shouldShowEmpty(viewModel, type)) { + EmptyState() + } + } + } + } +} + +@Composable +private fun Header(title: String, subtitle: String) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(16.dp) + ) { + Text( + text = stringResource(id = R.string.app_name_small_case), + style = MaterialTheme.typography.titleMedium, + modifier = Modifier.alpha(0.5f) + ) + Spacer(modifier = Modifier.size(6.dp)) + Column { + Text( + text = title, + style = MaterialTheme.typography.headlineSmall, + color = MaterialTheme.colorScheme.onSurface + ) + Text( + text = subtitle, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurface + ) + } + } +} + +@Composable +private fun ConnectionsList( + viewModel: DomainConnectionsViewModel, + type: DomainConnectionsInputType +) { + val liveData = + when (type) { + DomainConnectionsInputType.DOMAIN -> viewModel.domainConnectionList + DomainConnectionsInputType.FLAG -> viewModel.flagConnectionList + DomainConnectionsInputType.ASN -> viewModel.asnConnectionList + DomainConnectionsInputType.IP -> viewModel.ipConnectionList + } + val items = liveData.asFlow().collectAsLazyPagingItems() + + LazyColumn(modifier = Modifier.fillMaxSize()) { + items(count = items.itemCount) { index -> + val item = items[index] ?: return@items + ConnectionRow(item) + } + } +} + +@Composable +private fun EmptyState() { + Column( + modifier = + Modifier + .fillMaxSize() + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Text( + text = stringResource(id = R.string.blocklist_update_check_failure), + style = MaterialTheme.typography.titleMedium, + textAlign = TextAlign.Center, + modifier = Modifier.padding(bottom = 16.dp) + ) + Image( + painter = painterResource(id = R.drawable.illustrations_no_record), + contentDescription = null, + modifier = Modifier.size(220.dp) + ) + } +} + +@Composable +private fun subtitleFor(timeCategory: DomainConnectionsViewModel.TimeCategory): String { + return when (timeCategory) { + DomainConnectionsViewModel.TimeCategory.ONE_HOUR -> { + stringResource( + id = R.string.three_argument, + stringResource(id = R.string.lbl_last), + stringResource(id = R.string.numeric_one), + stringResource(id = R.string.lbl_hour) + ) + } + DomainConnectionsViewModel.TimeCategory.TWENTY_FOUR_HOUR -> { + stringResource( + id = R.string.three_argument, + stringResource(id = R.string.lbl_last), + stringResource(id = R.string.numeric_twenty_four), + stringResource(id = R.string.lbl_hour) + ) + } + DomainConnectionsViewModel.TimeCategory.SEVEN_DAYS -> { + stringResource( + id = R.string.three_argument, + stringResource(id = R.string.lbl_last), + stringResource(id = R.string.numeric_seven), + stringResource(id = R.string.lbl_day) + ) + } + } +} + +@Composable +private fun shouldShowEmpty( + viewModel: DomainConnectionsViewModel, + type: DomainConnectionsInputType +): Boolean { + val liveData = + when (type) { + DomainConnectionsInputType.DOMAIN -> viewModel.domainConnectionList + DomainConnectionsInputType.FLAG -> viewModel.flagConnectionList + DomainConnectionsInputType.ASN -> viewModel.asnConnectionList + DomainConnectionsInputType.IP -> viewModel.ipConnectionList + } + val items = liveData.asFlow().collectAsLazyPagingItems() + return items.itemCount == 0 && items.loadState.append.endOfPaginationReached +} + +enum class DomainConnectionsInputType(val type: Int) { + DOMAIN(0), + FLAG(1), + ASN(2), + IP(3); + + companion object { + fun fromValue(value: Int): DomainConnectionsInputType { + return entries.firstOrNull { it.type == value } ?: DOMAIN + } + } +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/compose/rpn/RpnWinProxyDetailsScreen.kt b/app/src/full/java/com/celzero/bravedns/ui/compose/rpn/RpnWinProxyDetailsScreen.kt new file mode 100644 index 000000000..c58d385ca --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/compose/rpn/RpnWinProxyDetailsScreen.kt @@ -0,0 +1,274 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.rpn + +import android.widget.Toast +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.rpnproxy.RpnProxyManager +import com.celzero.bravedns.service.DomainRulesManager +import com.celzero.bravedns.service.IpRulesManager +import com.celzero.bravedns.service.ProxyManager +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkTopBar +import com.celzero.bravedns.util.Utilities +import io.github.aakira.napier.Napier +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RpnWinProxyDetailsScreen( + countryCode: String, + onBackClick: () -> Unit +) { + val context = LocalContext.current + val title = stringResource(R.string.rpn_proxy_details_title) + val noProxyTitle = stringResource(R.string.rpn_no_proxy_found_title) + val noProxyDesc = stringResource(R.string.rpn_no_proxy_found_desc) + val selectAppsLabel = stringResource(R.string.rpn_select_apps_for_proxy) + val appsInfoToast = stringResource(R.string.rpn_proxy_apps_info_toast) + var appsCount by remember { mutableStateOf("-") } + var domainsCount by remember { mutableStateOf("-") } + var ipsCount by remember { mutableStateOf("-") } + var proxyError by remember { mutableStateOf("") } + var proxyName by remember { mutableStateOf("") } + var proxyWho by remember { mutableStateOf("") } + var proxyLatencyMs by remember { mutableStateOf(null) } + var proxyLastConnectedMs by remember { mutableStateOf(null) } + var isProxyActive by remember { mutableStateOf(false) } + var showNoProxyFoundDialog by remember { mutableStateOf(false) } + + LaunchedEffect(countryCode) { + if (countryCode.isEmpty()) { + Napier.w(tag = TAG, message = "empty country code, showing dialog") + showNoProxyFoundDialog = true + return@LaunchedEffect + } + + val loaded = + withContext(Dispatchers.IO) { + val appsByCountry = ProxyManager.getAppsCountForProxy(countryCode) + val appsByWin = ProxyManager.getAppsCountForProxy(ProxyManager.ID_RPN_WIN) + val apps = if (appsByCountry > 0) appsByCountry else appsByWin + val ipCount = IpRulesManager.getRulesCountByCC(countryCode) + val domainCount = DomainRulesManager.getRulesCountByCC(countryCode) + val details = RpnProxyManager.getWinProxyDetails(countryCode) + Napier.i(tag = TAG, message = "apps: $apps, ips: $ipCount, domains: $domainCount for country code: $countryCode, has details: ${details != null}") + Triple(apps to domainCount to ipCount, details, details == null) + } + + appsCount = loaded.first.first.first.toString() + domainsCount = loaded.first.first.second.toString() + ipsCount = loaded.first.second.toString() + proxyName = loaded.second?.name.orEmpty() + proxyWho = loaded.second?.who.orEmpty() + proxyLatencyMs = loaded.second?.latencyMs + proxyLastConnectedMs = loaded.second?.lastConnectedMs + isProxyActive = loaded.second?.isActive == true + showNoProxyFoundDialog = loaded.third + } + + Scaffold( + topBar = { + RethinkTopBar( + title = title, + onBackClick = onBackClick + ) + } + ) { paddingValues -> + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(paddingValues) + ) { + if (showNoProxyFoundDialog) { + RethinkConfirmDialog( + onDismissRequest = {}, + title = noProxyTitle, + message = noProxyDesc, + confirmText = stringResource(R.string.ada_noapp_dialog_positive), + onConfirm = onBackClick + ) + } + StatsRow(appsCount, domainsCount, ipsCount) + Spacer(modifier = Modifier.height(12.dp)) + DetailsSection( + countryCode = countryCode, + proxyError = proxyError, + proxyName = proxyName, + proxyWho = proxyWho, + proxyLatencyMs = proxyLatencyMs, + proxyLastConnectedMs = proxyLastConnectedMs, + isProxyActive = isProxyActive + ) + Spacer(modifier = Modifier.height(16.dp)) + ActionButton(onClick = { + Utilities.showToastUiCentered( + context, + appsInfoToast, + Toast.LENGTH_LONG + ) + }, label = selectAppsLabel) + } + } +} + +@Composable +private fun StatsRow(appsCount: String, domainsCount: String, ipsCount: String) { + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 16.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + StatCard(label = stringResource(R.string.rpn_proxy_apps), value = appsCount, modifier = Modifier.weight(1f)) + StatCard(label = stringResource(R.string.rpn_proxy_domains), value = domainsCount, modifier = Modifier.weight(1f)) + StatCard(label = stringResource(R.string.rpn_proxy_ips), value = ipsCount, modifier = Modifier.weight(1f)) + } +} + +@Composable +private fun StatCard(label: String, value: String, modifier: Modifier = Modifier) { + Card( + modifier = modifier, + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface), + border = CardDefaults.outlinedCardBorder() +) { + Column( + modifier = Modifier.padding(8.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text(text = value, style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold) + Text(text = label, style = MaterialTheme.typography.bodySmall) + } + } +} + +@Composable +private fun DetailsSection( + countryCode: String, + proxyError: String, + proxyName: String, + proxyWho: String, + proxyLatencyMs: Int?, + proxyLastConnectedMs: Long?, + isProxyActive: Boolean +) { + val fallback = stringResource(R.string.symbol_hyphen) + val latencyText = proxyLatencyMs?.let { stringResource(R.string.dns_query_latency, it.toString()) } ?: fallback + val lastConnectedText = + if (proxyLastConnectedMs == null || proxyLastConnectedMs <= 0L) { + fallback + } else { + val elapsedMs = (System.currentTimeMillis() - proxyLastConnectedMs).coerceAtLeast(0L) + val minutes = elapsedMs / 60000L + when { + minutes < 1L -> stringResource(R.string.bubble_time_just_now) + minutes < 60L -> stringResource(R.string.bubble_time_minutes_ago, minutes.toInt()) + else -> stringResource(R.string.bubble_time_hours_ago, (minutes / 60L).toInt()) + } + } + val statusText = if (isProxyActive) stringResource(R.string.rpn_proxy_connected) else stringResource(R.string.lbl_disabled) + val statusColor = if (isProxyActive) MaterialTheme.colorScheme.tertiary else MaterialTheme.colorScheme.onSurfaceVariant + + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .verticalScroll(rememberScrollState()) + ) { + Text( + text = proxyName.ifBlank { stringResource(R.string.rpn_proxy_name) }, + style = MaterialTheme.typography.headlineSmall + ) + Spacer(modifier = Modifier.height(12.dp)) + DetailRow(label = stringResource(R.string.rpn_proxy_who), value = proxyWho.ifBlank { fallback }) + if (proxyError.isNotEmpty()) { + DetailRow(label = stringResource(R.string.rpn_proxy_error), value = proxyError, valueColor = MaterialTheme.colorScheme.error) + } + Spacer(modifier = Modifier.height(12.dp)) + DetailRow(label = stringResource(R.string.rpn_proxy_country), value = countryCode.uppercase()) + DetailRow(label = stringResource(R.string.rpn_proxy_latency), value = latencyText) + DetailRow(label = stringResource(R.string.rpn_proxy_last_connected), value = lastConnectedText) + Spacer(modifier = Modifier.height(12.dp)) + DetailRow(label = stringResource(R.string.rpn_proxy_status), value = statusText, valueColor = statusColor) + } +} + +@Composable +private fun DetailRow(label: String, value: String, valueColor: Color = MaterialTheme.colorScheme.onSurface) { + Row( + modifier = Modifier.fillMaxWidth().padding(vertical = 6.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text(text = label, style = MaterialTheme.typography.bodyMedium) + Text(text = value, style = MaterialTheme.typography.bodyMedium, color = valueColor) + } +} + +@Composable +private fun ActionButton(onClick: () -> Unit, label: String) { + Button( + onClick = onClick, + modifier = Modifier.fillMaxWidth().padding(horizontal = 28.dp, vertical = 12.dp) + ) { + Image( + painter = painterResource(id = R.drawable.ic_loop_back_app), + contentDescription = null, + modifier = Modifier.size(18.dp) + ) + Spacer(modifier = Modifier.size(8.dp)) + Text(text = label) + } +} + +private const val TAG = "RpnWinProxyDetails" diff --git a/app/src/full/java/com/celzero/bravedns/ui/dialog/CustomLanIpDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/dialog/CustomLanIpDialog.kt index b34223a8b..0ae2eedab 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/dialog/CustomLanIpDialog.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/dialog/CustomLanIpDialog.kt @@ -15,285 +15,203 @@ */ package com.celzero.bravedns.ui.dialog -import Logger -import Logger.LOG_TAG_UI -import android.app.Activity -import android.content.res.ColorStateList -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.Window -import android.widget.EditText + import android.widget.Toast -import androidx.appcompat.app.AppCompatDialog +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.dp import com.celzero.bravedns.R -import com.celzero.bravedns.databinding.DialogCustomLanIpBinding import com.celzero.bravedns.service.PersistentState -import com.celzero.bravedns.util.UIUtils.fetchColor -import com.celzero.bravedns.util.UIUtils.fetchToggleBtnColors -import com.google.android.material.button.MaterialButton +import com.celzero.bravedns.ui.bottomsheet.RuleSheetDualTextFieldRow +import com.celzero.bravedns.ui.bottomsheet.RuleSheetModeToggle +import com.celzero.bravedns.ui.bottomsheet.RuleSheetModal +import com.celzero.bravedns.ui.bottomsheet.RuleSheetSectionTitle +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetActionRow +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetCard +import com.celzero.bravedns.ui.compose.theme.RethinkSecondaryActionStyle import inet.ipaddr.IPAddressString - -class CustomLanIpDialog( - activity: Activity, - private val persistentState: PersistentState, - themeId: Int -) : AppCompatDialog(activity, themeId) { - - companion object { - private const val GATEWAY_4_PREFIX = 24 - private const val GATEWAY_6_PREFIX = 120 - private const val ROUTER_4_PREFIX = 32 - private const val ROUTER_6_PREFIX = 128 - private const val DNS_4_PREFIX = 32 - private const val DNS_6_PREFIX = 128 - - private const val GATEWAY_4_IP = "10.111.222.1" - private const val GATEWAY_6_IP = "fd66:f83a:c650::1" - private const val ROUTER_4_IP = "10.111.222.2" - private const val ROUTER_6_IP = "fd66:f83a:c650::2" - private const val DNS_4_IP = "10.111.222.3" - private const val DNS_6_IP = "fd66:f83a:c650::3" - } - private lateinit var binding: DialogCustomLanIpBinding - - // Track initial state to detect changes - private var initialMode: Boolean = false - private var currentMode: Boolean = false - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - requestWindowFeature(Window.FEATURE_NO_TITLE) - binding = DialogCustomLanIpBinding.inflate(LayoutInflater.from(context)) - setContentView(binding.root) - setCancelable(true) - - // reset customIpChanged flag when dialog is created - persistentState.customModeOrIpChanged = false - - setupInitialState() - setupClickListeners() - } - - private fun setupInitialState() { - initialMode = persistentState.customLanIpMode - currentMode = initialMode - - if (currentMode) { - selectManualModeUi() - } else { - selectAutoModeUi() - } - } - - private fun loadDefaultAutoValues() { - // Load default gateway values - binding.gatewayIpv4.setText(GATEWAY_4_IP) - binding.gatewayIpv4Prefix.setText(GATEWAY_4_PREFIX.toString()) - binding.gatewayIpv6.setText(GATEWAY_6_IP) - binding.gatewayIpv6Prefix.setText(GATEWAY_6_PREFIX.toString()) - - // Load default router values - binding.routerIpv4.setText(ROUTER_4_IP) - binding.routerIpv4Prefix.setText(ROUTER_4_PREFIX.toString()) - binding.routerIpv6.setText(ROUTER_6_IP) - binding.routerIpv6Prefix.setText(ROUTER_6_PREFIX.toString()) - - // Load default DNS values - binding.dnsIpv4.setText(DNS_4_IP) - binding.dnsIpv4Prefix.setText(DNS_4_PREFIX.toString()) - binding.dnsIpv6.setText(DNS_6_IP) - binding.dnsIpv6Prefix.setText(DNS_6_PREFIX.toString()) - } - - private fun setupClickListeners() { - binding.autoToggleBtn.setOnClickListener { - currentMode = false - selectAutoModeUi() - } - binding.manualToggleBtn.setOnClickListener { - currentMode = true - selectManualModeUi() - } - - binding.resetButton.setOnClickListener { - if (!currentMode) { - Toast.makeText(context, R.string.custom_lan_ip_saved_auto, Toast.LENGTH_SHORT).show() - } else { - resetManualFields() - } - } - - binding.saveButton.setOnClickListener { - if (!currentMode) { - saveAutoMode() - } else { - saveManualMode() - } - } - } - - private fun selectAutoModeUi() { - selectToggleBtnUi(binding.autoToggleBtn) - unselectToggleBtnUi(binding.manualToggleBtn) - - binding.modeDesc.text = context.getString(R.string.custom_lan_ip_auto_desc) - - setManualFieldsEnabled(false) - binding.resetButton.isEnabled = false - - // Load default AUTO values - loadDefaultAutoValues() - } - - private fun selectManualModeUi() { - selectToggleBtnUi(binding.manualToggleBtn) - unselectToggleBtnUi(binding.autoToggleBtn) - - binding.modeDesc.text = context.getString(R.string.custom_lan_ip_manual_desc) - - setManualFieldsEnabled(true) - binding.resetButton.isEnabled = true - - // Load saved manual values if they exist, otherwise load defaults - loadManualValues() +import io.github.aakira.napier.Napier + +private const val GATEWAY_4_PREFIX = 24 +private const val GATEWAY_6_PREFIX = 120 +private const val ROUTER_4_PREFIX = 32 +private const val ROUTER_6_PREFIX = 128 +private const val DNS_4_PREFIX = 32 +private const val DNS_6_PREFIX = 128 + +private const val GATEWAY_4_IP = "10.111.222.1" +private const val GATEWAY_6_IP = "fd66:f83a:c650::1" +private const val ROUTER_4_IP = "10.111.222.2" +private const val ROUTER_6_IP = "fd66:f83a:c650::2" +private const val DNS_4_IP = "10.111.222.3" +private const val DNS_6_IP = "fd66:f83a:c650::3" + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CustomLanIpSheet( + persistentState: PersistentState, + onDismiss: () -> Unit +) { + val context = LocalContext.current + var initialMode by remember { mutableStateOf(false) } + var currentMode by remember { mutableStateOf(false) } + + var gatewayIpv4 by remember { mutableStateOf("") } + var gatewayIpv4Prefix by remember { mutableStateOf("") } + var gatewayIpv6 by remember { mutableStateOf("") } + var gatewayIpv6Prefix by remember { mutableStateOf("") } + + var routerIpv4 by remember { mutableStateOf("") } + var routerIpv4Prefix by remember { mutableStateOf("") } + var routerIpv6 by remember { mutableStateOf("") } + var routerIpv6Prefix by remember { mutableStateOf("") } + + var dnsIpv4 by remember { mutableStateOf("") } + var dnsIpv4Prefix by remember { mutableStateOf("") } + var dnsIpv6 by remember { mutableStateOf("") } + var dnsIpv6Prefix by remember { mutableStateOf("") } + + var errorMessage by remember { mutableStateOf("") } + + fun loadDefaultAutoValues() { + gatewayIpv4 = GATEWAY_4_IP + gatewayIpv4Prefix = GATEWAY_4_PREFIX.toString() + gatewayIpv6 = GATEWAY_6_IP + gatewayIpv6Prefix = GATEWAY_6_PREFIX.toString() + + routerIpv4 = ROUTER_4_IP + routerIpv4Prefix = ROUTER_4_PREFIX.toString() + routerIpv6 = ROUTER_6_IP + routerIpv6Prefix = ROUTER_6_PREFIX.toString() + + dnsIpv4 = DNS_4_IP + dnsIpv4Prefix = DNS_4_PREFIX.toString() + dnsIpv6 = DNS_6_IP + dnsIpv6Prefix = DNS_6_PREFIX.toString() } - private fun loadManualValues() { - // If saved values exist in persistent state, load them - // Otherwise, load default values + fun loadManualValues() { if (persistentState.customLanGatewayIpv4.isNotBlank()) { - loadIpAndPrefixIntoFields(persistentState.customLanGatewayIpv4, binding.gatewayIpv4, binding.gatewayIpv4Prefix) + loadIpAndPrefixIntoFields(persistentState.customLanGatewayIpv4) { ip, prefix -> + gatewayIpv4 = ip + gatewayIpv4Prefix = prefix + } } else { - binding.gatewayIpv4.setText(GATEWAY_4_IP) - binding.gatewayIpv4Prefix.setText(GATEWAY_4_PREFIX.toString()) + gatewayIpv4 = GATEWAY_4_IP + gatewayIpv4Prefix = GATEWAY_4_PREFIX.toString() } if (persistentState.customLanGatewayIpv6.isNotBlank()) { - loadIpAndPrefixIntoFields(persistentState.customLanGatewayIpv6, binding.gatewayIpv6, binding.gatewayIpv6Prefix) + loadIpAndPrefixIntoFields(persistentState.customLanGatewayIpv6) { ip, prefix -> + gatewayIpv6 = ip + gatewayIpv6Prefix = prefix + } } else { - binding.gatewayIpv6.setText(GATEWAY_6_IP) - binding.gatewayIpv6Prefix.setText(GATEWAY_6_PREFIX.toString()) + gatewayIpv6 = GATEWAY_6_IP + gatewayIpv6Prefix = GATEWAY_6_PREFIX.toString() } if (persistentState.customLanRouterIpv4.isNotBlank()) { - loadIpAndPrefixIntoFields(persistentState.customLanRouterIpv4, binding.routerIpv4, binding.routerIpv4Prefix) + loadIpAndPrefixIntoFields(persistentState.customLanRouterIpv4) { ip, prefix -> + routerIpv4 = ip + routerIpv4Prefix = prefix + } } else { - binding.routerIpv4.setText(ROUTER_4_IP) - binding.routerIpv4Prefix.setText(ROUTER_4_PREFIX.toString()) + routerIpv4 = ROUTER_4_IP + routerIpv4Prefix = ROUTER_4_PREFIX.toString() } if (persistentState.customLanRouterIpv6.isNotBlank()) { - loadIpAndPrefixIntoFields(persistentState.customLanRouterIpv6, binding.routerIpv6, binding.routerIpv6Prefix) + loadIpAndPrefixIntoFields(persistentState.customLanRouterIpv6) { ip, prefix -> + routerIpv6 = ip + routerIpv6Prefix = prefix + } } else { - binding.routerIpv6.setText(ROUTER_6_IP) - binding.routerIpv6Prefix.setText(ROUTER_6_PREFIX.toString()) + routerIpv6 = ROUTER_6_IP + routerIpv6Prefix = ROUTER_6_PREFIX.toString() } if (persistentState.customLanDnsIpv4.isNotBlank()) { - loadIpAndPrefixIntoFields(persistentState.customLanDnsIpv4, binding.dnsIpv4, binding.dnsIpv4Prefix) + loadIpAndPrefixIntoFields(persistentState.customLanDnsIpv4) { ip, prefix -> + dnsIpv4 = ip + dnsIpv4Prefix = prefix + } } else { - binding.dnsIpv4.setText(DNS_4_IP) - binding.dnsIpv4Prefix.setText(DNS_4_PREFIX.toString()) + dnsIpv4 = DNS_4_IP + dnsIpv4Prefix = DNS_4_PREFIX.toString() } if (persistentState.customLanDnsIpv6.isNotBlank()) { - loadIpAndPrefixIntoFields(persistentState.customLanDnsIpv6, binding.dnsIpv6, binding.dnsIpv6Prefix) + loadIpAndPrefixIntoFields(persistentState.customLanDnsIpv6) { ip, prefix -> + dnsIpv6 = ip + dnsIpv6Prefix = prefix + } } else { - binding.dnsIpv6.setText(DNS_6_IP) - binding.dnsIpv6Prefix.setText(DNS_6_PREFIX.toString()) + dnsIpv6 = DNS_6_IP + dnsIpv6Prefix = DNS_6_PREFIX.toString() } } - private fun selectToggleBtnUi(mb: MaterialButton) { - mb.backgroundTintList = ColorStateList.valueOf(fetchToggleBtnColors(context, R.color.accentGood)) - mb.setTextColor(fetchColor(context, R.attr.homeScreenHeaderTextColor)) - } - - private fun unselectToggleBtnUi(mb: MaterialButton) { - mb.setTextColor(fetchColor(context, R.attr.primaryTextColor)) - mb.backgroundTintList = ColorStateList.valueOf(fetchToggleBtnColors(context, R.color.defaultToggleBtnBg)) + fun hideError() { + errorMessage = "" } - private fun setManualFieldsEnabled(enabled: Boolean) { - // Gateway - binding.gatewayIpv4.isEnabled = enabled - binding.gatewayIpv4Prefix.isEnabled = enabled - binding.gatewayIpv6.isEnabled = enabled - binding.gatewayIpv6Prefix.isEnabled = enabled - // Router - binding.routerIpv4.isEnabled = enabled - binding.routerIpv4Prefix.isEnabled = enabled - binding.routerIpv6.isEnabled = enabled - binding.routerIpv6Prefix.isEnabled = enabled - // DNS - binding.dnsIpv4.isEnabled = enabled - binding.dnsIpv4Prefix.isEnabled = enabled - binding.dnsIpv6.isEnabled = enabled - binding.dnsIpv6Prefix.isEnabled = enabled - } - - private fun resetManualFields() { - // Reset to default values instead of clearing + fun resetManualFields() { loadDefaultAutoValues() - - // Clear any error message hideError() - Toast.makeText(context, R.string.custom_lan_ip_saved_manual, Toast.LENGTH_SHORT).show() } - private fun showError(message: String) { - binding.errorText.text = message - binding.errorText.visibility = View.VISIBLE - } - - private fun hideError() { - binding.errorText.visibility = View.GONE - binding.errorText.text = "" - } - - private fun saveAutoMode() { + fun saveAutoMode() { try { - // Check if mode changed val modeChanged = initialMode != currentMode - - // AUTO mode: mark mode as auto and clear any saved custom values persistentState.customLanIpMode = false - - // Set the customIpChanged flag if mode changed OR we had custom values and now cleared them if (modeChanged) { persistentState.customModeOrIpChanged = true - Logger.i(LOG_TAG_UI, "Custom LAN IPs cleared (switched to AUTO)") + Napier.i("Custom LAN IPs cleared (switched to AUTO)") } - hideError() Toast.makeText(context, R.string.custom_lan_ip_saved_auto, Toast.LENGTH_SHORT).show() - dismiss() + onDismiss() } catch (e: Exception) { - Logger.e(LOG_TAG_UI, "err saving custom lan ip (auto): ${e.message}", e) - showError(context.getString(R.string.custom_lan_ip_save_error)) + Napier.e("err saving custom lan ip (auto): ${e.message}") + errorMessage = context.getString(R.string.custom_lan_ip_save_error) } } - private fun saveManualMode() { + fun saveManualMode() { try { - val gatewayV4 = binding.gatewayIpv4.text?.toString()?.trim().orEmpty() - val gatewayV4Prefix = binding.gatewayIpv4Prefix.text?.toString()?.trim().orEmpty() - val gatewayV6 = binding.gatewayIpv6.text?.toString()?.trim().orEmpty() - val gatewayV6Prefix = binding.gatewayIpv6Prefix.text?.toString()?.trim().orEmpty() - - val routerV4 = binding.routerIpv4.text?.toString()?.trim().orEmpty() - val routerV4Prefix = binding.routerIpv4Prefix.text?.toString()?.trim().orEmpty() - val routerV6 = binding.routerIpv6.text?.toString()?.trim().orEmpty() - val routerV6Prefix = binding.routerIpv6Prefix.text?.toString()?.trim().orEmpty() - - val dnsV4 = binding.dnsIpv4.text?.toString()?.trim().orEmpty() - val dnsV4Prefix = binding.dnsIpv4Prefix.text?.toString()?.trim().orEmpty() - val dnsV6 = binding.dnsIpv6.text?.toString()?.trim().orEmpty() - val dnsV6Prefix = binding.dnsIpv6Prefix.text?.toString()?.trim().orEmpty() - - // Validate IP + prefix pairs; only allow private/ULA ranges + val gatewayV4 = gatewayIpv4.trim() + val gatewayV4Prefix = gatewayIpv4Prefix.trim() + val gatewayV6 = gatewayIpv6.trim() + val gatewayV6Prefix = gatewayIpv6Prefix.trim() + + val routerV4 = routerIpv4.trim() + val routerV4Prefix = routerIpv4Prefix.trim() + val routerV6 = routerIpv6.trim() + val routerV6Prefix = routerIpv6Prefix.trim() + + val dnsV4 = dnsIpv4.trim() + val dnsV4Prefix = dnsIpv4Prefix.trim() + val dnsV6 = dnsIpv6.trim() + val dnsV6Prefix = dnsIpv6Prefix.trim() + if (!validateIpv4WithPrefix(gatewayV4, gatewayV4Prefix) || !validateIpv6WithPrefix(gatewayV6, gatewayV6Prefix) || !validateIpv4WithPrefix(routerV4, routerV4Prefix) || @@ -301,11 +219,10 @@ class CustomLanIpDialog( !validateIpv4WithPrefix(dnsV4, dnsV4Prefix) || !validateIpv6WithPrefix(dnsV6, dnsV6Prefix) ) { - showError(context.getString(R.string.custom_lan_ip_validation_error)) + errorMessage = context.getString(R.string.custom_lan_ip_validation_error) return } - // Combine new values val newGatewayV4 = combineIpAndPrefix(gatewayV4, gatewayV4Prefix) val newGatewayV6 = combineIpAndPrefix(gatewayV6, gatewayV6Prefix) val newRouterV4 = combineIpAndPrefix(routerV4, routerV4Prefix) @@ -313,179 +230,316 @@ class CustomLanIpDialog( val newDnsV4 = combineIpAndPrefix(dnsV4, dnsV4Prefix) val newDnsV6 = combineIpAndPrefix(dnsV6, dnsV6Prefix) - // Check if any IP values have changed - val ipValuesChanged = newGatewayV4 != persistentState.customLanGatewayIpv4 || + val ipValuesChanged = + newGatewayV4 != persistentState.customLanGatewayIpv4 || newGatewayV6 != persistentState.customLanGatewayIpv6 || newRouterV4 != persistentState.customLanRouterIpv4 || newRouterV6 != persistentState.customLanRouterIpv6 || newDnsV4 != persistentState.customLanDnsIpv4 || newDnsV6 != persistentState.customLanDnsIpv6 - // Check if mode changed val modeChanged = initialMode != currentMode persistentState.customLanIpMode = true - - // Store combined ip/prefix strings; empty pair becomes "" persistentState.customLanGatewayIpv4 = newGatewayV4 persistentState.customLanGatewayIpv6 = newGatewayV6 - persistentState.customLanRouterIpv4 = newRouterV4 persistentState.customLanRouterIpv6 = newRouterV6 - persistentState.customLanDnsIpv4 = newDnsV4 persistentState.customLanDnsIpv6 = newDnsV6 - // Set the customIpChanged flag if mode changed OR IP values changed if (modeChanged || ipValuesChanged) { persistentState.customModeOrIpChanged = true - Logger.i(LOG_TAG_UI, "Custom LAN IPs changed - mode changed: $modeChanged, IP values changed: $ipValuesChanged") + Napier.i( + "Custom LAN IPs changed - mode changed: $modeChanged, IP values changed: $ipValuesChanged" + ) } hideError() Toast.makeText(context, R.string.custom_lan_ip_saved_manual, Toast.LENGTH_SHORT).show() - dismiss() + onDismiss() } catch (e: Exception) { - Logger.e(LOG_TAG_UI, "err saving custom lan ip (manual): ${e.message}", e) - showError(context.getString(R.string.custom_lan_ip_save_error)) + Napier.e("err saving custom lan ip (manual): ${e.message}") + errorMessage = context.getString(R.string.custom_lan_ip_save_error) } } - private fun loadIpAndPrefixIntoFields(value: String, ipField: EditText, prefixField: EditText) { - if (value.isBlank()) { - ipField.setText("") - prefixField.setText("") - return + LaunchedEffect(Unit) { + persistentState.customModeOrIpChanged = false + initialMode = persistentState.customLanIpMode + currentMode = initialMode + if (currentMode) { + loadManualValues() + } else { + loadDefaultAutoValues() } - val parts = value.split("/") - val ip = parts.getOrNull(0).orEmpty() - val prefix = parts.getOrNull(1).orEmpty() - ipField.setText(ip) - prefixField.setText(prefix) - } - - private fun combineIpAndPrefix(ip: String, prefix: String): String { - if (ip.isBlank() && prefix.isBlank()) return "" - // By this point, validation has already ensured both are non-empty and well-formed - return "$ip/$prefix" } - private fun validateIpv4WithPrefix(ip: String, prefixText: String): Boolean { - // Both must be empty or both must be filled - if (ip.isEmpty() && prefixText.isEmpty()) return true - if (ip.isEmpty() || prefixText.isEmpty()) { - Logger.w(LOG_TAG_UI, "IPv4 validation failed: both IP and prefix must be provided together") - return false - } - - return try { - // Validate IP address - val addr = IPAddressString(ip).address - if (addr == null) { - Logger.w(LOG_TAG_UI, "IPv4 validation failed: invalid IP address format: $ip") - return false - } - if (!addr.isIPv4) { - Logger.w(LOG_TAG_UI, "IPv4 validation failed: not an IPv4 address: $ip") - return false + RuleSheetModal(onDismissRequest = onDismiss) { + val manualEnabled = currentMode + + Column( + modifier = + Modifier.fillMaxWidth() + .padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingLg + ) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + RethinkBottomSheetCard { + RuleSheetModeToggle( + autoLabel = context.getString(R.string.settings_ip_text_ipv46), + manualLabel = context.getString(R.string.lbl_manual), + isAutoSelected = !currentMode, + onAutoClick = { + currentMode = false + loadDefaultAutoValues() + hideError() + }, + onManualClick = { + currentMode = true + loadManualValues() + hideError() + } + ) + Text( + text = + if (currentMode) { + context.getString(R.string.custom_lan_ip_manual_desc) + } else { + context.getString(R.string.custom_lan_ip_auto_desc) + }, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) } - // Only allow RFC1918 private IPv4 ranges (unique local for IPv4) - val host = addr.toNormalizedString() // e.g. "10.0.0.1" - if (!isRfc1918Ipv4(host)) { - Logger.w(LOG_TAG_UI, "IPv4 validation failed: not a private/unique local address (must be 10.x.x.x, 172.16-31.x.x, or 192.168.x.x): $host") - return false + RethinkBottomSheetCard { + RuleSheetSectionTitle( + text = context.getString(R.string.custom_lan_ip_gateway), + horizontalPadding = 0.dp + ) + RuleSheetDualTextFieldRow( + primaryValue = gatewayIpv4, + onPrimaryValueChange = { gatewayIpv4 = it }, + secondaryValue = gatewayIpv4Prefix, + onSecondaryValueChange = { gatewayIpv4Prefix = it }, + primaryLabel = { Text(text = context.getString(R.string.settings_ip_text_ipv4)) }, + secondaryLabel = { Text(text = context.getString(R.string.lbl_prefix)) }, + enabled = manualEnabled + ) + RuleSheetDualTextFieldRow( + primaryValue = gatewayIpv6, + onPrimaryValueChange = { gatewayIpv6 = it }, + secondaryValue = gatewayIpv6Prefix, + onSecondaryValueChange = { gatewayIpv6Prefix = it }, + primaryLabel = { Text(text = context.getString(R.string.settings_ip_text_ipv6)) }, + secondaryLabel = { Text(text = context.getString(R.string.lbl_prefix)) }, + enabled = manualEnabled + ) + + RuleSheetSectionTitle( + text = context.getString(R.string.custom_lan_ip_router), + horizontalPadding = 0.dp + ) + RuleSheetDualTextFieldRow( + primaryValue = routerIpv4, + onPrimaryValueChange = { routerIpv4 = it }, + secondaryValue = routerIpv4Prefix, + onSecondaryValueChange = { routerIpv4Prefix = it }, + primaryLabel = { Text(text = context.getString(R.string.settings_ip_text_ipv4)) }, + secondaryLabel = { Text(text = context.getString(R.string.lbl_prefix)) }, + enabled = manualEnabled + ) + RuleSheetDualTextFieldRow( + primaryValue = routerIpv6, + onPrimaryValueChange = { routerIpv6 = it }, + secondaryValue = routerIpv6Prefix, + onSecondaryValueChange = { routerIpv6Prefix = it }, + primaryLabel = { Text(text = context.getString(R.string.settings_ip_text_ipv6)) }, + secondaryLabel = { Text(text = context.getString(R.string.lbl_prefix)) }, + enabled = manualEnabled + ) + + RuleSheetSectionTitle( + text = context.getString(R.string.dns_mode_info_title), + horizontalPadding = 0.dp + ) + RuleSheetDualTextFieldRow( + primaryValue = dnsIpv4, + onPrimaryValueChange = { dnsIpv4 = it }, + secondaryValue = dnsIpv4Prefix, + onSecondaryValueChange = { dnsIpv4Prefix = it }, + primaryLabel = { Text(text = context.getString(R.string.settings_ip_text_ipv4)) }, + secondaryLabel = { Text(text = context.getString(R.string.lbl_prefix)) }, + enabled = manualEnabled + ) + RuleSheetDualTextFieldRow( + primaryValue = dnsIpv6, + onPrimaryValueChange = { dnsIpv6 = it }, + secondaryValue = dnsIpv6Prefix, + onSecondaryValueChange = { dnsIpv6Prefix = it }, + primaryLabel = { Text(text = context.getString(R.string.settings_ip_text_ipv6)) }, + secondaryLabel = { Text(text = context.getString(R.string.lbl_prefix)) }, + enabled = manualEnabled + ) } - // Validate prefix length - val prefix = prefixText.toIntOrNull() - if (prefix == null) { - Logger.w(LOG_TAG_UI, "IPv4 validation failed: invalid prefix length: $prefixText") - return false - } - if (prefix !in 0..32) { - Logger.w(LOG_TAG_UI, "IPv4 validation failed: prefix length must be 0-32, got: $prefix") - return false + RethinkBottomSheetActionRow( + primaryText = context.getString(R.string.lbl_save), + onPrimaryClick = { + if (!currentMode) { + saveAutoMode() + } else { + saveManualMode() + } + }, + secondaryText = context.getString(R.string.lbl_reset), + onSecondaryClick = { + if (!currentMode) { + Toast.makeText(context, R.string.custom_lan_ip_saved_auto, Toast.LENGTH_SHORT).show() + } else { + resetManualFields() + } + }, + secondaryEnabled = currentMode, + secondaryStyle = RethinkSecondaryActionStyle.TEXT + ) + + if (errorMessage.isNotBlank()) { + Text( + text = errorMessage, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.padding(horizontal = Dimensions.spacingXs) + ) } - - true - } catch (e: Exception) { - Logger.e(LOG_TAG_UI, "IPv4 validation error for $ip/$prefixText: ${e.message}", e) - false } } +} - private fun validateIpv6WithPrefix(ip: String, prefixText: String): Boolean { - // Both must be empty or both must be filled - if (ip.isEmpty() && prefixText.isEmpty()) return true - if (ip.isEmpty() || prefixText.isEmpty()) { - Logger.w(LOG_TAG_UI, "IPv6 validation failed: both IP and prefix must be provided together") - return false - } +private fun loadIpAndPrefixIntoFields( + value: String, + onLoaded: (String, String) -> Unit +) { + if (value.isBlank()) { + onLoaded("", "") + return + } + val parts = value.split("/") + val ip = parts.getOrNull(0).orEmpty() + val prefix = parts.getOrNull(1).orEmpty() + onLoaded(ip, prefix) +} - return try { - // Validate IP address - val addr = IPAddressString(ip).address - if (addr == null) { - Logger.w(LOG_TAG_UI, "IPv6 validation failed: invalid IP address format: $ip") - return false - } - if (!addr.isIPv6) { - Logger.w(LOG_TAG_UI, "IPv6 validation failed: not an IPv6 address: $ip") - return false - } +private fun combineIpAndPrefix(ip: String, prefix: String): String { + if (ip.isBlank() && prefix.isBlank()) return "" + return "$ip/$prefix" +} - // Only allow Unique Local IPv6 (fc00::/7) - val host = addr.toNormalizedString() // e.g. "fd00:abcd::1" - if (!isUlaIpv6(host)) { - Logger.w(LOG_TAG_UI, "IPv6 validation failed: not a unique local address (must start with fc or fd): $host") - return false - } +private fun validateIpv4WithPrefix(ip: String, prefixText: String): Boolean { + if (ip.isEmpty() && prefixText.isEmpty()) return true + if (ip.isEmpty() || prefixText.isEmpty()) { + Napier.w("IPv4 validation failed: both IP and prefix must be provided together") + return false + } - // Validate prefix length - val prefix = prefixText.toIntOrNull() - if (prefix == null) { - Logger.w(LOG_TAG_UI, "IPv6 validation failed: invalid prefix length: $prefixText") - return false - } - if (prefix !in 0..128) { - Logger.w(LOG_TAG_UI, "IPv6 validation failed: prefix length must be 0-128, got: $prefix") - return false - } + return try { + val addr = IPAddressString(ip).address + if (addr == null) { + Napier.w("IPv4 validation failed: invalid IP address format: $ip") + return false + } + if (!addr.isIPv4) { + Napier.w("IPv4 validation failed: not an IPv4 address: $ip") + return false + } - true - } catch (e: Exception) { - Logger.e(LOG_TAG_UI, "IPv6 validation error for $ip/$prefixText: ${e.message}", e) - false + val host = addr.toNormalizedString() + if (!isRfc1918Ipv4(host)) { + Napier.w( + "IPv4 validation failed: not a private/unique local address (must be 10.x.x.x, 172.16-31.x.x, or 192.168.x.x): $host" + ) + return false + } + + val prefix = prefixText.toIntOrNull() + if (prefix == null) { + Napier.w("IPv4 validation failed: invalid prefix length: $prefixText") + return false + } + if (prefix !in 0..32) { + Napier.w("IPv4 validation failed: prefix out of range: $prefixText") + return false } + true + } catch (e: Exception) { + Napier.w("IPv4 validation failed: ${e.message}") + false } +} - // RFC1918 private IPv4 ranges using simple string prefix checks. - // This assumes normalized dotted decimal addresses like "10.0.0.1". - private fun isRfc1918Ipv4(host: String): Boolean { - // 10.0.0.0/8 - if (host.startsWith("10.")) return true - - // 172.16.0.0/12: 172.16.0.0 – 172.31.255.255 - if (host.startsWith("172.")) { - val parts = host.split(".") - if (parts.size == 4) { - val second = parts[1].toIntOrNull() ?: return false - if (second in 16..31) return true - } +private fun validateIpv6WithPrefix(ip: String, prefixText: String): Boolean { + if (ip.isEmpty() && prefixText.isEmpty()) return true + if (ip.isEmpty() || prefixText.isEmpty()) { + Napier.w("IPv6 validation failed: both IP and prefix must be provided together") + return false + } + + return try { + val addr = IPAddressString(ip).address + if (addr == null) { + Napier.w("IPv6 validation failed: invalid IP address format: $ip") + return false + } + if (!addr.isIPv6) { + Napier.w("IPv6 validation failed: not an IPv6 address: $ip") + return false } - // 192.168.0.0/16 - if (host.startsWith("192.168.")) return true + val host = addr.toNormalizedString() + if (!isUlaIpv6(host)) { + Napier.w( + "IPv6 validation failed: not a unique local address (must start with fc or fd): $host" + ) + return false + } - return false + val prefix = prefixText.toIntOrNull() + if (prefix == null) { + Napier.w("IPv6 validation failed: invalid prefix length: $prefixText") + return false + } + if (prefix !in 0..128) { + Napier.w("IPv6 validation failed: prefix out of range: $prefixText") + return false + } + true + } catch (e: Exception) { + Napier.w("IPv6 validation failed: ${e.message}") + false } +} + +private fun isRfc1918Ipv4(host: String): Boolean { + if (host.startsWith("10.")) return true - // Unique Local IPv6 (fc00::/7) string check. - // Normalized IPv6 will start with "fc" or "fd" for ULA. - private fun isUlaIpv6(host: String): Boolean { - val lower = host.lowercase() - // fc00::/7 = addresses starting with fc or fd - return lower.startsWith("fc") || lower.startsWith("fd") + if (host.startsWith("172.")) { + val parts = host.split(".") + if (parts.size == 4) { + val second = parts[1].toIntOrNull() ?: return false + if (second in 16..31) return true + } } + + if (host.startsWith("192.168.")) return true + + return false +} + +private fun isUlaIpv6(host: String): Boolean { + val lower = host.lowercase() + return lower.startsWith("fc") || lower.startsWith("fd") } diff --git a/app/src/full/java/com/celzero/bravedns/ui/dialog/DnsCryptRelaysDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/dialog/DnsCryptRelaysDialog.kt index 2c130b678..6ad36066a 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/dialog/DnsCryptRelaysDialog.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/dialog/DnsCryptRelaysDialog.kt @@ -15,45 +15,76 @@ limitations under the License. */ package com.celzero.bravedns.ui.dialog -import android.app.Activity -import android.app.Dialog -import android.os.Bundle -import android.view.Window -import android.view.WindowManager -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.celzero.bravedns.databinding.DialogDnscryptRelaysBinding +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import androidx.lifecycle.LiveData +import androidx.lifecycle.asFlow +import androidx.paging.PagingData +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.RelayRow +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.database.DnsCryptRelayEndpoint +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkTopBar -class DnsCryptRelaysDialog( - private var activity: Activity, - internal var adapter: RecyclerView.Adapter<*>, - themeID: Int -) : Dialog(activity, themeID) { - - private lateinit var b: DialogDnscryptRelaysBinding - - private var mLayoutManager: RecyclerView.LayoutManager? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - requestWindowFeature(Window.FEATURE_NO_TITLE) - b = DialogDnscryptRelaysBinding.inflate(layoutInflater) - setContentView(b.root) - initView() +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DnsCryptRelaysDialog( + appConfig: AppConfig, + relays: LiveData>, + onDismiss: () -> Unit +) { + Dialog( + onDismissRequest = onDismiss, + properties = DialogProperties(usePlatformDefaultWidth = false) + ) { + Surface(color = MaterialTheme.colorScheme.background) { + DnsCryptRelaysContent(appConfig = appConfig, relays = relays, onDismiss = onDismiss) + } } +} - private fun initView() { - window?.setLayout( - WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.MATCH_PARENT - ) - - mLayoutManager = LinearLayoutManager(activity) - - b.recyclerViewDialog.layoutManager = mLayoutManager - b.recyclerViewDialog.adapter = adapter - - b.customDialogOkButton.setOnClickListener { this.dismiss() } +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun DnsCryptRelaysContent( + appConfig: AppConfig, + relays: LiveData>, + onDismiss: () -> Unit +) { + val items = relays.asFlow().collectAsLazyPagingItems() + Scaffold( + containerColor = MaterialTheme.colorScheme.background, + topBar = { + RethinkTopBar( + title = stringResource(R.string.cd_dnscrypt_relay_heading), + onBackClick = onDismiss + ) + } + ) { padding -> + Column( + modifier = Modifier.padding(padding) + ) { + LazyColumn( + modifier = Modifier.padding(horizontal = Dimensions.screenPaddingHorizontal), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + items(items.itemCount) { index -> + val item = items[index] ?: return@items + RelayRow(item, appConfig) + } + } + } } } diff --git a/app/src/full/java/com/celzero/bravedns/ui/dialog/NetworkReachabilityDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/dialog/NetworkReachabilityDialog.kt index 330e57a98..453b33538 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/dialog/NetworkReachabilityDialog.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/dialog/NetworkReachabilityDialog.kt @@ -15,364 +15,263 @@ */ package com.celzero.bravedns.ui.dialog + import Logger import Logger.LOG_TAG_UI -import android.app.Activity -import android.content.res.ColorStateList -import android.graphics.drawable.Drawable import android.net.NetworkCapabilities -import android.os.Bundle -import android.view.View -import android.view.Window import android.widget.Toast -import androidx.core.content.ContextCompat -import androidx.lifecycle.lifecycleScope +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource import com.celzero.bravedns.R -import com.celzero.bravedns.databinding.DialogInputIpsBinding import com.celzero.bravedns.service.ConnectionMonitor import com.celzero.bravedns.service.ConnectionMonitor.Companion.SCHEME_HTTP import com.celzero.bravedns.service.ConnectionMonitor.Companion.SCHEME_HTTPS import com.celzero.bravedns.service.PersistentState import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.ui.bottomsheet.RuleSheetLabeledControlRow +import com.celzero.bravedns.ui.bottomsheet.RuleSheetModeToggle +import com.celzero.bravedns.ui.bottomsheet.RuleSheetModal +import com.celzero.bravedns.ui.bottomsheet.RuleSheetTextFieldRow +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetActionRow +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetCard +import com.celzero.bravedns.ui.compose.theme.RethinkSecondaryActionStyle import com.celzero.bravedns.util.Constants import com.celzero.bravedns.util.UIUtils -import com.google.android.material.button.MaterialButton import inet.ipaddr.IPAddress.IPVersion import inet.ipaddr.IPAddressString +import java.net.MalformedURLException +import java.net.URL import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import java.net.MalformedURLException -import java.net.URL - -class NetworkReachabilityDialog(activity: Activity, - private val persistentState: PersistentState, - themeId: Int -) : androidx.appcompat.app.AppCompatDialog(activity, themeId) { - - private lateinit var binding: DialogInputIpsBinding - - private var useAuto: Boolean = false - - companion object { - private const val URL4 = "IPv4" - private const val URL6 = "IPv6" - private const val URL_SEGMENT4 = "#ipv4" - private const val URL_SEGMENT6 = "#ipv6" - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - requestWindowFeature(Window.FEATURE_NO_TITLE) - binding = DialogInputIpsBinding.inflate(layoutInflater) - setContentView(binding.root) - setCancelable(true) - initViews() - setupListeners() - } - - private fun initViews() { - binding.saveButton.text = context.getString(R.string.lbl_save).uppercase() - binding.testButton.text = context.getString(R.string.lbl_test).uppercase() - - useAuto = persistentState.performAutoNetworkConnectivityChecks - if (useAuto) { - updateAutoModeUi() - } else { - updateManualModeUi() - } - setAllStatusIconsVisibility(View.GONE) - setAllProgressBarsVisibility(View.GONE) - setProtocolsUi() - } - - private fun setProtocolsUi() { - val protocols = VpnController.protocols() - if (protocols.contains(URL4)) { - binding.protocolV4.setImageResource(R.drawable.ic_tick) - } else { - binding.protocolV4.setImageResource(R.drawable.ic_cross_accent) - } - if (protocols.contains(URL6)) { - binding.protocolV6.setImageResource(R.drawable.ic_tick) - } else { - binding.protocolV6.setImageResource(R.drawable.ic_cross_accent) +private const val URL4 = "IPv4" +private const val URL6 = "IPv6" +private const val URL_SEGMENT4 = "#ipv4" +private const val URL_SEGMENT6 = "#ipv6" + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun NetworkReachabilitySheet( + persistentState: PersistentState, + onDismiss: () -> Unit +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + + var useAuto by remember { mutableStateOf(false) } + var errorMessage by remember { mutableStateOf("") } + var buttonsEnabled by remember { mutableStateOf(true) } + + var ipv4Address1 by remember { mutableStateOf("") } + var ipv4Address2 by remember { mutableStateOf("") } + var ipv6Address1 by remember { mutableStateOf("") } + var ipv6Address2 by remember { mutableStateOf("") } + var urlV4Address1 by remember { mutableStateOf("") } + var urlV4Address2 by remember { mutableStateOf("") } + var urlV6Address1 by remember { mutableStateOf("") } + var urlV6Address2 by remember { mutableStateOf("") } + + var statusIpv41 by remember { mutableStateOf(null) } + var statusIpv42 by remember { mutableStateOf(null) } + var statusUrlV41 by remember { mutableStateOf(null) } + var statusUrlV42 by remember { mutableStateOf(null) } + var statusIpv61 by remember { mutableStateOf(null) } + var statusIpv62 by remember { mutableStateOf(null) } + var statusUrlV61 by remember { mutableStateOf(null) } + var statusUrlV62 by remember { mutableStateOf(null) } + + var progressIpv41 by remember { mutableStateOf(false) } + var progressIpv42 by remember { mutableStateOf(false) } + var progressUrlV41 by remember { mutableStateOf(false) } + var progressUrlV42 by remember { mutableStateOf(false) } + var progressIpv61 by remember { mutableStateOf(false) } + var progressIpv62 by remember { mutableStateOf(false) } + var progressUrlV61 by remember { mutableStateOf(false) } + var progressUrlV62 by remember { mutableStateOf(false) } + + fun setAllStatusIconsVisibility(visible: Boolean) { + if (!visible) { + statusIpv41 = null + statusIpv42 = null + statusUrlV41 = null + statusUrlV42 = null + statusIpv61 = null + statusIpv62 = null + statusUrlV61 = null + statusUrlV62 = null } } - private fun setupListeners() { - binding.autoToggleBtn.setOnClickListener { - useAuto = true - updateAutoModeUi() - selectToggleBtnUi(binding.autoToggleBtn) - unselectToggleBtnUi(binding.manualToggleBtn) - } - binding.manualToggleBtn.setOnClickListener { - useAuto = false - updateManualModeUi() - selectToggleBtnUi(binding.manualToggleBtn) - unselectToggleBtnUi(binding.autoToggleBtn) - } - binding.resetChip.setOnClickListener { resetToDefaults() } - binding.testButton.setOnClickListener { testConnections() } - binding.saveButton.setOnClickListener { saveIps() } + fun setAllProgressBarsVisibility(visible: Boolean) { + progressIpv41 = visible + progressIpv42 = visible + progressUrlV41 = visible + progressUrlV42 = visible + progressIpv61 = visible + progressIpv62 = visible + progressUrlV61 = visible + progressUrlV62 = visible } - private fun updateAutoModeUi() { - binding.resetChip.visibility = View.GONE - binding.saveButton.visibility = View.GONE - - selectToggleBtnUi(binding.autoToggleBtn) - unselectToggleBtnUi(binding.manualToggleBtn) - + fun updateAutoModeUi() { val autoTxt = context.getString(R.string.lbl_auto) - val v4 = listOf( - ConnectionMonitor.SCHEME_IP + ConnectionMonitor.PROTOCOL_V4 + " " + autoTxt, - ConnectionMonitor.SCHEME_HTTPS + ConnectionMonitor.PROTOCOL_V4 + " " + autoTxt - ) - val v6 = listOf( - ConnectionMonitor.SCHEME_IP + ConnectionMonitor.PROTOCOL_V6 + " " + autoTxt, - ConnectionMonitor.SCHEME_HTTPS + ConnectionMonitor.PROTOCOL_V6 + " " + autoTxt - ) - binding.ipv4Address1.apply { isEnabled = false; setText(v4[0]) } - binding.ipv4Address2.apply { isEnabled = false; setText(v4[1]) } - binding.ipv6Address1.apply { isEnabled = false; setText(v6[0]) } - binding.ipv6Address2.apply { isEnabled = false; setText(v6[1]) } - - binding.urlV4Layout1.visibility = View.GONE - binding.urlV6Layout1.visibility = View.GONE - binding.urlV4Layout2.visibility = View.GONE - binding.urlV6Layout2.visibility = View.GONE - - setAllStatusIconsVisibility(View.GONE) - setAllProgressBarsVisibility(View.GONE) - binding.errorMessage.visibility = View.GONE + ipv4Address1 = ConnectionMonitor.SCHEME_IP + ConnectionMonitor.PROTOCOL_V4 + " " + autoTxt + ipv4Address2 = ConnectionMonitor.SCHEME_HTTPS + ConnectionMonitor.PROTOCOL_V4 + " " + autoTxt + ipv6Address1 = ConnectionMonitor.SCHEME_IP + ConnectionMonitor.PROTOCOL_V6 + " " + autoTxt + ipv6Address2 = ConnectionMonitor.SCHEME_HTTPS + ConnectionMonitor.PROTOCOL_V6 + " " + autoTxt + errorMessage = "" + setAllStatusIconsVisibility(false) + setAllProgressBarsVisibility(false) } - private fun updateManualModeUi() { - binding.resetChip.visibility = View.VISIBLE - binding.saveButton.visibility = View.VISIBLE - selectToggleBtnUi(binding.manualToggleBtn) - unselectToggleBtnUi(binding.autoToggleBtn) - + fun updateManualModeUi() { val itemsIp4 = persistentState.pingv4Ips.split(",").toTypedArray() val itemsIp6 = persistentState.pingv6Ips.split(",").toTypedArray() val itemsUrl4 = persistentState.pingv4Url.split(",").toTypedArray() val itemsUrl6 = persistentState.pingv6Url.split(",").toTypedArray() + ipv4Address1 = itemsIp4.getOrNull(0) ?: "" + ipv4Address2 = itemsIp4.getOrNull(1) ?: "" + urlV4Address1 = itemsUrl4.getOrNull(0)?.split(URL_SEGMENT4)?.firstOrNull() ?: Constants.urlV4probes[0] + urlV4Address2 = itemsUrl4.getOrNull(1)?.split(URL_SEGMENT4)?.firstOrNull() ?: Constants.urlV4probes[0] + ipv6Address1 = itemsIp6.getOrNull(0) ?: "" + ipv6Address2 = itemsIp6.getOrNull(1) ?: "" + urlV6Address1 = itemsUrl6.getOrNull(0)?.split(URL_SEGMENT6)?.firstOrNull() ?: Constants.urlV6probes[0] + urlV6Address2 = itemsUrl6.getOrNull(1)?.split(URL_SEGMENT6)?.firstOrNull() ?: Constants.urlV6probes[1] + errorMessage = "" + setAllStatusIconsVisibility(false) + setAllProgressBarsVisibility(false) + } - binding.urlV4Layout1.visibility = View.VISIBLE - binding.urlV6Layout1.visibility = View.VISIBLE - binding.urlV4Layout2.visibility = View.VISIBLE - binding.urlV6Layout2.visibility = View.VISIBLE - - binding.ipv4Address1.apply { isEnabled = true; setText(itemsIp4.getOrNull(0) ?: "") } - binding.ipv4Address2.apply { isEnabled = true; setText(itemsIp4.getOrNull(1) ?: "") } - binding.urlV4Address1.apply { isEnabled = true; setText(itemsUrl4.getOrNull(0)?.split(URL_SEGMENT4)?.firstOrNull() ?: Constants.urlV4probes[0]) } - binding.urlV4Address2.apply { isEnabled = true; setText(itemsUrl4.getOrNull(1)?.split(URL_SEGMENT4)?.firstOrNull() ?: Constants.urlV4probes[0]) } - binding.ipv6Address1.apply { isEnabled = true; setText(itemsIp6.getOrNull(0) ?: "") } - binding.ipv6Address2.apply { isEnabled = true; setText(itemsIp6.getOrNull(1) ?: "") } - binding.urlV6Address1.apply { isEnabled = true; setText(itemsUrl6.getOrNull(0)?.split(URL_SEGMENT6)?.firstOrNull() ?: Constants.urlV6probes[0]) } - binding.urlV6Address2.apply { isEnabled = true; setText(itemsUrl6.getOrNull(1)?.split(URL_SEGMENT6)?.firstOrNull() ?: Constants.urlV6probes[1]) } + fun resetToDefaults() { + ipv4Address1 = Constants.ip4probes[0] + ipv4Address2 = Constants.ip4probes[1] + urlV4Address1 = Constants.urlV4probes[0].split(URL_SEGMENT4).firstOrNull() ?: Constants.urlV4probes[0] + urlV4Address2 = Constants.urlV4probes[1].split(URL_SEGMENT4).firstOrNull() ?: Constants.urlV4probes[1] + ipv6Address1 = Constants.ip6probes[0] + ipv6Address2 = Constants.ip6probes[1] + urlV6Address1 = Constants.urlV6probes[0].split(URL_SEGMENT6).firstOrNull() ?: Constants.urlV6probes[0] + urlV6Address2 = Constants.urlV6probes[1].split(URL_SEGMENT6).firstOrNull() ?: Constants.urlV6probes[1] + errorMessage = "" + setAllStatusIconsVisibility(false) + setAllProgressBarsVisibility(false) + } - setAllStatusIconsVisibility(View.GONE) - setAllProgressBarsVisibility(View.GONE) - binding.errorMessage.visibility = View.GONE + fun updateButtonsEnabled(enabled: Boolean) { + buttonsEnabled = enabled } - private fun resetToDefaults() { - binding.ipv4Address1.setText(Constants.ip4probes[0]) - binding.ipv4Address2.setText(Constants.ip4probes[1]) - binding.urlV4Address1.setText(Constants.urlV4probes[0].split(URL_SEGMENT4).firstOrNull() ?: Constants.urlV4probes[0]) - binding.urlV4Address2.setText(Constants.urlV4probes[1].split(URL_SEGMENT4).firstOrNull() ?: Constants.urlV4probes[1]) - - binding.ipv6Address1.setText(Constants.ip6probes[0]) - binding.ipv6Address2.setText(Constants.ip6probes[1]) - binding.urlV6Address1.setText(Constants.urlV6probes[0].split(URL_SEGMENT6).firstOrNull() ?: Constants.urlV6probes[0]) - binding.urlV6Address2.setText(Constants.urlV6probes[1].split(URL_SEGMENT6).firstOrNull() ?: Constants.urlV6probes[1]) - binding.errorMessage.visibility = View.GONE - setAllStatusIconsVisibility(View.GONE) - setAllProgressBarsVisibility(View.GONE) + fun updateStatusIcons(results: Map) { + statusIpv41 = results["ipv4_1"] + statusIpv42 = results["ipv4_2"] + statusUrlV41 = results["url4_1"] + statusUrlV42 = results["url4_2"] + statusIpv61 = results["ipv6_1"] + statusIpv62 = results["ipv6_2"] + statusUrlV61 = results["url6_1"] + statusUrlV62 = results["url6_2"] + setAllStatusIconsVisibility(true) } - private fun testConnections() { - setButtonsEnabled(false) - setAllProgressBarsVisibility(View.VISIBLE) - setAllStatusIconsVisibility(View.GONE) - binding.errorMessage.visibility = View.GONE + fun testConnections() { + updateButtonsEnabled(false) + setAllProgressBarsVisibility(true) + setAllStatusIconsVisibility(false) + errorMessage = "" - io { + scope.launch(Dispatchers.IO) { try { val results = mutableMapOf() val v41 = - if (useAuto) ConnectionMonitor.SCHEME_IP + ":" + ConnectionMonitor.PROTOCOL_V4 else binding.ipv4Address1.text.toString() + if (useAuto) ConnectionMonitor.SCHEME_IP + ":" + ConnectionMonitor.PROTOCOL_V4 else ipv4Address1 val v42 = - if (useAuto) ConnectionMonitor.SCHEME_HTTPS + ":" + ConnectionMonitor.PROTOCOL_V4 else binding.ipv4Address2.text.toString() + if (useAuto) ConnectionMonitor.SCHEME_HTTPS + ":" + ConnectionMonitor.PROTOCOL_V4 else ipv4Address2 val v61 = - if (useAuto) ConnectionMonitor.SCHEME_IP + ":" + ConnectionMonitor.PROTOCOL_V6 else binding.ipv6Address1.text.toString() + if (useAuto) ConnectionMonitor.SCHEME_IP + ":" + ConnectionMonitor.PROTOCOL_V6 else ipv6Address1 val v62 = - if (useAuto) ConnectionMonitor.SCHEME_HTTPS + ":" + ConnectionMonitor.PROTOCOL_V6 else binding.ipv6Address2.text.toString() + if (useAuto) ConnectionMonitor.SCHEME_HTTPS + ":" + ConnectionMonitor.PROTOCOL_V6 else ipv6Address2 - results["ipv4_1"] = probeIpOrUrl(v41) - results["ipv4_2"] = probeIpOrUrl(v42) + results["ipv4_1"] = probeIpOrUrl(v41, useAuto) + results["ipv4_2"] = probeIpOrUrl(v42, useAuto) if (!useAuto) { - results["url4_1"] = probeIpOrUrl(binding.urlV4Address1.text.toString() + URL_SEGMENT4) - results["url4_2"] = probeIpOrUrl(binding.urlV4Address2.text.toString() + URL_SEGMENT4) + results["url4_1"] = probeIpOrUrl(urlV4Address1 + URL_SEGMENT4, useAuto) + results["url4_2"] = probeIpOrUrl(urlV4Address2 + URL_SEGMENT4, useAuto) } - results["ipv6_1"] = probeIpOrUrl(v61) - results["ipv6_2"] = probeIpOrUrl(v62) + results["ipv6_1"] = probeIpOrUrl(v61, useAuto) + results["ipv6_2"] = probeIpOrUrl(v62, useAuto) if (!useAuto) { - results["url6_1"] = probeIpOrUrl(binding.urlV6Address1.text.toString() + URL_SEGMENT6) - results["url6_2"] = probeIpOrUrl(binding.urlV6Address2.text.toString() + URL_SEGMENT6) + results["url6_1"] = probeIpOrUrl(urlV6Address1 + URL_SEGMENT6, useAuto) + results["url6_2"] = probeIpOrUrl(urlV6Address2 + URL_SEGMENT6, useAuto) } - uiCtx { - setAllProgressBarsVisibility(View.GONE) + withContext(Dispatchers.Main) { + setAllProgressBarsVisibility(false) updateStatusIcons(results) - setButtonsEnabled(true) + updateButtonsEnabled(true) } } catch (e: Exception) { - Logger.e(LOG_TAG_UI , "NwReachability; testConnections error: ${e.message}", e) - uiCtx { - binding.errorMessage.text = - context.getString(R.string.blocklist_update_check_failure) - binding.errorMessage.visibility = View.VISIBLE - setAllProgressBarsVisibility(View.GONE) - setButtonsEnabled(true) + Logger.e(LOG_TAG_UI, "NwReachability; testConnections error: ${e.message}", e) + withContext(Dispatchers.Main) { + errorMessage = context.getString(R.string.blocklist_update_check_failure) + setAllProgressBarsVisibility(false) + updateButtonsEnabled(true) } } } } - private suspend fun probeIpOrUrl(ipOrUrl: String): ConnectionMonitor.ProbeResult? { - return try { - VpnController.probeIpOrUrl(ipOrUrl, useAuto) - } catch (e: Exception) { - Logger.d(LOG_TAG_UI, "NwReachability; probeIpOrUrl err: ${e.message}") - null - } - } - - private fun updateStatusIcons(results: Map) { - binding.statusIpv41.setImageDrawable(getDrawableForProbeResult(results["ipv4_1"])) - binding.statusIpv42.setImageDrawable(getDrawableForProbeResult(results["ipv4_2"])) - binding.statusUrlV41.setImageDrawable(getDrawableForProbeResult(results["url4_1"])) - binding.statusUrlV42.setImageDrawable(getDrawableForProbeResult(results["url4_2"])) - binding.statusIpv61.setImageDrawable(getDrawableForProbeResult(results["ipv6_1"])) - binding.statusIpv62.setImageDrawable(getDrawableForProbeResult(results["ipv6_2"])) - binding.statusUrlV61.setImageDrawable(getDrawableForProbeResult(results["url6_1"])) - binding.statusUrlV62.setImageDrawable(getDrawableForProbeResult(results["url6_2"])) - setAllStatusIconsVisibility(View.VISIBLE) - } - - private fun getDrawableForProbeResult(probeResult: ConnectionMonitor.ProbeResult?): Drawable? { - val failureDrawable = ContextCompat.getDrawable(context, R.drawable.ic_cross_accent) - if (probeResult == null || !probeResult.ok) return failureDrawable - - val cap = probeResult.capabilities - val resId = when { - cap?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true -> R.drawable.ic_firewall_wifi_on - cap?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true -> R.drawable.ic_firewall_data_on - else -> R.drawable.ic_tick - } - val drawable = ContextCompat.getDrawable(context, resId) ?: failureDrawable - drawable?.setTint(UIUtils.fetchColor(context, R.attr.accentGood)) - return drawable - } - - private fun setAllStatusIconsVisibility(visibility: Int) { - binding.statusIpv41.visibility = visibility - binding.statusIpv42.visibility = visibility - binding.statusUrlV41.visibility = visibility - binding.statusUrlV42.visibility = visibility - binding.statusIpv61.visibility = visibility - binding.statusIpv62.visibility = visibility - binding.statusUrlV61.visibility = visibility - binding.statusUrlV62.visibility = visibility - } - - private fun setAllProgressBarsVisibility(visibility: Int) { - binding.progressIpv41.visibility = visibility - binding.progressIpv42.visibility = visibility - binding.progressUrlV41.visibility = visibility - binding.progressUrlV42.visibility = visibility - binding.progressIpv61.visibility = visibility - binding.progressIpv62.visibility = visibility - binding.progressUrlV61.visibility = visibility - binding.progressUrlV62.visibility = visibility - } - - private fun setButtonsEnabled(enabled: Boolean) { - binding.testButton.isEnabled = enabled - binding.saveButton.isEnabled = enabled - } - - private fun saveIps() { - val defaultDrawable = ContextCompat.getDrawable(context, R.drawable.edittext_default) - val errorDrawable = ContextCompat.getDrawable(context, R.drawable.edittext_error) + fun saveIps() { if (!useAuto) { - val valid41 = isValidIp(binding.ipv4Address1.text.toString(), IPVersion.IPV4) - val valid42 = isValidIp(binding.ipv4Address2.text.toString(), IPVersion.IPV4) - val validUrl41 = isValidUrl(binding.urlV4Address1.text.toString()) - val validUrl42 = isValidUrl(binding.urlV4Address2.text.toString()) - val valid61 = isValidIp(binding.ipv6Address1.text.toString(), IPVersion.IPV6) - val valid62 = isValidIp(binding.ipv6Address2.text.toString(), IPVersion.IPV6) - val validUrl61 = isValidUrl(binding.urlV6Address1.text.toString()) - val validUrl62 = isValidUrl(binding.urlV6Address2.text.toString()) - - binding.ipv4Address1.background = if (valid41) defaultDrawable else errorDrawable - binding.ipv4Address2.background = if (valid42) defaultDrawable else errorDrawable - binding.urlV4Address1.background = if (validUrl41) defaultDrawable else errorDrawable - binding.urlV4Address2.background = if (validUrl42) defaultDrawable else errorDrawable - binding.ipv6Address1.background = if (valid61) defaultDrawable else errorDrawable - binding.ipv6Address2.background = if (valid62) defaultDrawable else errorDrawable - binding.urlV6Address1.background = if (validUrl61) defaultDrawable else errorDrawable - binding.urlV6Address2.background = if (validUrl62) defaultDrawable else errorDrawable - - if (!valid41 || !valid42 || !validUrl41 || !validUrl42 || !valid61 || !valid62 || !validUrl61 || !validUrl62) { - binding.errorMessage.text = context.getString(R.string.cd_dns_proxy_error_text_1) - binding.errorMessage.visibility = View.VISIBLE + val valid41 = isValidIp(ipv4Address1, IPVersion.IPV4) + val valid42 = isValidIp(ipv4Address2, IPVersion.IPV4) + val validUrl41 = isValidUrl(urlV4Address1) + val validUrl42 = isValidUrl(urlV4Address2) + val valid61 = isValidIp(ipv6Address1, IPVersion.IPV6) + val valid62 = isValidIp(ipv6Address2, IPVersion.IPV6) + val validUrl61 = isValidUrl(urlV6Address1) + val validUrl62 = isValidUrl(urlV6Address2) + + if (!valid41 || !valid42 || !validUrl41 || !validUrl42 || !valid61 || !valid62 || !validUrl61 || !validUrl62) { + errorMessage = context.getString(R.string.cd_dns_proxy_error_text_1) return } } - val ip4 = listOf( - binding.ipv4Address1.text.toString(), - binding.ipv4Address2.text.toString() - ) - val ip6 = listOf( - binding.ipv6Address1.text.toString(), - binding.ipv6Address2.text.toString() - ) - val url4Txt1 = if (binding.urlV4Address1.text.toString().contains(URL_SEGMENT4)) { - binding.urlV4Address1.text.toString() - } else { - binding.urlV4Address1.text.toString() + URL_SEGMENT4 - } - val url4Txt2 = if (binding.urlV4Address2.text.toString().contains(URL_SEGMENT4)) { - binding.urlV4Address2.text.toString() - } else { - binding.urlV4Address2.text.toString() + URL_SEGMENT4 - } - val url6Txt1 = if (binding.urlV6Address1.text.toString().contains(URL_SEGMENT6)) { - binding.urlV6Address1.text.toString() - } else { - binding.urlV6Address1.text.toString() + URL_SEGMENT6 - } - val url6Txt2 = if (binding.urlV6Address2.text.toString().contains(URL_SEGMENT6)) { - binding.urlV6Address2.text.toString() - } else { - binding.urlV6Address2.text.toString() + URL_SEGMENT6 - } + val ip4 = listOf(ipv4Address1, ipv4Address2) + val ip6 = listOf(ipv6Address1, ipv6Address2) + val url4Txt1 = if (urlV4Address1.contains(URL_SEGMENT4)) urlV4Address1 else urlV4Address1 + URL_SEGMENT4 + val url4Txt2 = if (urlV4Address2.contains(URL_SEGMENT4)) urlV4Address2 else urlV4Address2 + URL_SEGMENT4 + val url6Txt1 = if (urlV6Address1.contains(URL_SEGMENT6)) urlV6Address1 else urlV6Address1 + URL_SEGMENT6 + val url6Txt2 = if (urlV6Address2.contains(URL_SEGMENT6)) urlV6Address2 else urlV6Address2 + URL_SEGMENT6 val url4Txt = listOf(url4Txt1, url4Txt2) val url6Txt = listOf(url6Txt1, url6Txt2) val isSame = persistentState.pingv4Ips == ip4.joinToString(",") && - persistentState.pingv6Ips == ip6.joinToString(",") && - persistentState.pingv4Url == url4Txt.joinToString(",") && - persistentState.pingv6Url == url6Txt.joinToString(",") + persistentState.pingv6Ips == ip6.joinToString(",") && + persistentState.pingv4Url == url4Txt.joinToString(",") && + persistentState.pingv6Url == url6Txt.joinToString(",") if (isSame) { - dismiss() + onDismiss() return } persistentState.pingv4Ips = ip4.joinToString(",") @@ -384,52 +283,268 @@ class NetworkReachabilityDialog(activity: Activity, context.getString(R.string.config_add_success_toast), Toast.LENGTH_LONG ).show() - io { + scope.launch(Dispatchers.IO) { VpnController.notifyConnectionMonitor() } - dismiss() + onDismiss() } - private fun io(fn: suspend () -> Unit) { - lifecycleScope.launch(Dispatchers.IO) { fn() } + LaunchedEffect(Unit) { + useAuto = persistentState.performAutoNetworkConnectivityChecks + if (useAuto) { + updateAutoModeUi() + } else { + updateManualModeUi() + } + setAllStatusIconsVisibility(false) + setAllProgressBarsVisibility(false) + errorMessage = "" } - private suspend fun uiCtx(f: suspend () -> Unit) { - withContext(Dispatchers.Main) { f() } - } + RuleSheetModal(onDismissRequest = onDismiss) { + val protocols = VpnController.protocols() + Column( + modifier = + Modifier.fillMaxWidth() + .verticalScroll(rememberScrollState()) + .padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingLg + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + RethinkBottomSheetCard { + RuleSheetModeToggle( + autoLabel = context.getString(R.string.settings_ip_text_ipv46), + manualLabel = context.getString(R.string.lbl_manual), + isAutoSelected = useAuto, + onAutoClick = { + useAuto = true + updateAutoModeUi() + }, + onManualClick = { + useAuto = false + updateManualModeUi() + } + ) + Text( + text = context.getString(R.string.bypasses_network_restrictions), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } - private fun isValidIp(ipString: String, type: IPVersion): Boolean { - return try { - val addr = IPAddressString(ipString).toAddress() - when { - type.isIPv4 -> addr.isIPv4 - type.isIPv6 -> addr.isIPv6 - else -> false + RethinkBottomSheetCard { + ProtocolHeaderRow( + title = context.getString(R.string.settings_ip_text_ipv4), + isSupported = protocols.contains(URL4) + ) { + if (!useAuto) { + TextButton(onClick = { resetToDefaults() }) { + Text(text = context.getString(R.string.brbs_restore_title)) + } + } + } + AddressRow( + value = ipv4Address1, + onValueChange = { ipv4Address1 = it }, + enabled = !useAuto, + progress = progressIpv41, + result = statusIpv41 + ) + AddressRow( + value = ipv4Address2, + onValueChange = { ipv4Address2 = it }, + enabled = !useAuto, + progress = progressIpv42, + result = statusIpv42 + ) + if (!useAuto) { + AddressRow( + value = urlV4Address1, + onValueChange = { urlV4Address1 = it }, + enabled = true, + progress = progressUrlV41, + result = statusUrlV41 + ) + AddressRow( + value = urlV4Address2, + onValueChange = { urlV4Address2 = it }, + enabled = true, + progress = progressUrlV42, + result = statusUrlV42 + ) + } + } + + RethinkBottomSheetCard { + ProtocolHeaderRow( + title = context.getString(R.string.settings_ip_text_ipv6), + isSupported = protocols.contains(URL6) + ) + AddressRow( + value = ipv6Address1, + onValueChange = { ipv6Address1 = it }, + enabled = !useAuto, + progress = progressIpv61, + result = statusIpv61 + ) + AddressRow( + value = ipv6Address2, + onValueChange = { ipv6Address2 = it }, + enabled = !useAuto, + progress = progressIpv62, + result = statusIpv62 + ) + if (!useAuto) { + AddressRow( + value = urlV6Address1, + onValueChange = { urlV6Address1 = it }, + enabled = true, + progress = progressUrlV61, + result = statusUrlV61 + ) + AddressRow( + value = urlV6Address2, + onValueChange = { urlV6Address2 = it }, + enabled = true, + progress = progressUrlV62, + result = statusUrlV62 + ) + } + } + + RethinkBottomSheetActionRow( + primaryText = context.getString(R.string.lbl_save), + onPrimaryClick = { saveIps() }, + primaryEnabled = buttonsEnabled, + secondaryText = context.getString(R.string.lbl_test), + onSecondaryClick = { testConnections() }, + secondaryEnabled = buttonsEnabled, + secondaryStyle = RethinkSecondaryActionStyle.TEXT + ) + + if (errorMessage.isNotBlank()) { + Text( + text = errorMessage, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.padding(horizontal = Dimensions.spacingXs) + ) } - } catch (_: Exception) { - false } } +} + +@Composable +private fun ProtocolHeaderRow( + title: String, + isSupported: Boolean, + trailing: @Composable (() -> Unit)? = null +) { + RuleSheetLabeledControlRow( + label = { + Row(horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm)) { + StatusIcon(isOk = isSupported) + Text(text = title) + } + }, + control = trailing, + horizontalPadding = Dimensions.spacingNone, + controlWeight = 0.7f + ) +} + +@Composable +private fun StatusIcon(isOk: Boolean) { + val icon = + if (isOk) { + R.drawable.ic_tick + } else { + R.drawable.ic_cross_accent + } + androidx.compose.material3.Icon( + painter = painterResource(id = icon), + contentDescription = null, + tint = if (isOk) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error + ) +} - private fun isValidUrl(url: String): Boolean { - return try { - val parsed = URL(url) - (parsed.protocol == SCHEME_HTTPS || parsed.protocol == SCHEME_HTTP) && - parsed.host.isNotEmpty() && - parsed.query == null && - parsed.ref == null - } catch (e: MalformedURLException) { - false +@Composable +private fun AddressRow( + value: String, + onValueChange: (String) -> Unit, + enabled: Boolean, + progress: Boolean, + result: ConnectionMonitor.ProbeResult? +) { + val trailingContent: (@Composable (() -> Unit))? = + when { + progress -> { + { CircularProgressIndicator() } + } + result != null -> { + { + val resId = getDrawableForProbeResult(result) + androidx.compose.material3.Icon( + painter = painterResource(id = resId), + contentDescription = null, + tint = MaterialTheme.colorScheme.primary + ) + } + } + else -> null } + + RuleSheetTextFieldRow( + value = value, + onValueChange = onValueChange, + enabled = enabled, + trailing = trailingContent + ) +} + +private fun getDrawableForProbeResult(probeResult: ConnectionMonitor.ProbeResult?): Int { + if (probeResult == null || !probeResult.ok) return R.drawable.ic_cross_accent + + val cap = probeResult.capabilities + return when { + cap?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true -> R.drawable.ic_firewall_wifi_on + cap?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true -> R.drawable.ic_firewall_data_on + else -> R.drawable.ic_tick } +} + +private suspend fun probeIpOrUrl(ipOrUrl: String, useAuto: Boolean): ConnectionMonitor.ProbeResult? { + return try { + VpnController.probeIpOrUrl(ipOrUrl, useAuto) + } catch (e: Exception) { + Logger.d(LOG_TAG_UI, "NwReachability; probeIpOrUrl err: ${e.message}") + null + } +} - private fun selectToggleBtnUi(mb: MaterialButton) { - mb.backgroundTintList = ColorStateList.valueOf(UIUtils.fetchToggleBtnColors(context, R.color.accentGood)) - mb.setTextColor(UIUtils.fetchColor(context, R.attr.homeScreenHeaderTextColor)) +private fun isValidIp(ipString: String, type: IPVersion): Boolean { + return try { + val addr = IPAddressString(ipString).toAddress() + when { + type.isIPv4 -> addr.isIPv4 + type.isIPv6 -> addr.isIPv6 + else -> false + } + } catch (_: Exception) { + false } +} - private fun unselectToggleBtnUi(mb: MaterialButton) { - mb.setTextColor(UIUtils.fetchColor(context, R.attr.primaryTextColor)) - mb.backgroundTintList = ColorStateList.valueOf(UIUtils.fetchToggleBtnColors(context, R.color.defaultToggleBtnBg)) +private fun isValidUrl(url: String): Boolean { + return try { + val parsed = URL(url) + (parsed.protocol == SCHEME_HTTPS || parsed.protocol == SCHEME_HTTP) && + parsed.host.isNotEmpty() && + parsed.query == null && + parsed.ref == null + } catch (e: MalformedURLException) { + false } } diff --git a/app/src/full/java/com/celzero/bravedns/ui/dialog/SubscriptionAnimDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/dialog/SubscriptionAnimDialog.kt index 429c089e6..ecd4504e3 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/dialog/SubscriptionAnimDialog.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/dialog/SubscriptionAnimDialog.kt @@ -1,141 +1,129 @@ package com.celzero.bravedns.ui.dialog -import android.graphics.Color -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.core.graphics.drawable.toDrawable -import androidx.fragment.app.DialogFragment -import by.kirich1409.viewbindingdelegate.viewBinding -import com.celzero.bravedns.R -import com.celzero.bravedns.databinding.DialogSubscriptionAnimBinding -import nl.dionsegijn.konfetti.core.Angle -import nl.dionsegijn.konfetti.core.Party -import nl.dionsegijn.konfetti.core.Position -import nl.dionsegijn.konfetti.core.Rotation -import nl.dionsegijn.konfetti.core.emitter.Emitter -import nl.dionsegijn.konfetti.core.models.Shape -import nl.dionsegijn.konfetti.core.models.Size -import java.util.concurrent.TimeUnit - -class SubscriptionAnimDialog : DialogFragment() { - private val b by viewBinding(DialogSubscriptionAnimBinding::bind) - - companion object { - // Dialog display duration - private const val DIALOG_DISPLAY_DURATION_MS = 2000L - - // Konfetti animation constants - private const val PARTY_SPEED_DEFAULT = 30f - private const val PARTY_MAX_SPEED_DEFAULT = 50f - private const val PARTY_DAMPING = 0.9f - private const val PARTY_SPREAD_DEFAULT = 45 - private const val PARTY_TIME_TO_LIVE_MS = 3000L - private const val PARTY_EMITTER_DURATION_MS = 100L - private const val PARTY_EMITTER_MAX_DEFAULT = 30 - - // Speed variations for party copies - private const val PARTY_SPEED_VARIANT_1 = 55f - private const val PARTY_MAX_SPEED_VARIANT_1 = 65f - private const val PARTY_SPREAD_VARIANT = 10 - private const val PARTY_EMITTER_MAX_VARIANT = 10 - - private const val PARTY_SPEED_VARIANT_2 = 65f - private const val PARTY_MAX_SPEED_VARIANT_2 = 80f - - // Position constants - private const val POSITION_X_CENTER = 0.5 - private const val POSITION_Y_BOTTOM = 1.0 - - private const val ARG_TITLE = "arg_title" - private const val ARG_MESSAGE = "arg_message" - - /** - * Creates a [SubscriptionAnimDialog] with optional [title] and [message] overlaid on the - * konfetti animation. Pass null to leave the text fields empty (default/normal flow). - */ - fun newInstance(title: String? = null, message: String? = null): SubscriptionAnimDialog { - return SubscriptionAnimDialog().apply { - if (title != null || message != null) { - arguments = Bundle().apply { - title?.let { putString(ARG_TITLE, it) } - message?.let { putString(ARG_MESSAGE, it) } - } - } +import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.tween +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.drawscope.rotate +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import kotlin.math.cos +import kotlin.math.sin +import kotlin.random.Random +import kotlinx.coroutines.delay + +@Composable +fun SubscriptionAnimDialog(onDismiss: () -> Unit) { + Dialog( + onDismissRequest = onDismiss, + properties = DialogProperties(usePlatformDefaultWidth = false) + ) { + Box(modifier = Modifier.fillMaxSize()) { + ConfettiOverlay() + LaunchedEffect(Unit) { + delay(DIALOG_DISPLAY_DURATION_MS) + onDismiss() } } } +} - - private val autoDismissRunnable = Runnable { - if (isAdded && !isStateSaved) { - // safe to dismiss normally - dismiss() - } else if (isAdded) { - // if state is already saved, allow state loss to avoid IllegalStateException - dismissAllowingStateLoss() - } - } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - return inflater.inflate(R.layout.dialog_subscription_anim, container, false) - } - - override fun onStart() { - super.onStart() - dialog?.window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable()) - dialog?.setCancelable(true) - - // Apply optional title/message passed via arguments - arguments?.getString(ARG_TITLE)?.let { b.tvTitle.text = it } - arguments?.getString(ARG_MESSAGE)?.let { b.tvMessage.text = it } - - b.konfettiView.start(festive()) - // post delayed auto-dismiss safely - b.konfettiView.postDelayed(autoDismissRunnable, DIALOG_DISPLAY_DURATION_MS) - } - - override fun onDestroyView() { - // cancel pending auto-dismiss runnable to avoid running after view/state is gone - b.konfettiView.removeCallbacks(autoDismissRunnable) - super.onDestroyView() - } - - private fun festive(): List { - val party = Party( - speed = PARTY_SPEED_DEFAULT, - maxSpeed = PARTY_MAX_SPEED_DEFAULT, - damping = PARTY_DAMPING, - angle = Angle.TOP, - spread = PARTY_SPREAD_DEFAULT, - size = listOf(Size.SMALL, Size.LARGE, Size.LARGE, Size.LARGE, Size.LARGE, Size.LARGE, Size.LARGE, Size.LARGE, Size.LARGE, Size.LARGE), - shapes = listOf(Shape.Square, Shape.Circle, Shape.Circle, Shape.Circle, Shape.Circle, Shape.Circle, Shape.Circle, Shape.Circle, Shape.Circle, Shape.Circle), - timeToLive = PARTY_TIME_TO_LIVE_MS, - rotation = Rotation(), - colors = listOf(0xf0efe4, 0xe6e5de, 0xf4306d, 0xfbfbf7, 0xd8d6c2, 0xf0efe4, 0xe6e5de, 0xf4306d, 0xfbfbf7, 0xd8d6c2), - emitter = Emitter(duration = PARTY_EMITTER_DURATION_MS, TimeUnit.MILLISECONDS).max(PARTY_EMITTER_MAX_DEFAULT), - position = Position.Relative(POSITION_X_CENTER, POSITION_Y_BOTTOM) - ) - - return listOf( - party, - party.copy( - speed = PARTY_SPEED_VARIANT_1, - maxSpeed = PARTY_MAX_SPEED_VARIANT_1, - spread = PARTY_SPREAD_VARIANT, - emitter = Emitter(duration = PARTY_EMITTER_DURATION_MS, TimeUnit.MILLISECONDS).max(PARTY_EMITTER_MAX_VARIANT), - ), - party.copy( - speed = PARTY_SPEED_VARIANT_2, - maxSpeed = PARTY_MAX_SPEED_VARIANT_2, - spread = PARTY_SPREAD_VARIANT, - emitter = Emitter(duration = PARTY_EMITTER_DURATION_MS, TimeUnit.MILLISECONDS).max(PARTY_EMITTER_MAX_VARIANT), +private const val DIALOG_DISPLAY_DURATION_MS = 2000L +private const val CONFETTI_COUNT = 90 +private const val CONFETTI_DURATION_MS = 1600 +private const val CONFETTI_SPAWN_Y = 1.05f +private const val CONFETTI_GRAVITY = 0.55f + +@Composable +private fun ConfettiOverlay() { + val palette = + remember { + listOf( + Color(0xfff0efe4), + Color(0xffe6e5de), + Color(0xfff4306d), + Color(0xfffbfbf7), + Color(0xffd8d6c2) ) + } + val particles = + remember { + val random = Random(42) + List(CONFETTI_COUNT) { + ConfettiParticle( + angle = random.nextFloat() * 80f + 50f, + speed = random.nextFloat() * 220f + 420f, + size = random.nextFloat() * 8f + 6f, + color = palette[random.nextInt(palette.size)], + spin = random.nextFloat() * 360f, + shape = if (random.nextBoolean()) Shape.Circle else Shape.Square, + drift = random.nextFloat() * 0.4f + 0.1f + ) + } + } + val progress = remember { Animatable(0f) } + LaunchedEffect(Unit) { + progress.animateTo( + targetValue = 1f, + animationSpec = + tween( + durationMillis = CONFETTI_DURATION_MS, + easing = LinearEasing + ) ) } + Canvas(modifier = Modifier.fillMaxSize()) { + val time = progress.value + val width = size.width + val height = size.height + particles.forEachIndexed { index, p -> + val theta = Math.toRadians(p.angle.toDouble()) + val vx = cos(theta).toFloat() * p.speed + val vy = -sin(theta).toFloat() * p.speed + val t = time + (index % 10) * 0.01f + val x = width * 0.5f + vx * t + (t * t) * (p.drift * width * 0.02f) + val y = height * CONFETTI_SPAWN_Y + vy * t + (t * t) * (CONFETTI_GRAVITY * height * 0.2f) + val rotation = p.spin * t * 1.2f + rotate(rotation, pivot = Offset(x, y)) { + when (p.shape) { + Shape.Circle -> + drawCircle( + color = p.color, + radius = p.size, + center = Offset(x, y) + ) + Shape.Square -> + drawRect( + color = p.color, + topLeft = Offset(x - p.size, y - p.size), + size = Size(p.size * 2f, p.size * 2f) + ) + } + } + } + } +} +private data class ConfettiParticle( + val angle: Float, + val speed: Float, + val size: Float, + val color: Color, + val spin: Float, + val shape: Shape, + val drift: Float +) + +private enum class Shape { + Circle, + Square } diff --git a/app/src/full/java/com/celzero/bravedns/ui/dialog/WgAddPeerDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/dialog/WgAddPeerDialog.kt index e6dc89a80..6f174ae97 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/dialog/WgAddPeerDialog.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/dialog/WgAddPeerDialog.kt @@ -15,186 +15,196 @@ */ package com.celzero.bravedns.ui.dialog -import Logger -import android.app.Activity -import android.app.Dialog -import android.os.Bundle -import android.view.View -import android.view.Window -import android.view.WindowManager import android.widget.Toast -import androidx.core.widget.doOnTextChanged -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.KeyboardType import com.celzero.bravedns.R -import com.celzero.bravedns.databinding.DialogWgAddPeerBinding import com.celzero.bravedns.service.WireguardManager +import com.celzero.bravedns.ui.bottomsheet.RuleSheetTextFieldRow +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetActionRow +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetCard +import com.celzero.bravedns.ui.compose.theme.RethinkSecondaryActionStyle import com.celzero.bravedns.util.UIUtils.getDurationInHumanReadableFormat import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.tos import com.celzero.bravedns.wireguard.Peer import com.celzero.bravedns.wireguard.util.ErrorMessages +import io.github.aakira.napier.Napier import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class WgAddPeerDialog( - private val activity: Activity, - themeID: Int, - private var configId: Int, - private val wgPeer: Peer? -) : Dialog(activity, themeID) { - - private lateinit var b: DialogWgAddPeerBinding - - private var isEditing = false - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - requestWindowFeature(Window.FEATURE_NO_TITLE) - b = DialogWgAddPeerBinding.inflate(layoutInflater) - setContentView(b.root) - initView() - setupClickListener() - } - - private fun initView() { - window?.setLayout( - WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.MATCH_PARENT - ) - setupAutoExpand(b.peerAllowedIps) - - if (wgPeer != null) { - isEditing = true - b.peerPublicKey.setText(wgPeer.getPublicKey().base64()) - if (wgPeer.getPreSharedKey().isPresent) { - b.peerPresharedKey.setText(wgPeer.getPreSharedKey().get().base64()) +@Composable +fun WgAddPeerDialog( + configId: Int, + wgPeer: Peer?, + onDismiss: () -> Unit +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val isEditing = wgPeer != null + + WgDialog(onDismissRequest = onDismiss) { + WgDialogColumn( + scrollable = true, + verticalSpacing = Dimensions.spacingMd + ) { + var publicKey by remember { mutableStateOf(wgPeer?.getPublicKey()?.base64()?.tos().orEmpty()) } + var presharedKey by remember { + mutableStateOf( + if (wgPeer?.getPreSharedKey()?.isPresent == true) { + wgPeer.getPreSharedKey().get().base64().tos().orEmpty() + } else { + "" + } + ) } - b.peerAllowedIps.setText(wgPeer.getAllowedIps().joinToString { it.toString() }) - if (wgPeer.getEndpoint().isPresent) { - b.peerEndpoint.setText(wgPeer.getEndpoint().get().toString()) + var allowedIps by remember { + mutableStateOf(wgPeer?.getAllowedIps()?.joinToString { it.toString() }.orEmpty()) } - if (wgPeer.persistentKeepalive.isPresent) { - val kas = wgPeer.persistentKeepalive.get() - b.keepAliveHint.visibility = View.VISIBLE - b.peerPersistentKeepAlive.setText(kas.toString()) - b.keepAliveHint.text = getDurationInHumanReadableFormat(activity, kas) - } else { - b.keepAliveHint.visibility = View.GONE + var endpoint by remember { + mutableStateOf( + if (wgPeer?.getEndpoint()?.isPresent == true) { + wgPeer.getEndpoint().get().toString() + } else { + "" + } + ) } - } - // re-measure after setting text - b.root.post { - triggerExpandNow() - } - } - - private fun triggerExpandNow() { - listOf(b.peerAllowedIps).forEach { adjustMaxLines(it) } - } - - private fun setupAutoExpand(et: com.google.android.material.textfield.TextInputEditText) { - et.setHorizontallyScrolling(false) - et.maxLines = 4 // initial cap - et.doOnTextChanged { _, _, _, _ -> adjustMaxLines(et) } - } - - private fun adjustMaxLines(et: com.google.android.material.textfield.TextInputEditText) { - // post to ensure lineCount updated after layout - et.post { - val lines = et.lineCount - val threshold = 4 - val hardCap = 12 - if (lines > threshold) { - et.maxLines = minOf(lines, hardCap) + var keepAlive by remember { + mutableStateOf( + if (wgPeer?.persistentKeepalive?.isPresent == true) { + wgPeer.persistentKeepalive.get().toString() + } else { + "" + } + ) } - } - } - - private fun setupClickListener() { - b.customDialogDismissButton.setOnClickListener { this.dismiss() } - - b.peerPersistentKeepAlive.doOnTextChanged { text, _, _, _ -> - if (text.toString().isNotEmpty()) { - try { - val kas = text.toString().toInt() - b.keepAliveHint.visibility = View.VISIBLE - b.keepAliveHint.text = getDurationInHumanReadableFormat(activity, kas) - } catch (_: NumberFormatException) { - b.keepAliveHint.visibility = View.GONE - } - } else { - b.keepAliveHint.visibility = View.GONE + var keepAliveHint by remember { + mutableStateOf( + if (wgPeer?.persistentKeepalive?.isPresent == true) { + getDurationInHumanReadableFormat(context, wgPeer.persistentKeepalive.get()) + } else { + "" + } + ) } - } - - b.customDialogOkButton.setOnClickListener { - b.customDialogOkButton.isEnabled = false - val peerPublicKey = b.peerPublicKey.text.toString() - val presharedKey = b.peerPresharedKey.text.toString() - val peerEndpoint = b.peerEndpoint.text.toString() - val peerPersistentKeepAlive = b.peerPersistentKeepAlive.text.toString() - val allowedIps = b.peerAllowedIps.text.toString() - - try { - val builder = Peer.Builder() - if (allowedIps.isNotEmpty()) builder.parseAllowedIPs(allowedIps) - if (peerEndpoint.isNotEmpty()) builder.parseEndpoint(peerEndpoint) - if (peerPersistentKeepAlive.isNotEmpty()) - builder.parsePersistentKeepalive(peerPersistentKeepAlive) - if (presharedKey.isNotEmpty()) builder.parsePreSharedKey(presharedKey) - if (peerPublicKey.isNotEmpty()) builder.parsePublicKey(peerPublicKey) - val newPeer = builder.build() - - ui { - showSaving() - ioCtx { - if (wgPeer != null && isEditing) - WireguardManager.deletePeer(configId, wgPeer) - WireguardManager.addPeer(configId, newPeer) - } - Utilities.showToastUiCentered( - activity, - context.getString(R.string.config_add_success_toast), - Toast.LENGTH_SHORT + RethinkBottomSheetCard { + Text(text = stringResource(R.string.add_peer), style = MaterialTheme.typography.titleLarge) + RuleSheetTextFieldRow( + value = publicKey, + onValueChange = { publicKey = it }, + label = { Text(text = stringResource(R.string.lbl_public_key)) }, + keyboardType = KeyboardType.Password + ) + RuleSheetTextFieldRow( + value = presharedKey, + onValueChange = { presharedKey = it }, + label = { Text(text = stringResource(R.string.lbl_preshared_key)) }, + keyboardType = KeyboardType.Password + ) + RuleSheetTextFieldRow( + value = keepAlive, + onValueChange = { value -> + keepAlive = value + keepAliveHint = + value.toIntOrNull()?.let { getDurationInHumanReadableFormat(context, it) } + .orEmpty() + }, + label = { Text(text = stringResource(R.string.lbl_persistent_keepalive)) }, + keyboardType = KeyboardType.Number + ) + if (keepAliveHint.isNotBlank()) { + Text( + text = keepAliveHint, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant ) - this.dismiss() } - } catch (e: Throwable) { - resetSaveButton() - val ex = Logger.throwableToException(e) - Logger.e(Logger.LOG_TAG_PROXY, "Error while adding peer", ex) - Utilities.showToastUiCentered( - activity, - ErrorMessages[activity, e], - Toast.LENGTH_SHORT + RuleSheetTextFieldRow( + value = endpoint, + onValueChange = { endpoint = it }, + label = { Text(text = stringResource(R.string.parse_error_inet_endpoint)) }, + keyboardType = KeyboardType.Password + ) + RuleSheetTextFieldRow( + value = allowedIps, + onValueChange = { allowedIps = it }, + label = { Text(text = stringResource(R.string.lbl_allowed_ips)) }, + keyboardType = KeyboardType.Text ) - return@setOnClickListener } + RethinkBottomSheetActionRow( + primaryText = stringResource(R.string.lbl_save), + onPrimaryClick = { + scope.launch { + savePeer( + context = context, + configId = configId, + wgPeer = wgPeer, + isEditing = isEditing, + publicKey = publicKey, + presharedKey = presharedKey, + allowedIps = allowedIps, + endpoint = endpoint, + keepAlive = keepAlive, + onSuccess = onDismiss, + onError = { message -> + Utilities.showToastUiCentered(context, message, Toast.LENGTH_SHORT) + } + ) + } + }, + secondaryText = stringResource(R.string.lbl_dismiss), + onSecondaryClick = onDismiss, + secondaryStyle = RethinkSecondaryActionStyle.TEXT + ) } } +} - /** Switch the Save button into a loading state: spinner visible, text dimmed. */ - private fun showSaving() { - b.customDialogOkButton.text = activity.getString(R.string.lbl_saving) - b.customDialogOkButton.isEnabled = false - b.customDialogOkProgress.visibility = View.VISIBLE - } - - /** Restore the Save button to its normal, interactive state. */ - private fun resetSaveButton() { - b.customDialogOkButton.text = activity.getString(R.string.lbl_save) - b.customDialogOkButton.isEnabled = true - b.customDialogOkProgress.visibility = View.GONE - } - - private fun ui(f: suspend () -> Unit) { - (activity as LifecycleOwner).lifecycleScope.launch(Dispatchers.Main) { f() } - } - - private suspend fun ioCtx(f: suspend () -> Unit) { - withContext(Dispatchers.IO) { f() } +private suspend fun savePeer( + context: android.content.Context, + configId: Int, + wgPeer: Peer?, + isEditing: Boolean, + publicKey: String, + presharedKey: String, + allowedIps: String, + endpoint: String, + keepAlive: String, + onSuccess: () -> Unit, + onError: (String) -> Unit +) { + try { + val builder = Peer.Builder() + if (allowedIps.isNotEmpty()) builder.parseAllowedIPs(allowedIps) + if (endpoint.isNotEmpty()) builder.parseEndpoint(endpoint) + if (keepAlive.isNotEmpty()) builder.parsePersistentKeepalive(keepAlive) + if (presharedKey.isNotEmpty()) builder.parsePreSharedKey(presharedKey) + if (publicKey.isNotEmpty()) builder.parsePublicKey(publicKey) + val newPeer = builder.build() + + withContext(Dispatchers.IO) { + if (wgPeer != null && isEditing) { + WireguardManager.deletePeer(configId, wgPeer) + } + WireguardManager.addPeer(configId, newPeer) + } + onSuccess() + } catch (e: Throwable) { + Napier.e("Error while adding peer", e) + onError(ErrorMessages[context, e]) } } diff --git a/app/src/full/java/com/celzero/bravedns/ui/dialog/WgDialogShared.kt b/app/src/full/java/com/celzero/bravedns/ui/dialog/WgDialogShared.kt new file mode 100644 index 000000000..ea251fd59 --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/dialog/WgDialogShared.kt @@ -0,0 +1,126 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.dialog + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.wrapContentWidth +import androidx.compose.material3.RadioButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog + +@Composable +internal fun WgDialog( + onDismissRequest: () -> Unit, + useSurface: Boolean = false, + content: @Composable () -> Unit +) { + Dialog( + onDismissRequest = onDismissRequest, + properties = DialogProperties(usePlatformDefaultWidth = false) + ) { + if (useSurface) { + Surface(color = MaterialTheme.colorScheme.background) { + content() + } + } else { + content() + } + } +} + +@Composable +internal fun WgDialogColumn( + modifier: Modifier = Modifier, + verticalSpacing: Dp = Dimensions.spacingMd, + scrollable: Boolean = false, + content: @Composable ColumnScope.() -> Unit +) { + Column( + modifier = + modifier + .fillMaxWidth() + .padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingLg + ) + .then(if (scrollable) Modifier.verticalScroll(rememberScrollState()) else Modifier), + verticalArrangement = Arrangement.spacedBy(verticalSpacing), + content = content + ) +} + +@Composable +internal fun WgConfirmDialog( + title: String, + message: String, + onDismiss: () -> Unit, + onConfirm: () -> Unit, + confirmText: String = stringResource(R.string.lbl_include), + isConfirmDestructive: Boolean = false +) { + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = title, + message = message, + confirmText = confirmText, + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = onConfirm, + onDismiss = onDismiss, + isConfirmDestructive = isConfirmDestructive + ) +} + +@Composable +internal fun WgOptionRow( + text: String, + selected: Boolean, + enabled: Boolean, + onSelected: () -> Unit, + modifier: Modifier = Modifier +) { + Row( + modifier = modifier + .wrapContentWidth() + .clickable(enabled = enabled, onClick = onSelected), + verticalAlignment = Alignment.CenterVertically + ) { + RadioButton( + selected = selected, + onClick = null, + enabled = enabled + ) + Text(text = text) + } +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/dialog/WgHopDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/dialog/WgHopDialog.kt index 973a057a3..4520e25ab 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/dialog/WgHopDialog.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/dialog/WgHopDialog.kt @@ -15,52 +15,71 @@ */ package com.celzero.bravedns.ui.dialog -import android.app.Activity -import com.celzero.bravedns.adapter.HopItem +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.HopRow import com.celzero.bravedns.service.WireguardManager +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetActionRow +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetCard import com.celzero.bravedns.wireguard.Config +import io.github.aakira.napier.Napier -/** - * Dialog for WireGuard configuration hopping - * Now extends GenericHopDialog to reuse common hop logic - */ -class WgHopDialog( - activity: Activity, - themeID: Int, +@Composable +fun WgHopDialog( srcId: Int, - configs: List, + hopables: List, selectedId: Int, - onHopChanged: ((Int) -> Unit)? = null -) : GenericHopDialog( - activity, - themeID, - srcId, - configs.map { config -> - val mapping = WireguardManager.getConfigFilesById(config.getId()) - HopItem.WireGuardHop(config, mapping?.isActive ?: false) - }, - selectedId, - onHopChanged + onDismiss: () -> Unit ) { - companion object { - /** - * Create WireGuard hop dialog - */ - fun create( - activity: Activity, - themeID: Int, - srcConfigId: Int, - availableConfigs: List, - currentlySelectedConfigId: Int = -1, - onHopChanged: ((Int) -> Unit)? = null - ): WgHopDialog { - return WgHopDialog( - activity, - themeID, - srcConfigId, - availableConfigs, - currentlySelectedConfigId, - onHopChanged + val context = LocalContext.current + WgDialog(onDismissRequest = onDismiss) { + val selectedHopId = remember(selectedId) { mutableStateOf(selectedId) } + WgDialogColumn( + modifier = Modifier.fillMaxSize(), + verticalSpacing = Dimensions.spacingSmMd + ) { + Text( + text = stringResource(R.string.hop_add_remove_title), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface + ) + RethinkBottomSheetCard(modifier = Modifier.weight(1f)) { + LazyColumn( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + items(hopables) { config -> + val mapping = WireguardManager.getConfigFilesById(config.getId()) ?: return@items + HopRow( + context = context, + srcId = srcId, + config = config, + isActive = mapping.isActive, + selectedId = selectedHopId.value, + onSelectedIdChange = { selectedHopId.value = it } + ) + } + } + } + RethinkBottomSheetActionRow( + primaryText = stringResource(R.string.ada_noapp_dialog_positive), + onPrimaryClick = { + Napier.d("Dismiss hop dialog") + onDismiss() + } ) } } diff --git a/app/src/full/java/com/celzero/bravedns/ui/dialog/WgIncludeAppsDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/dialog/WgIncludeAppsDialog.kt index 118aa9dc2..fb84dfb4f 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/dialog/WgIncludeAppsDialog.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/dialog/WgIncludeAppsDialog.kt @@ -15,331 +15,640 @@ */ package com.celzero.bravedns.ui.dialog -import Logger -import Logger.LOG_TAG_PROXY -import android.app.Activity -import android.app.Dialog -import android.graphics.PorterDuff -import android.graphics.PorterDuffColorFilter -import android.os.Bundle -import android.view.Window -import android.view.WindowManager -import android.view.animation.Animation -import android.view.animation.RotateAnimation -import android.widget.CompoundButton +import android.graphics.Color as AndroidColor +import android.os.Build import android.widget.Toast -import androidx.appcompat.widget.SearchView -import androidx.core.content.ContextCompat -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import androidx.recyclerview.widget.LinearLayoutManager +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.filled.Clear +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material.icons.filled.MoreVert +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExtendedFloatingActionButton +import androidx.compose.material3.FabPosition +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.ToggleButton +import androidx.compose.material3.ToggleButtonDefaults +import androidx.compose.material3.ButtonGroupDefaults +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.DialogWindowProvider +import androidx.core.view.WindowCompat import com.celzero.bravedns.R -import com.celzero.bravedns.adapter.WgIncludeAppsAdapter +import com.celzero.bravedns.adapter.IncludeAppRow import com.celzero.bravedns.database.RefreshDatabase -import com.celzero.bravedns.databinding.DialogWgAppsBinding +import com.celzero.bravedns.database.ProxyApplicationMapping +import com.celzero.bravedns.service.FirewallManager import com.celzero.bravedns.service.ProxyManager +import com.celzero.bravedns.ui.compose.firewall.IndexedFastScroller +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.CompactEmptyState +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkSearchField +import com.celzero.bravedns.ui.compose.theme.RethinkTopBar import com.celzero.bravedns.util.Utilities import com.celzero.bravedns.viewmodel.ProxyAppsMappingViewModel -import com.google.android.material.chip.Chip -import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.koin.core.component.KoinComponent import org.koin.core.component.inject - -class WgIncludeAppsDialog( - private var activity: Activity, - internal var adapter: WgIncludeAppsAdapter, - var viewModel: ProxyAppsMappingViewModel, - themeID: Int, - private val proxyId: String, - private val proxyName: String -) : Dialog(activity, themeID), SearchView.OnQueryTextListener, KoinComponent { - - private lateinit var b: DialogWgAppsBinding - - private lateinit var animation: Animation - private val refreshDatabase by inject() - private var filterType: TopLevelFilter = TopLevelFilter.ALL_APPS - private var searchText = "" - - companion object { - private const val ANIMATION_DURATION = 750L - private const val ANIMATION_REPEAT_COUNT = -1 - private const val ANIMATION_PIVOT_VALUE = 0.5f - private const val ANIMATION_START_DEGREE = 0.0f - private const val ANIMATION_END_DEGREE = 360.0f - - private const val REFRESH_TIMEOUT: Long = 4000 +import java.util.Locale + +@Composable +fun WgIncludeAppsDialog( + viewModel: ProxyAppsMappingViewModel, + proxyId: String, + proxyName: String, + onDismiss: () -> Unit +) { + WgDialog(onDismissRequest = onDismiss) { + WgIncludeAppsDialogScreen( + viewModel = viewModel, + proxyId = proxyId, + proxyName = proxyName, + onDismiss = onDismiss + ) } +} - enum class TopLevelFilter(val id: Int) { - ALL_APPS(0), - SELECTED_APPS(1), - UNSELECTED_APPS(2); +@Composable +fun WgIncludeAppsScreen( + viewModel: ProxyAppsMappingViewModel, + proxyId: String, + proxyName: String, + onDismiss: () -> Unit +) { + WgIncludeAppsDialogScreen( + viewModel = viewModel, + proxyId = proxyId, + proxyName = proxyName, + onDismiss = onDismiss, + inDialog = false + ) +} - fun getLabelId(): Int { - return when (this) { - ALL_APPS -> R.string.lbl_all - SELECTED_APPS -> R.string.rt_filter_parent_selected - UNSELECTED_APPS -> R.string.lbl_unselected - } - } - } +private const val REFRESH_TIMEOUT: Long = 4000 +private val FAST_SCROLLER_LIST_END_PADDING = 32.dp +private val DONE_FAB_CLEARANCE = 112.dp - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - requestWindowFeature(Window.FEATURE_NO_TITLE) - b = DialogWgAppsBinding.inflate(layoutInflater) - setContentView(b.root) - setCancelable(false) - addAnimation() - remakeFirewallChipsUi() - observeApps() - initializeValues() - initializeClickListeners() - } +enum class TopLevelFilter(val id: Int) { + ALL_APPS(0), + SELECTED_APPS(1), + UNSELECTED_APPS(2); - private fun addAnimation() { - animation = - RotateAnimation( - ANIMATION_START_DEGREE, - ANIMATION_END_DEGREE, - Animation.RELATIVE_TO_SELF, - ANIMATION_PIVOT_VALUE, - Animation.RELATIVE_TO_SELF, - ANIMATION_PIVOT_VALUE - ) - animation.repeatCount = ANIMATION_REPEAT_COUNT - animation.duration = ANIMATION_DURATION + fun getLabelId(): Int { + return when (this) { + ALL_APPS -> R.string.lbl_all + SELECTED_APPS -> R.string.rt_filter_parent_selected + UNSELECTED_APPS -> R.string.lbl_unselected + } } +} - private fun initializeValues() { - window?.setLayout( - WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.MATCH_PARENT - ) - - val layoutManager = LinearLayoutManager(activity) - b.wgIncludeAppRecyclerViewDialog.layoutManager = layoutManager - b.wgIncludeAppRecyclerViewDialog.adapter = adapter +@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) +@Composable +private fun WgIncludeAppsDialogScreen( + viewModel: ProxyAppsMappingViewModel, + proxyId: String, + proxyName: String, + onDismiss: () -> Unit, + inDialog: Boolean = true +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val refreshDatabase = remember { RefreshDatabaseProvider.get() } + var query by remember { mutableStateOf("") } + var selectedFilter by remember { mutableStateOf(TopLevelFilter.ALL_APPS) } + val apps by viewModel.apps.collectAsState(initial = emptyList()) + val allApps by viewModel.allApps.collectAsState(initial = emptyList()) + val listState = rememberLazyListState() + var isDialogVisible by remember { mutableStateOf(true) } + var isRefreshing by remember { mutableStateOf(false) } + var showOverflowMenu by remember { mutableStateOf(false) } + var excludedUids by remember { mutableStateOf>(emptySet()) } + val density = LocalDensity.current + val navBarBottomInset = with(density) { WindowInsets.navigationBars.getBottom(density).toDp() } + val showFastScroller = apps.size >= 8 + val fastScrollerKeys = remember(apps) { buildFastScrollerIndexKeys(apps) } + + if (inDialog) { + TransparentDialogSystemBars() + } else { + BackHandler(onBack = onDismiss) } - private fun observeApps() { - // observe DB-backed count so heading stays in sync as mappings change - viewModel.getAppCountById(proxyId).observe(activity as LifecycleOwner) { count -> - val safeCount = count ?: 0 - b.wgIncludeAppDialogHeading.text = - activity.getString(R.string.add_remove_apps, safeCount.toString()) + fun updateInterfaceDetails(mapping: com.celzero.bravedns.database.ProxyApplicationMapping, include: Boolean) { + scope.launch(Dispatchers.IO) { + if (FirewallManager.isAppExcludedFromProxy(mapping.uid)) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + context.getString(R.string.exclude_apps_from_proxy_failure_toast), + Toast.LENGTH_LONG + ) + } + return@launch + } + if (include) { + ProxyManager.updateProxyIdForPackage(mapping.uid, mapping.packageName, proxyId, proxyName) + } else { + ProxyManager.setNoProxyForPackage(mapping.uid, mapping.packageName) + } } } - private fun remakeFirewallChipsUi() { - b.wgIncludeAppDialogChipGroup.removeAllViews() - - val all = - makeFirewallChip( - TopLevelFilter.ALL_APPS.id, - activity.getString(TopLevelFilter.ALL_APPS.getLabelId()), - true - ) - - val selected = - makeFirewallChip( - TopLevelFilter.SELECTED_APPS.id, - activity.getString(TopLevelFilter.SELECTED_APPS.getLabelId()), - false - ) - - val unselected = - makeFirewallChip( - TopLevelFilter.UNSELECTED_APPS.id, - activity.getString(TopLevelFilter.UNSELECTED_APPS.getLabelId()), - false - ) - - b.wgIncludeAppDialogChipGroup.addView(all) - b.wgIncludeAppDialogChipGroup.addView(selected) - b.wgIncludeAppDialogChipGroup.addView(unselected) + fun selectAllApps() { + val appSnapshot = allApps.distinctBy { it.uid to it.packageName } + val excludedSnapshot = excludedUids + scope.launch(Dispatchers.IO) { + // Apply selection in one DB/cache update so the UI reflects quickly. + ProxyManager.setProxyIdForAllApps(proxyId, proxyName) + + // Keep excluded apps out of proxy routing. + if (excludedSnapshot.isNotEmpty()) { + appSnapshot + .asSequence() + .filter { excludedSnapshot.contains(it.uid) } + .forEach { mapping -> + ProxyManager.setNoProxyForPackage(mapping.uid, mapping.packageName) + } + } else { + appSnapshot.forEach { mapping -> + if (FirewallManager.isAppExcludedFromProxy(mapping.uid)) { + ProxyManager.setNoProxyForPackage(mapping.uid, mapping.packageName) + } + } + } + } } - private fun makeFirewallChip(id: Int, label: String, checked: Boolean): Chip { - val chip = this.layoutInflater.inflate(R.layout.item_chip_filter, b.root, false) as Chip - chip.tag = id - chip.text = label - chip.isChecked = checked - - chip.setOnCheckedChangeListener { button: CompoundButton, isSelected: Boolean -> - if (isSelected) { - applyFilter(button.tag) - colorUpChipIcon(chip) - } else { - // no-op - // no action needed for checkState: false + fun unselectAllApps() { + val appSnapshot = allApps.distinctBy { it.uid to it.packageName } + scope.launch(Dispatchers.IO) { + ProxyManager.removeProxyId(proxyId) + // Sweep per app to clear any stale/legacy Orbot mappings missed by id-only bulk update. + appSnapshot.forEach { mapping -> + val isMappedToCurrentProxy = + mapping.proxyId.equals(proxyId, ignoreCase = true) || + mapping.proxyName.equals(proxyName, ignoreCase = true) + if (isMappedToCurrentProxy) { + ProxyManager.setNoProxyForPackage(mapping.uid, mapping.packageName) + } } } + } - return chip + DisposableEffect(Unit) { + onDispose { isDialogVisible = false } } - private fun colorUpChipIcon(chip: Chip) { - val colorFilter = - PorterDuffColorFilter( - ContextCompat.getColor(activity, R.color.primaryText), - PorterDuff.Mode.SRC_IN - ) - chip.checkedIcon?.colorFilter = colorFilter - chip.chipIcon?.colorFilter = colorFilter + LaunchedEffect(query, selectedFilter) { + viewModel.setFilter(query, selectedFilter, proxyId) } - private fun applyFilter(tag: Any) { - when (tag as Int) { - TopLevelFilter.ALL_APPS.id -> { - filterType = TopLevelFilter.ALL_APPS - viewModel.setFilter(searchText, filterType, proxyId) - } - TopLevelFilter.SELECTED_APPS.id -> { - filterType = TopLevelFilter.SELECTED_APPS - viewModel.setFilter(searchText, filterType, proxyId) + LaunchedEffect(allApps) { + val snapshot = allApps + excludedUids = + withContext(Dispatchers.IO) { + val excluded = mutableSetOf() + snapshot.forEach { mapping -> + if (FirewallManager.isAppExcludedFromProxy(mapping.uid)) { + excluded.add(mapping.uid) + } + } + excluded } - TopLevelFilter.UNSELECTED_APPS.id -> { - filterType = TopLevelFilter.UNSELECTED_APPS - viewModel.setFilter(searchText, filterType, proxyId) + } + + fun refreshApps() { + if (isRefreshing) return + isRefreshing = true + scope.launch(Dispatchers.IO) { + refreshDatabase.refresh(RefreshDatabase.ACTION_REFRESH_INTERACTIVE) + } + scope.launch { + delay(REFRESH_TIMEOUT) + if (isDialogVisible) { + isRefreshing = false + Utilities.showToastUiCentered( + context, + context.getString(R.string.refresh_complete), + Toast.LENGTH_SHORT + ) } } } - private fun initializeClickListeners() { - b.wgIncludeAppDialogOkButton.setOnClickListener { - clearSearch() - dismiss() + val allAppsSelected = + allApps.isNotEmpty() && + allApps.all { mapping -> + excludedUids.contains(mapping.uid) || + mapping.proxyId.equals(proxyId, ignoreCase = true) || + mapping.proxyName.equals(proxyName, ignoreCase = true) + } + + Scaffold( + modifier = Modifier.fillMaxSize(), + containerColor = if (inDialog) Color.Transparent else MaterialTheme.colorScheme.background, + contentWindowInsets = WindowInsets(0, 0, 0, 0), + floatingActionButtonPosition = FabPosition.Center, + floatingActionButton = { + ExtendedFloatingActionButton( + onClick = onDismiss, + icon = { + Icon( + imageVector = Icons.Filled.Check, + contentDescription = null + ) + }, + text = { Text(text = stringResource(R.string.lbl_done)) }, + modifier = Modifier.padding(bottom = navBarBottomInset + Dimensions.spacingSm) + ) + }, + topBar = { + RethinkTopBar( + title = proxyName, + onBackClick = onDismiss, + containerColor = MaterialTheme.colorScheme.surface, + scrolledContainerColor = MaterialTheme.colorScheme.surface, + actions = { + ProxyAppsTopBarFilterGroup( + selectedFilter = selectedFilter, + onFilterChange = { selectedFilter = it } + ) + IconButton(onClick = { showOverflowMenu = true }) { + Icon( + imageVector = Icons.Filled.MoreVert, + contentDescription = stringResource(R.string.cd_more) + ) + } + DropdownMenu( + expanded = showOverflowMenu, + onDismissRequest = { showOverflowMenu = false } + ) { + DropdownMenuItem( + leadingIcon = { + Icon( + imageVector = Icons.Filled.Refresh, + contentDescription = null + ) + }, + text = { + Text( + text = + if (isRefreshing) { + stringResource(R.string.lbl_loading) + } else { + stringResource(R.string.cd_refresh) + } + ) + }, + enabled = !isRefreshing, + onClick = { + showOverflowMenu = false + refreshApps() + } + ) + DropdownMenuItem( + leadingIcon = { + Icon( + imageVector = + if (allAppsSelected) { + Icons.Filled.Clear + } else { + Icons.Filled.Check + }, + contentDescription = null + ) + }, + text = { + Text( + text = + if (allAppsSelected) { + stringResource(R.string.lbl_unselect_all) + } else { + stringResource(R.string.lbl_select_all) + } + ) + }, + onClick = { + showOverflowMenu = false + if (allAppsSelected) { + unselectAllApps() + } else { + selectAllApps() + } + } + ) + } + } + ) } + ) { paddingValues -> + Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { + LazyColumn( + state = listState, + modifier = + Modifier + .fillMaxSize() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + contentPadding = + PaddingValues( + end = if (showFastScroller) FAST_SCROLLER_LIST_END_PADDING else 0.dp, + bottom = DONE_FAB_CLEARANCE + navBarBottomInset + ), + verticalArrangement = Arrangement.spacedBy(0.dp) + ) { + item { + ProxyAppsControlDeck( + modifier = + Modifier + .fillMaxWidth() + .padding(bottom = Dimensions.spacingSm), + query = query, + onQueryChange = { query = it } + ) + } - b.wgIncludeAppDialogSearchView.setOnQueryTextListener(this) + if (apps.isEmpty()) { + item { + CompactEmptyState( + message = stringResource(R.string.fapps_empty_subtitle) + ) + } + } + for (index in apps.indices) { + val item = apps[index] + val currentInitial = appInitial(item.appName, item.packageName) + val previousInitial = + if (index > 0) { + appInitial(apps[index - 1].appName, apps[index - 1].packageName) + } else { + null + } + val nextInitial = + if (index < apps.size - 1) { + appInitial(apps[index + 1].appName, apps[index + 1].packageName) + } else { + null + } + val isFirstInGroup = previousInitial == null || currentInitial != previousInitial + val isLastInGroup = nextInitial == null || currentInitial != nextInitial + + if (isFirstInGroup) { + stickyHeader(key = "proxy_header_$currentInitial") { + ProxyAppsLetterHeader(letter = currentInitial) + } + } + + item(key = "proxy_app_${item.uid}_${item.packageName}") { + IncludeAppRow( + mapping = item, + proxyId = proxyId, + position = + when { + isFirstInGroup && isLastInGroup -> CardPosition.Single + isFirstInGroup -> CardPosition.First + isLastInGroup -> CardPosition.Last + else -> CardPosition.Middle + }, + onInterfaceUpdate = { mapping, include -> + updateInterfaceDetails(mapping, include) + } + ) + } + } + } - b.wgIncludeAppDialogSearchView.setOnCloseListener { - clearSearch() - false + if (showFastScroller) { + IndexedFastScroller( + items = fastScrollerKeys, + listState = listState, + getIndexKey = { it }, + scrollItemOffset = 2, + minItemCount = 8, + modifier = + Modifier + .align(Alignment.CenterEnd) + .padding(top = Dimensions.spacingSm, bottom = Dimensions.spacingSm + navBarBottomInset) + .padding(end = 2.dp) + ) + } } + } +} - b.wgIncludeAppSelectAllCheckbox.setOnClickListener { - showDialog(b.wgIncludeAppSelectAllCheckbox.isChecked) +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +private fun ProxyAppsTopBarFilterGroup( + selectedFilter: TopLevelFilter, + onFilterChange: (TopLevelFilter) -> Unit +) { + val options = listOf(TopLevelFilter.ALL_APPS, TopLevelFilter.SELECTED_APPS) + val selectedOption = + if (selectedFilter == TopLevelFilter.UNSELECTED_APPS) { + TopLevelFilter.ALL_APPS + } else { + selectedFilter } - b.wgRemainingAppsBtn.setOnClickListener { showConfirmationDialog() } - - b.wgIncludeAppSelectAllCheckbox.setOnCheckedChangeListener(null) - - b.wgRefreshList.setOnClickListener { - b.wgRefreshList.isEnabled = false - b.wgRefreshList.animation = animation - b.wgRefreshList.startAnimation(animation) - refreshDatabase() - val l = activity as LifecycleOwner - Utilities.delay(REFRESH_TIMEOUT, l.lifecycleScope) { - if (this.isShowing) { - b.wgRefreshList.isEnabled = true - b.wgRefreshList.clearAnimation() - Utilities.showToastUiCentered( - context, - context.getString(R.string.refresh_complete), - Toast.LENGTH_SHORT - ) - } + Row(horizontalArrangement = Arrangement.spacedBy(ButtonGroupDefaults.ConnectedSpaceBetween)) { + options.forEachIndexed { index, option -> + val isSelected = option == selectedOption + ToggleButton( + checked = isSelected, + onCheckedChange = { checked -> + if (checked && !isSelected) onFilterChange(option) + }, + shapes = + when (index) { + 0 -> ButtonGroupDefaults.connectedLeadingButtonShapes() + options.lastIndex -> ButtonGroupDefaults.connectedTrailingButtonShapes() + else -> ButtonGroupDefaults.connectedMiddleButtonShapes() + }, + colors = + ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.primaryContainer, + checkedContentColor = MaterialTheme.colorScheme.onPrimaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerLow, + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + border = null, + modifier = + Modifier + .heightIn(min = 34.dp) + .semantics { role = Role.RadioButton } + ) { + Text( + text = stringResource(option.getLabelId()), + maxLines = 1, + fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Medium + ) } } } +} - private fun refreshDatabase() { - io { refreshDatabase.refresh(RefreshDatabase.ACTION_REFRESH_INTERACTIVE) } - } +private fun buildFastScrollerIndexKeys(loadedItems: List): List { + val indexKeys = mutableListOf() + var previousInitial: String? = null - private fun refreshPagingAdapter() { - viewModel.setFilter(searchText, filterType, proxyId) - adapter.refresh() + loadedItems.forEach { item -> + val initial = appInitial(item.appName, item.packageName) + if (initial != previousInitial) { + indexKeys.add(initial) + previousInitial = initial + } + indexKeys.add(item.appName.ifBlank { item.packageName }) } - private fun clearSearch() { - viewModel.setFilter("", TopLevelFilter.ALL_APPS, proxyId) - } + return indexKeys +} - private fun showDialog(toAdd: Boolean) { - val builder = MaterialAlertDialogBuilder(context, R.style.App_Dialog_NoDim) - if (toAdd) { - builder.setTitle(context.getString(R.string.include_all_app_wg_dialog_title)) - builder.setMessage(context.getString(R.string.include_all_app_wg_dialog_desc)) - } else { - builder.setTitle(context.getString(R.string.exclude_all_app_wg_dialog_title)) - builder.setMessage(context.getString(R.string.exclude_all_app_wg_dialog_desc)) - } - builder.setCancelable(true) - builder.setPositiveButton( - if (toAdd) context.getString(R.string.lbl_include) - else context.getString(R.string.exclude) - ) { _, _ -> - io { - if (toAdd) { - Logger.i(LOG_TAG_PROXY, "Adding all apps to proxy $proxyId, $proxyName") - ProxyManager.setProxyIdForAllApps(proxyId, proxyName) +@Composable +private fun TransparentDialogSystemBars() { + val view = LocalView.current + DisposableEffect(view) { + val window = (view.parent as? DialogWindowProvider)?.window + if (window != null) { + val originalNavBarColor = window.navigationBarColor + val originalNavBarDividerColor = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + window.navigationBarDividerColor } else { - Logger.i(LOG_TAG_PROXY, "Removing all apps from proxy $proxyId, $proxyName") - ProxyManager.setNoProxyForAllAppsForProxy(proxyId) + null } - // re-apply current filter to force Paging source reload and UI refresh - withContext(Dispatchers.Main) { - // Update checkbox state to match the action taken - b.wgIncludeAppSelectAllCheckbox.isChecked = toAdd - refreshPagingAdapter() + val originalContrastEnforced = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + window.isNavigationBarContrastEnforced + } else { + null } + WindowCompat.setDecorFitsSystemWindows(window, false) + window.navigationBarColor = AndroidColor.TRANSPARENT + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + window.navigationBarDividerColor = AndroidColor.TRANSPARENT } - } - - builder.setNegativeButton(context.getString(R.string.lbl_cancel)) { _, _ -> - // Revert checkbox state on cancel - b.wgIncludeAppSelectAllCheckbox.isChecked = !toAdd - } - - builder.create().show() - } - - private fun showConfirmationDialog() { - val builder = MaterialAlertDialogBuilder(context, R.style.App_Dialog_NoDim) - builder.setTitle(context.getString(R.string.remaining_apps_dialog_title)) - builder.setMessage(context.getString(R.string.remaining_apps_dialog_desc)) - builder.setCancelable(true) - builder.setPositiveButton(context.getString(R.string.lbl_include)) { _, _ -> - io { - Logger.i(LOG_TAG_PROXY, "Adding remaining apps to proxy $proxyId, $proxyName") - ProxyManager.setProxyIdForUnselectedApps(proxyId, proxyName) - // refresh paging / adapter after bulk add - withContext(Dispatchers.Main) { - refreshPagingAdapter() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + window.isNavigationBarContrastEnforced = false + } + onDispose { + WindowCompat.setDecorFitsSystemWindows(window, true) + window.navigationBarColor = originalNavBarColor + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && originalNavBarDividerColor != null) { + window.navigationBarDividerColor = originalNavBarDividerColor + } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && originalContrastEnforced != null) { + window.isNavigationBarContrastEnforced = originalContrastEnforced } } + } else { + onDispose {} } - - builder.setNegativeButton(context.getString(R.string.lbl_cancel)) { _, _ -> - // no-op - } - - builder.create().show() } +} - override fun onQueryTextSubmit(query: String): Boolean { - searchText = query - viewModel.setFilter(query, filterType, proxyId) - return true +@Composable +private fun ProxyAppsControlDeck( + modifier: Modifier = Modifier, + query: String, + onQueryChange: (String) -> Unit +) { + Row( + modifier = modifier, + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically + ) { + RethinkSearchField( + modifier = Modifier.fillMaxWidth(), + query = query, + onQueryChange = onQueryChange, + placeholder = stringResource(R.string.search_proxy_add_apps), + onClearQuery = { onQueryChange("") }, + clearQueryContentDescription = stringResource(R.string.cd_clear_search), + containerColor = MaterialTheme.colorScheme.surfaceContainerLow, + textStyle = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium), + iconSize = 18.dp, + trailingIconSize = 16.dp, + trailingIconButtonSize = 32.dp + ) } +} - override fun onQueryTextChange(query: String): Boolean { - searchText = query - viewModel.setFilter(query, filterType, proxyId) - return true +private object RefreshDatabaseProvider : KoinComponent { + val refreshDatabase: RefreshDatabase by inject() + + fun get(): RefreshDatabase = refreshDatabase +} + +@Composable +private fun ProxyAppsLetterHeader(letter: String) { + androidx.compose.foundation.layout.Box( + modifier = + Modifier + .fillMaxWidth() + .background(MaterialTheme.colorScheme.surface) + .padding(start = 20.dp, top = 20.dp, bottom = 4.dp) + ) { + Text( + text = letter, + style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.primary, + fontWeight = FontWeight.Bold + ) } +} - private fun io(f: suspend () -> Unit) { - (activity as LifecycleOwner).lifecycleScope.launch(Dispatchers.IO) { f() } +private fun appInitial(appName: String, packageName: String): String { + val source = appName.ifBlank { packageName }.trim() + if (source.isEmpty()) return "#" + val first = source.first() + return if (first.isLetter()) { + first.uppercaseChar().toString() + } else { + source.first().toString().uppercase(Locale.getDefault()) } } diff --git a/app/src/full/java/com/celzero/bravedns/ui/dialog/WgSsidDialog.kt b/app/src/full/java/com/celzero/bravedns/ui/dialog/WgSsidDialog.kt index d6c502174..22476fd62 100644 --- a/app/src/full/java/com/celzero/bravedns/ui/dialog/WgSsidDialog.kt +++ b/app/src/full/java/com/celzero/bravedns/ui/dialog/WgSsidDialog.kt @@ -15,278 +15,320 @@ */ package com.celzero.bravedns.ui.dialog -import android.app.Activity -import android.app.Dialog -import android.os.Bundle -import android.view.Gravity -import android.view.Window -import android.view.WindowManager -import android.view.inputmethod.EditorInfo + import android.widget.Toast -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import androidx.core.widget.addTextChangedListener -import androidx.recyclerview.widget.LinearLayoutManager +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material3.Button +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import com.celzero.bravedns.R -import com.celzero.bravedns.adapter.SsidAdapter import com.celzero.bravedns.data.SsidItem -import com.celzero.bravedns.databinding.DialogWgSsidBinding -import com.celzero.bravedns.util.UIUtils +import com.celzero.bravedns.ui.bottomsheet.RuleSheetTextFieldRow +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetActionRow +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetCard +import com.celzero.bravedns.ui.compose.theme.RethinkSecondaryActionStyle import com.celzero.bravedns.util.Utilities -import com.google.android.material.dialog.MaterialAlertDialogBuilder - -class WgSsidDialog( - private val activity: Activity, - private val themeId: Int, - private val currentSsids: String, - private val onSave: (String) -> Unit -) : Dialog(activity, themeId) { - - private lateinit var b: DialogWgSsidBinding - private lateinit var ssidAdapter: SsidAdapter - private val ssidItems = mutableListOf() - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - requestWindowFeature(Window.FEATURE_NO_TITLE) - - b = DialogWgSsidBinding.inflate(layoutInflater) - setContentView(b.root) - setCancelable(false) - setupDialog() - setupRecyclerView() - loadCurrentSsids() - setupClickListeners() - } - - private fun setupDialog() { - window?.setLayout( - WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.WRAP_CONTENT +@Composable +fun WgSsidDialog( + currentSsids: String, + onSave: (String) -> Unit, + onDismiss: () -> Unit +) { + WgDialog(onDismissRequest = onDismiss) { + SsidDialogContent( + currentSsids = currentSsids, + onSave = onSave, + onDismiss = onDismiss ) - - window?.setGravity(Gravity.CENTER) - ViewCompat.setOnApplyWindowInsetsListener(b.root) { view, insets -> - val sysInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars()) - view.setPadding(0, sysInsets.top, 0, sysInsets.bottom) - insets - } - - b.descriptionTextView.text = getDescTxt() - b.ssidTextInputLayout.hint = context.getString(R.string.wg_ssid_input_hint, context.getString(R.string.lbl_ssids)) - b.radioNotEqual.text = context.getString(R.string.notification_action_pause_vpn).lowercase().replaceFirstChar { it.uppercase() } - - // set initial state of add button to disabled - b.addSsidBtn.isEnabled = false - b.addSsidBtn.isClickable = false - b.addSsidBtn.setTextColor(UIUtils.fetchColor(context, R.attr.primaryLightColorText)) - disableOrEnableRadioButtons(false) - - // listeners to update description text when radio buttons change - b.ssidConditionRadioGroup.setOnCheckedChangeListener { _, _ -> - updateDescriptionText() - } - - b.ssidMatchTypeRadioGroup.setOnCheckedChangeListener { _, _ -> - updateDescriptionText() - } - } - - private fun getDescTxt(): String { - val isEqual = b.radioEqual.isChecked - val isExact = b.radioExact.isChecked - - val pauseTxt = context.getString(R.string.notification_action_pause_vpn).lowercase().replaceFirstChar { it.uppercase() } - val connectTxt = context.getString(R.string.lbl_connect).lowercase().replaceFirstChar { it.uppercase() } - val firstArg = if (isEqual) connectTxt else pauseTxt - val secArg = context.getString(R.string.lbl_ssid) - - val exactMatchTxt = context.getString(R.string.wg_ssid_type_exact).lowercase() - val partialMatchTxt = context.getString(R.string.wg_ssid_type_wildcard).lowercase() - val thirdArg = if (isExact) exactMatchTxt else partialMatchTxt - return context.getString(R.string.wg_ssid_dialog_description, firstArg, secArg, thirdArg) } +} - private fun updateDescriptionText() { - b.descriptionTextView.text = getDescTxt() - } - - private fun setupRecyclerView() { - ssidAdapter = SsidAdapter(ssidItems) { ssidItem -> - showDeleteConfirmation(ssidItem) - } - - b.ssidRecyclerView.apply { - layoutManager = LinearLayoutManager(activity) - adapter = ssidAdapter +@Composable +private fun SsidDialogContent( + currentSsids: String, + onSave: (String) -> Unit, + onDismiss: () -> Unit +) { + val context = LocalContext.current + val ssidItems = remember { + mutableStateListOf().apply { + addAll(SsidItem.parseStorageList(currentSsids)) } } - - private fun loadCurrentSsids() { - val parsedSsids = SsidItem.parseStorageList(currentSsids) - ssidItems.clear() - ssidItems.addAll(parsedSsids) - ssidAdapter.notifyDataSetChanged() + var ssidInput by remember { mutableStateOf("") } + var isEqual by remember { mutableStateOf(true) } + var isExact by remember { mutableStateOf(false) } + var deleteTarget by remember { mutableStateOf(null) } + + val canEdit = ssidInput.isNotBlank() + val pauseTxt = + context.getString(R.string.notification_action_pause_vpn).lowercase() + .replaceFirstChar { it.uppercase() } + val connectTxt = + context.getString(R.string.lbl_connect).lowercase() + .replaceFirstChar { it.uppercase() } + val firstArg = if (isEqual) connectTxt else pauseTxt + val secArg = context.getString(R.string.lbl_ssid) + val exactMatchTxt = context.getString(R.string.wg_ssid_type_exact).lowercase() + val partialMatchTxt = context.getString(R.string.wg_ssid_type_wildcard).lowercase() + val thirdArg = if (isExact) exactMatchTxt else partialMatchTxt + val description = context.getString(R.string.wg_ssid_dialog_description, firstArg, secArg, thirdArg) + + if (deleteTarget != null) { + val item = deleteTarget ?: return + WgConfirmDialog( + title = stringResource(R.string.lbl_delete), + message = + stringResource( + R.string.two_argument_space, + stringResource(R.string.lbl_delete), + item.name + ), + confirmText = stringResource(R.string.lbl_delete), + isConfirmDestructive = true, + onDismiss = { deleteTarget = null }, + onConfirm = { + ssidItems.remove(item) + deleteTarget = null + } + ) } - private fun setupClickListeners() { - b.addSsidBtn.setOnClickListener { - addSsid() - } - - b.ssidEditText.setOnEditorActionListener { view, actionId, _ -> - if (actionId == EditorInfo.IME_ACTION_DONE) { - // Hide keyboard first - val imm = context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as android.view.inputmethod.InputMethodManager - imm.hideSoftInputFromWindow(view.windowToken, 0) - - // Post the addSsid call to ensure it happens after keyboard is hidden - // This prevents focus search issues - view.post { - view.clearFocus() - addSsid() + WgDialogColumn(verticalSpacing = Dimensions.spacingMd) { + Text(text = stringResource(R.string.wg_setting_ssid_title), style = MaterialTheme.typography.titleLarge) + Text(text = description, style = MaterialTheme.typography.bodyMedium) + + RethinkBottomSheetCard { + LazyColumn( + modifier = Modifier.fillMaxWidth().heightIn(max = 200.dp), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + items(ssidItems, key = { it.name + it.type.id }) { item -> + SsidRow(ssidItem = item, onDeleteClick = { deleteTarget = item }) } - - // Return true to indicate we handled the action - true - } else { - false } } - b.ssidEditText.addTextChangedListener { text -> - val isNotEmpty = !text.isNullOrBlank() - - // Enable or disable add button based on text - b.addSsidBtn.isEnabled = isNotEmpty - b.addSsidBtn.isClickable = isNotEmpty - - // Enable or disable radio buttons based on text - // User should only be able to change settings when there's an SSID to apply them to - disableOrEnableRadioButtons(isNotEmpty) - - // Change button background color based on state - val context = b.addSsidBtn.context - val enabledColor = UIUtils.fetchColor(context, R.attr.accentGood) - val disabledColor = UIUtils.fetchColor(context, R.attr.primaryLightColorText) + RethinkBottomSheetCard { + WgOptionGroup( + title = stringResource(R.string.lbl_action), + enabled = canEdit, + options = listOf( + WgChoiceOption( + text = stringResource(R.string.lbl_connect), + selected = isEqual, + onSelected = { isEqual = true } + ), + WgChoiceOption( + text = pauseTxt, + selected = !isEqual, + onSelected = { isEqual = false } + ) + ) + ) - b.addSsidBtn.setTextColor(if (isNotEmpty) enabledColor else disabledColor) - } + WgOptionGroup( + title = stringResource(R.string.lbl_criteria), + enabled = canEdit, + options = listOf( + WgChoiceOption( + text = stringResource(R.string.wg_ssid_type_exact), + selected = isExact, + onSelected = { isExact = true } + ), + WgChoiceOption( + text = stringResource(R.string.wg_ssid_type_wildcard), + selected = !isExact, + onSelected = { isExact = false } + ) + ) + ) - b.cancelBtn.setOnClickListener { - dismiss() - } + Column(verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm)) { + Text( + text = stringResource(R.string.lbl_ssid), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + RuleSheetTextFieldRow( + value = ssidInput, + onValueChange = { ssidInput = it }, + placeholder = { Text(text = stringResource(R.string.lbl_ssid)) }, + ) + } - b.saveBtn.setOnClickListener { - saveSsids() + Row(horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm)) { + Button( + onClick = { + addSsid( + context = context, + ssidInput = ssidInput, + isEqual = isEqual, + isExact = isExact, + items = ssidItems, + onReset = { + ssidInput = "" + isEqual = true + isExact = false + } + ) + }, + enabled = canEdit + ) { + Text( + text = stringResource(R.string.lbl_add), + color = if (canEdit) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } } - } - private fun disableOrEnableRadioButtons(enable: Boolean) { - b.radioEqual.isEnabled = enable - b.radioEqual.isClickable = enable - b.radioNotEqual.isEnabled = enable - b.radioNotEqual.isClickable = enable - b.radioExact.isEnabled = enable - b.radioExact.isClickable = enable - b.radioWildcard.isEnabled = enable - b.radioWildcard.isClickable = enable + RethinkBottomSheetActionRow( + primaryText = stringResource(R.string.fapps_info_dialog_positive_btn), + onPrimaryClick = { + val finalSsids = SsidItem.toStorageList(ssidItems.toList()) + onSave(finalSsids) + onDismiss() + }, + secondaryText = stringResource(R.string.lbl_cancel), + onSecondaryClick = onDismiss, + secondaryStyle = RethinkSecondaryActionStyle.TEXT + ) } +} - private fun addSsid() { - val ssidName = b.ssidEditText.text?.toString()?.trim() - - if (ssidName.isNullOrBlank()) { - Utilities.showToastUiCentered( - activity, - activity.getString(R.string.wg_ssid_invalid_error, activity.getString(R.string.lbl_ssids)), - Toast.LENGTH_SHORT - ) - return +private data class WgChoiceOption( + val text: String, + val selected: Boolean, + val onSelected: () -> Unit +) + +@Composable +private fun WgOptionGroup( + title: String, + enabled: Boolean, + options: List +) { + Column(verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm)) { + Text( + text = title, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Row(horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingMd)) { + options.forEach { option -> + WgOptionRow( + text = option.text, + selected = option.selected, + enabled = enabled, + onSelected = option.onSelected + ) + } } + } +} - // Validate SSID name - if (!isValidSsidName(ssidName)) { - Utilities.showToastUiCentered( - activity, - activity.getString(R.string.config_add_success_toast), - Toast.LENGTH_SHORT +@Composable +private fun SsidRow(ssidItem: SsidItem, onDeleteClick: () -> Unit) { + val context = LocalContext.current + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = ssidItem.name, + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.bodyMedium + ) + Text( + text = ssidItem.type.getDisplayName(context), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error + ) + IconButton(onClick = onDeleteClick) { + Icon( + painter = painterResource(id = R.drawable.ic_delete), + contentDescription = stringResource(R.string.lbl_delete) ) - return - } - - // Determine the selected type based on both radio groups - val isEqual = b.radioEqual.isChecked - val isExact = b.radioExact.isChecked - - val selectedType = when { - isEqual && isExact -> SsidItem.SsidType.EQUAL_EXACT - isEqual && !isExact -> SsidItem.SsidType.EQUAL_WILDCARD - !isEqual && isExact -> SsidItem.SsidType.NOTEQUAL_EXACT - else -> SsidItem.SsidType.NOTEQUAL_WILDCARD - } - - val newSsidItem = SsidItem(ssidName, selectedType) - - // Check if same name and type already exists - val existingWithSameType = ssidItems.find { - it.name.equals(ssidName, ignoreCase = true) && it.type == selectedType - } - - if (existingWithSameType != null) { - // Same name and type already exists, just clear input - b.ssidEditText.text?.clear() - resetToDefaultSelection() - return - } - - // Check if same name exists with different type - val existingWithDifferentType = ssidItems.find { - it.name.equals(ssidName, ignoreCase = true) && it.type != selectedType - } - - if (existingWithDifferentType != null) { - // Remove the existing one and add the new one (update) - ssidAdapter.removeSsidItem(existingWithDifferentType) } + } +} - ssidAdapter.addSsidItem(newSsidItem) - b.ssidEditText.text?.clear() +private fun isValidSsidName(ssidName: String): Boolean { + return ssidName.length <= 32 && ssidName.isNotBlank() +} - // Reset to default selection - resetToDefaultSelection() +private fun addSsid( + context: android.content.Context, + ssidInput: String, + isEqual: Boolean, + isExact: Boolean, + items: MutableList, + onReset: () -> Unit +) { + val ssidName = ssidInput.trim() + if (ssidName.isBlank()) { + Utilities.showToastUiCentered( + context, + context.getString(R.string.wg_ssid_invalid_error, context.getString(R.string.lbl_ssids)), + Toast.LENGTH_SHORT + ) + return } - private fun resetToDefaultSelection() { - b.radioEqual.isChecked = true - b.radioWildcard.isChecked = true + if (!isValidSsidName(ssidName)) { + Utilities.showToastUiCentered( + context, + context.getString(R.string.config_add_success_toast), + Toast.LENGTH_SHORT + ) + return } - private fun isValidSsidName(ssidName: String): Boolean { - // Basic validation - reasonable length - return ssidName.length <= 32 && - ssidName.isNotBlank() + val selectedType = when { + isEqual && isExact -> SsidItem.SsidType.EQUAL_EXACT + isEqual && !isExact -> SsidItem.SsidType.EQUAL_WILDCARD + !isEqual && isExact -> SsidItem.SsidType.NOTEQUAL_EXACT + else -> SsidItem.SsidType.NOTEQUAL_WILDCARD } - private fun showDeleteConfirmation(ssidItem: SsidItem) { - val builder = MaterialAlertDialogBuilder(activity, R.style.App_Dialog_NoDim) - builder.setTitle(activity.getString(R.string.lbl_delete)) - builder.setMessage( - activity.getString(R.string.two_argument_space, activity.getString(R.string.lbl_delete), ssidItem.name) - ) - builder.setCancelable(true) - builder.setPositiveButton(activity.getString(R.string.lbl_delete)) { _, _ -> - ssidAdapter.removeSsidItem(ssidItem) - } - builder.setNegativeButton(activity.getString(R.string.lbl_cancel)) { _, _ -> - // no-op - } - builder.create().show() + val existingWithSameType = + items.find { it.name.equals(ssidName, ignoreCase = true) && it.type == selectedType } + if (existingWithSameType != null) { + onReset() + return } - private fun saveSsids() { - val finalSsids = SsidItem.toStorageList(ssidAdapter.getSsidItems()) - onSave(finalSsids) - dismiss() + val existingWithDifferentType = + items.find { it.name.equals(ssidName, ignoreCase = true) && it.type != selectedType } + if (existingWithDifferentType != null) { + items.remove(existingWithDifferentType) } + + items.add(SsidItem(ssidName, selectedType)) + onReset() } diff --git a/app/src/full/java/com/celzero/bravedns/ui/rethink/RethinkBlocklistFilterHost.kt b/app/src/full/java/com/celzero/bravedns/ui/rethink/RethinkBlocklistFilterHost.kt new file mode 100644 index 000000000..7dc108bfc --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/rethink/RethinkBlocklistFilterHost.kt @@ -0,0 +1,22 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.rethink + +import androidx.lifecycle.MutableLiveData + +interface RethinkBlocklistFilterHost { + fun filterObserver(): MutableLiveData +} diff --git a/app/src/full/java/com/celzero/bravedns/ui/rethink/RethinkBlocklistState.kt b/app/src/full/java/com/celzero/bravedns/ui/rethink/RethinkBlocklistState.kt new file mode 100644 index 000000000..673e08ddf --- /dev/null +++ b/app/src/full/java/com/celzero/bravedns/ui/rethink/RethinkBlocklistState.kt @@ -0,0 +1,58 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.rethink + +import androidx.lifecycle.MutableLiveData + +object RethinkBlocklistState { + val selectedFileTags: MutableLiveData> = MutableLiveData() + + fun updateFileTagList(fileTags: Set) { + selectedFileTags.postValue(fileTags.toMutableSet()) + } + + fun getSelectedFileTags(): Set { + return selectedFileTags.value ?: emptySet() + } + + enum class BlocklistSelectionFilter(val id: Int) { + ALL(0), + SELECTED(1) + } + + class Filters { + var query: String = "%%" + var filterSelected: BlocklistSelectionFilter = BlocklistSelectionFilter.ALL + var subGroups: MutableSet = mutableSetOf() + } + + enum class BlocklistView(val tag: String) { + PACKS("1"), + ADVANCED("2"); + + fun isSimple() = this == PACKS + + companion object { + fun getTag(tag: String): BlocklistView { + return if (tag == PACKS.tag) { + PACKS + } else { + ADVANCED + } + } + } + } +} diff --git a/app/src/full/java/com/celzero/bravedns/util/UIUtils.kt b/app/src/full/java/com/celzero/bravedns/util/UIUtils.kt index 9cb885c79..77d271482 100644 --- a/app/src/full/java/com/celzero/bravedns/util/UIUtils.kt +++ b/app/src/full/java/com/celzero/bravedns/util/UIUtils.kt @@ -22,45 +22,28 @@ import android.content.ClipData import android.content.ClipboardManager import android.content.Context import android.content.Intent -import android.content.res.TypedArray -import android.graphics.Color -import android.graphics.Typeface +import android.graphics.Paint import android.net.Uri import android.os.Build import android.provider.Settings import android.text.Html -import android.text.SpannableString import android.text.Spanned import android.text.format.DateUtils -import android.text.style.StyleSpan -import android.util.TypedValue -import android.view.View -import android.view.ViewGroup -import android.view.ViewOutlineProvider -import android.widget.FrameLayout -import android.widget.TextView import android.widget.Toast import androidx.appcompat.widget.AppCompatTextView -import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat import androidx.core.content.getSystemService import androidx.core.net.toUri import androidx.core.text.HtmlCompat -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import com.celzero.bravedns.R -import com.celzero.bravedns.database.AppInfoRepository.Companion.NO_PACKAGE_PREFIX import com.celzero.bravedns.database.DnsLog import com.celzero.bravedns.glide.FavIconDownloader import com.celzero.bravedns.net.doh.Transaction import com.celzero.bravedns.service.DnsLogTracker -import com.celzero.bravedns.service.PersistentState import com.celzero.firestack.backend.Backend -import com.celzero.firestack.backend.GoMetrics import com.celzero.firestack.backend.NetStat -import com.google.android.material.bottomnavigation.BottomNavigationView +import java.util.Locale import com.google.android.material.radiobutton.MaterialRadioButton -import com.google.android.material.snackbar.Snackbar import java.util.Calendar import java.util.Date import java.util.regex.Matcher @@ -68,6 +51,25 @@ import java.util.regex.Pattern object UIUtils { + fun formatBytes(bytes: Long): String { + if (bytes <= 0) return "0 B" + val units = arrayOf("B", "KB", "MB", "GB", "TB") + var value = bytes.toDouble() + var unitIndex = 0 + + while (value >= 1024 && unitIndex < units.size - 1) { + value /= 1024 + unitIndex++ + } + + return if (value == value.toLong().toDouble()) { + "${value.toLong()} ${units[unitIndex]}" + } else { + String.format(Locale.US, "%.1f %s", value, units[unitIndex]) + } + } + + fun getDnsStatusStringRes(status: Long?): Int { if (status == null) return R.string.failed_using_default @@ -264,15 +266,6 @@ object UIUtils { } fun openAndroidAppInfo(context: Context, packageName: String?) { - if (packageName?.startsWith(NO_PACKAGE_PREFIX) == true) { - Utilities.showToastUiCentered( - context, - context.getString(R.string.ctbs_app_info_not_available_toast), - Toast.LENGTH_SHORT - ) - return - } - try { val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) intent.data = Uri.fromParts("package", packageName, null) @@ -288,78 +281,6 @@ object UIUtils { } } - fun fetchColor(context: Context, attr: Int): Int { - val typedValue = TypedValue() - val a: TypedArray = context.obtainStyledAttributes(typedValue.data, intArrayOf(attr)) - val color = a.getColor(0, 0) - a.recycle() - return color - } - - fun fetchToggleBtnColors(context: Context, attr: Int): Int { - val attributeFetch = - when (attr) { - R.color.firewallNoRuleToggleBtnTxt -> { - R.attr.firewallNoRuleToggleBtnTxt - } - R.color.firewallNoRuleToggleBtnBg -> { - R.attr.firewallNoRuleToggleBtnBg - } - R.color.firewallBlockToggleBtnTxt -> { - R.attr.firewallBlockToggleBtnTxt - } - R.color.firewallBlockToggleBtnBg -> { - R.attr.firewallBlockToggleBtnBg - } - R.color.firewallWhiteListToggleBtnTxt -> { - R.attr.firewallWhiteListToggleBtnTxt - } - R.color.firewallWhiteListToggleBtnBg -> { - R.attr.firewallWhiteListToggleBtnBg - } - R.color.firewallExcludeToggleBtnBg -> { - R.attr.firewallExcludeToggleBtnBg - } - R.color.firewallExcludeToggleBtnTxt -> { - R.attr.firewallExcludeToggleBtnTxt - } - R.color.defaultToggleBtnBg -> { - R.attr.defaultToggleBtnBg - } - R.color.defaultToggleBtnTxt -> { - R.attr.defaultToggleBtnTxt - } - R.color.accentGood -> { - R.attr.accentGood - } - R.color.accentBad -> { - R.attr.accentBad - } - R.color.chipBgNeutral -> { - R.attr.chipBgColorNeutral - } - R.color.chipBgNegative -> { - R.attr.chipBgColorNegative - } - R.color.chipBgPositive -> { - R.attr.chipBgColorPositive - } - R.color.chipTextNeutral -> { - R.attr.chipTextNeutral - } - R.color.chipTextNegative -> { - R.attr.chipTextNegative - } - R.color.chipTextPositive -> { - R.attr.chipTextPositive - } - else -> { - R.attr.chipBgColorPositive - } - } - return fetchColor(context, attributeFetch) - } - suspend fun fetchFavIcon(context: Context, dnsLog: DnsLog) { if (dnsLog.groundedQuery()) return @@ -657,10 +578,9 @@ object UIUtils { fun getAccentColor(appTheme: Int): Int { return when (appTheme) { - Themes.SYSTEM_DEFAULT.id -> R.color.accentGoodBlack + Themes.LIGHT.id, Themes.LIGHT_PLUS.id -> R.color.accentGoodLight Themes.DARK.id -> R.color.accentGood - Themes.LIGHT.id -> R.color.accentGoodLight - Themes.TRUE_BLACK.id -> R.color.accentGoodBlack + Themes.DARK_PLUS.id, Themes.SYSTEM_DEFAULT.id -> R.color.accentGoodBlack else -> R.color.accentGoodBlack } } @@ -708,11 +628,10 @@ object UIUtils { val nic = stat.nic()?.toString() val rdnsInfo = stat.rdnsinfo()?.toString() val nicInfo = stat.nicinfo()?.toString() - + val go = stat.go()?.toString() val tun = stat.tun()?.toString() - - var stats = nic + nicInfo + tun + fwd + ip + icmp + tcp + udp + rdnsInfo + var stats = nic + nicInfo + tun + fwd + ip + icmp + tcp + udp + rdnsInfo + go stats = stats.replace("{", "\n") stats = stats.replace("}", "\n\n") stats = stats.replace(",", "\n") @@ -720,20 +639,8 @@ object UIUtils { return stats } - fun formatNetMetrics(stat: GoMetrics?): String? { - if (stat == null) return null - - val go = stat.go()?.toString() - val c = stat.c - val m = stat.m - val l = stat.l - - var stats = go + l + c + m - stats = stats.replace("{", "\n") - stats = stats.replace("}", "\n\n") - stats = stats.replace(",", "\n") - - return stats + fun AppCompatTextView.underline() { + paintFlags = paintFlags or Paint.UNDERLINE_TEXT_FLAG } fun AppCompatTextView.setBadgeDotVisible(context: Context, visible: Boolean) { @@ -762,293 +669,3 @@ object UIUtils { } } } - -/** - * Centralized, themed, and throttled Snackbar helper for the Rethink app. - * - * ### Usage - * ```kotlin - * SnackbarHelper.show( - * view = b.root, // any view in the hierarchy - * message = getString(R.string.server_selection_proxy_unavailable), - * actionLabel = getString(R.string.server_selection_error_retry), - * action = { retryLoadingServers() } - * ) - * ``` - */ -object SnackbarHelper { - - /** Minimum ms between two identical messages. Prevents rapid-fire error floods. */ - private const val THROTTLE_MS = 30_000L - - /** Last shown message and the timestamp it was shown. */ - private var lastMessage: String = "" - private var lastShownAt: Long = 0L - - /** Reference to the currently visible Snackbar so we can dismiss it before showing a new one. */ - private var current: Snackbar? = null - - /** - * Show a themed, deduped Snackbar. - * - * @param view Any view inside the fragment/activity hierarchy. The helper walks up to - * find the best anchor ([CoordinatorLayout] or the decor view) and also - * looks for a [BottomNavigationView] to position above it automatically. - * @param message The message to display. - * @param duration [Snackbar.LENGTH_LONG] by default. Pass [Snackbar.LENGTH_INDEFINITE] - * for actionable errors the user must explicitly dismiss. - * @param actionLabel Optional label for the action button. - * @param action Optional callback when the action button is tapped. - * @param forceShow If `true`, bypass the throttle and always show (use sparingly). - */ - fun show( - view: View, - message: String, - duration: Int = Snackbar.LENGTH_LONG, - actionLabel: String? = null, - action: (() -> Unit)? = null, - forceShow: Boolean = false - ) { - val now = System.currentTimeMillis() - - // Throttle: drop identical repeated messages within THROTTLE_MS. - if (!forceShow && - message == lastMessage && - (now - lastShownAt) < THROTTLE_MS - ) { - Logger.d(LOG_TAG_UI, "SnackbarHelper: suppressed duplicate '${message.take(40)}'") - return - } - - // Dismiss any currently visible Snackbar before showing a new one. - current?.dismiss() - current = null - - val snackbar = Snackbar.make(bestAnchorFor(view), message, duration) - - // Anchor above BottomNavigationView so the snackbar is never hidden behind it. - val navView = findBottomNavView(view) - navView?.let { - snackbar.anchorView = it - } - - // Style the container view. - val snackView = snackbar.view - styleContainer(snackView, view.context, navView != null) - - // Style the message text. - val msgTv = snackView.findViewById( - com.google.android.material.R.id.snackbar_text - ) - msgTv?.let { - it.setTextColor(resolveThemeColor(view.context, R.attr.primaryTextColor)) - it.textSize = 14f - it.maxLines = 3 - } - - // Action button. - if (actionLabel != null && action != null) { - snackbar.setAction(actionLabel) { - current = null - action() - } - snackbar.setActionTextColor( - resolveThemeColor(view.context, R.attr.accentGood) - ) - val actionTv = snackView.findViewById( - com.google.android.material.R.id.snackbar_action - ) - actionTv?.let { - it.textSize = 14f - it.isAllCaps = false - } - } - - snackbar.addCallback(object : Snackbar.Callback() { - override fun onDismissed(transientBottomBar: Snackbar?, event: Int) { - if (current === transientBottomBar) current = null - } - }) - - ViewCompat.setOnApplyWindowInsetsListener(snackView) { v, insets -> - val navBarHeight = insets - .getInsets(WindowInsetsCompat.Type.navigationBars()) - .bottom - - (v.layoutParams as? ViewGroup.MarginLayoutParams)?.let { lp -> - lp.bottomMargin += navBarHeight + 80 - v.layoutParams = lp - } - - insets - } - - current = snackbar - lastMessage = message - lastShownAt = now - snackbar.show() - Logger.d(LOG_TAG_UI, "SnackbarHelper: showing '${message.take(60)}'") - } - - /** Dismiss the currently visible Snackbar, if any. */ - fun dismiss() { - current?.dismiss() - current = null - } - - /** - * Show the stability-program enrollment Snackbar with a **Disable** action. - * - * Automatically anchors above the BottomNavigationView when one is present in the - * view hierarchy (e.g. fragments hosted by HomeScreenActivity). - * - * @param view Any view inside the activity/fragment hierarchy. - * @param persistentState The PersistentState instance used to disable the program. - */ - fun showStabilityProgram(view: View, persistentState: PersistentState) { - val context = view.context - val message = context.getString(R.string.stability_program_snackbar_msg) - val actionLabel = context.getString(R.string.stability_program_snackbar_disable) - show( - view = view, - message = message, - duration = Snackbar.LENGTH_LONG, - actionLabel = actionLabel, - action = { - persistentState.firebaseErrorReportingEnabled = false - FirebaseErrorReporting.setEnabled(false) - Logger.i(LOG_TAG_UI, "Stability program disabled by user via snackbar") - }, - forceShow = true - ) - } - - /** - * Capitalize the first letter of each word and lowercase the rest. - * E.g. "HELLO WORLD" → "Hello World", "hELLO wORLD" → "Hello World" - */ - fun String.capitalizeWords(): String { - return split(" ") - .joinToString(" ") { word -> - word.lowercase().replaceFirstChar { it.uppercase() } - } - } - - /** - * Apply a bold typeface to the string. - */ - fun String.italic(): SpannableString { - return SpannableString(this).apply { - setSpan( - StyleSpan(Typeface.ITALIC), - 0, - length, - Spanned.SPAN_EXCLUSIVE_EXCLUSIVE - ) - } - } - - /** - * Walk the view hierarchy upward to find the nearest [CoordinatorLayout] ancestor. - * Falls back to the root decor view so the Snackbar is never clipped by - * `fitsSystemWindows` insets on the fragment root. - */ - private fun bestAnchorFor(view: View): View { - var v: View? = view - while (v != null) { - if (v is CoordinatorLayout) return v - v = v.parent as? View - } - return view.rootView ?: view - } - - /** - * Walk the full view tree (from the root downward) to find a [BottomNavigationView]. - * Returns `null` if none is found (e.g., in standalone activities without a nav bar). - */ - private fun findBottomNavView(view: View): BottomNavigationView? { - // Walk up to the root first, then search the entire tree from there. - val root = view.rootView ?: return null - - // 1. Try finding by ID directly (most reliable if ID is known) - val navView = root.findViewById(R.id.nav_view) - if (navView != null && navView.isShown) { - return navView - } - - // 2. Fallback to recursive search - return (root as? ViewGroup)?.let { searchForBottomNav(it) } - } - - private fun searchForBottomNav(group: ViewGroup): BottomNavigationView? { - for (i in 0 until group.childCount) { - val child = group.getChildAt(i) - if (child is BottomNavigationView && child.isShown) return child - if (child is ViewGroup) { - val found = searchForBottomNav(child) - if (found != null) return found - } - } - return null - } - - /** - * Apply the themed background, elevation, and margins to the Snackbar container. - * - */ - private fun styleContainer(snackView: View, context: Context, isAnchored: Boolean) { - // First child is always the SnackbarContentLayout. - val contentView: View = (snackView as? ViewGroup)?.getChildAt(0) ?: snackView - - // Outer container → transparent so the nav-bar insets area is see-through. - snackView.background = null - - // Content view → themed card background + shadow. - contentView.background = ContextCompat.getDrawable(context, R.drawable.snackbar_background) - // Elevation on the content view so the shadow follows the rounded-rect outline. - contentView.elevation = context.resources.getDimension(R.dimen.snackbar_elevation) - // GradientDrawable provides the rounded-rect outline via BACKGROUND provider. - contentView.outlineProvider = ViewOutlineProvider.BACKGROUND - - // Outer layout margins: float the bar away from screen edges and off the nav bar. - val hMargin = context.resources.getDimensionPixelSize(R.dimen.snackbar_horizontal_margin) - var bMargin = context.resources.getDimensionPixelSize(R.dimen.snackbar_bottom_margin) - - // if the snackbar is anchored, we need to add more margin to it so it is shown above the - // navigation menu to some extent. - if (isAnchored) { - bMargin *= 2 - } - - val lp = snackView.layoutParams - when (lp) { - is CoordinatorLayout.LayoutParams -> { - lp.setMargins(hMargin, lp.topMargin, hMargin, bMargin) - snackView.layoutParams = lp - } - is FrameLayout.LayoutParams -> { - lp.setMargins(hMargin, lp.topMargin, hMargin, bMargin) - snackView.layoutParams = lp - } - } - } - - /** - * Resolve a theme attribute to a concrete color int. - * Falls back to white (#FFFFFF) if the attribute is not found so text is - * always visible even if the theme is misconfigured. - */ - private fun resolveThemeColor(context: Context, attrRes: Int): Int { - val tv = TypedValue() - return if (context.theme.resolveAttribute(attrRes, tv, true)) { - if (tv.resourceId != 0) { - ContextCompat.getColor(context, tv.resourceId) - } else { - tv.data - } - } else { - Color.WHITE - } - } -} - diff --git a/app/src/full/java/com/celzero/bravedns/util/WindowExtensions.kt b/app/src/full/java/com/celzero/bravedns/util/WindowExtensions.kt index f52484dbf..fc722a89a 100644 --- a/app/src/full/java/com/celzero/bravedns/util/WindowExtensions.kt +++ b/app/src/full/java/com/celzero/bravedns/util/WindowExtensions.kt @@ -21,24 +21,16 @@ import android.app.Dialog import android.graphics.Color import android.graphics.drawable.Drawable import android.os.Build -import android.util.TypedValue import android.view.View -import android.view.Window import android.view.WindowManager import androidx.annotation.ColorInt import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity -import androidx.appcompat.app.AppCompatDialog import androidx.appcompat.content.res.AppCompatResources import androidx.core.graphics.drawable.toDrawable -import androidx.fragment.app.DialogFragment -import androidx.fragment.app.Fragment import com.celzero.bravedns.R import com.celzero.bravedns.util.Utilities.isAtleastR import com.celzero.bravedns.util.Utilities.isAtleastS -import com.google.android.material.bottomsheet.BottomSheetDialog -import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import java.util.WeakHashMap import java.util.function.Consumer /** Utility extension functions to configure Activity/Dialog/BottomSheet window appearance generically. */ @@ -58,16 +50,13 @@ fun AppCompatActivity.handleFrostEffectIfNeeded(themeId: Int) { if (isAtleastS()) { window.addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND) setupWindowBlurListener(windowBackgroundDrawable) - // Apply the current system blur state immediately so the first draw is - // already correct (the attach-listener fires later and handles transitions). val enabled = windowManager.isCrossWindowBlurEnabled Logger.v(LOG_TAG_UI, "Blur enabled by system? $enabled") - updateWindowForBlurs(windowBackgroundDrawable, enabled) } else { Logger.v(LOG_TAG_UI, "Blurs not supported, below Android S") - updateWindowForBlurs(windowBackgroundDrawable, blursEnabled = false) + updateWindowForBlurs(windowBackgroundDrawable, blursEnabled = false /* blursEnabled */) } - // FLAG_DIM_BEHIND is managed inside updateWindowForBlurs, not set unconditionally here. + window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) } @RequiresApi(Build.VERSION_CODES.S) @@ -90,56 +79,26 @@ private fun AppCompatActivity.setupWindowBlurListener(windowBackgroundDrawable: ) } -// Blur radius in dp for density-independent blur strength across devices. -// Converted to px at point of use. 150dp is the platform maximum; 120dp -// gives a strong frosted blur while leaving some headroom. -private const val BACKGROUND_BLUR_RADIUS_DP = 120f -private const val BLUR_BEHIND_RADIUS_DP = 120f -// Stronger dim to reduce background visibility while still letting the blur -// show through. 0.7f was too aggressive; 0.45f strikes a balance between -// obscuring background content and retaining the glass aesthetic. -private const val DIM_AMOUNT_WITH_BLUR = 0.45f -// Frost theme is only selectable on S+, so the no-blur path is a safeguard only. -// No dim is applied; the nearly-opaque window background acts as the backdrop. -private const val DIM_AMOUNT_NO_BLUR = 0.0f -// ~59 % opacity of the dark surface colour — strong frosted tint that -// significantly reduces background visibility without fully hiding the blur. -private const val WINDOW_BACKGROUND_ALPHA_WITH_BLUR = 40 -// Nearly-opaque fallback when blur is unavailable (pre-S safety net). -private const val WINDOW_BACKGROUND_ALPHA_NO_BLUR = 230 +private const val BACKGROUND_BLUR_RADIUS = 80 +private const val BLUR_BEHIND_RADIUS = 80 +private const val DIM_AMOUNT_WITH_BLUR = 0.7f +private const val DIM_AMOUNT_NO_BLUR = 1f +private const val WINDOW_BACKGROUND_ALPHA_WITH_BLUR = 55 +private const val WINDOW_BACKGROUND_ALPHA_NO_BLUR = 255 private fun AppCompatActivity.updateWindowForBlurs( windowBackgroundDrawable: Drawable?, blursEnabled: Boolean, ) { - // Adjust the frosted-glass tint overlay: low opacity when the blur is doing its job, - // nearly-opaque as a solid fallback when blur is unavailable. windowBackgroundDrawable?.alpha = if (blursEnabled) WINDOW_BACKGROUND_ALPHA_WITH_BLUR else WINDOW_BACKGROUND_ALPHA_NO_BLUR - // Manage FLAG_DIM_BEHIND together with the dim amount so they are always in sync. - // A subtle compositor dim complements the frosted overlay; no dim is needed in the - // fallback path because the opaque window background handles separation. - if (blursEnabled) { - window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) - window.setDimAmount(DIM_AMOUNT_WITH_BLUR) - } else { - window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) - window.setDimAmount(DIM_AMOUNT_NO_BLUR) - } - + window.setDimAmount(if (blursEnabled) DIM_AMOUNT_WITH_BLUR else DIM_AMOUNT_NO_BLUR) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - // Convert dp blur radii to px for density-independent blur strength. - val dm = resources.displayMetrics - val bgBlurPx = TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, BACKGROUND_BLUR_RADIUS_DP, dm - ).toInt() - val behindBlurPx = TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, BLUR_BEHIND_RADIUS_DP, dm - ).toInt() - window.setBackgroundBlurRadius(bgBlurPx) - window.attributes.blurBehindRadius = behindBlurPx + // Set the window background blur and blur behind radii + window.setBackgroundBlurRadius(BACKGROUND_BLUR_RADIUS) + window.attributes.blurBehindRadius = BLUR_BEHIND_RADIUS window.attributes = window.attributes } } @@ -155,47 +114,15 @@ fun Dialog.useTransparentNoDimBackground( window?.setBackgroundDrawable(color.toDrawable()) } -fun AppCompatDialog.useTransparentNoDimBackground( - @ColorInt color: Int = Color.TRANSPARENT -) { - (this as Dialog?)?.useTransparentNoDimBackground(color) -} - -fun BottomSheetDialog.useTransparentNoDimBackground( - @ColorInt color: Int = Color.TRANSPARENT -) { - (this as Dialog?)?.useTransparentNoDimBackground(color) -} - -/** Allow calling the helper directly on a DialogFragment/BottomSheetDialogFragment. */ -fun DialogFragment?.useTransparentNoDimBackground( - @ColorInt color: Int = Color.TRANSPARENT -) { - this?.dialog?.useTransparentNoDimBackground(color) -} - -fun BottomSheetDialogFragment?.useTransparentNoDimBackground( - @ColorInt color: Int = Color.TRANSPARENT -) { - this?.dialog?.useTransparentNoDimBackground(color) -} - -// Keyed by Window (one per Activity instance) so concurrent activities never -// stomp each other's saved state. WeakHashMap prevents leaks when activities finish. -private val frostStateByWindow = WeakHashMap() +private var frostWasEnabled = false fun AppCompatActivity.disableFrostTemporarily() { - val blurWasEnabled = - window.attributes.flags and WindowManager.LayoutParams.FLAG_BLUR_BEHIND != 0 - // Persist per-window so that a second activity's call never overwrites this one's state. - frostStateByWindow[window] = blurWasEnabled + frostWasEnabled = window.attributes.flags and WindowManager.LayoutParams.FLAG_BLUR_BEHIND != 0 - if (blurWasEnabled) { + if (frostWasEnabled) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { window.setBackgroundBlurRadius(0) window.attributes.blurBehindRadius = 0 - // Commit the attribute change to WindowManager (was missing in the original). - window.attributes = window.attributes } window.clearFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND) window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) @@ -205,17 +132,7 @@ fun AppCompatActivity.disableFrostTemporarily() { } fun AppCompatActivity.restoreFrost(themeId: Int) { - if (frostStateByWindow[window] != true) return - frostStateByWindow.remove(window) - handleFrostEffectIfNeeded(themeId) -} + if (!frostWasEnabled) return -fun Fragment.disableFrostTemporarily() { - val activity = activity as? AppCompatActivity ?: return - activity.disableFrostTemporarily() -} - -fun Fragment.restoreFrost(themeId: Int) { - val activity = activity as? AppCompatActivity ?: return - activity.restoreFrost(themeId) + handleFrostEffectIfNeeded(themeId) } diff --git a/app/src/full/java/com/celzero/bravedns/viewmodel/AppInfoViewModel.kt b/app/src/full/java/com/celzero/bravedns/viewmodel/AppInfoViewModel.kt index a5a985dca..d7221aa43 100644 --- a/app/src/full/java/com/celzero/bravedns/viewmodel/AppInfoViewModel.kt +++ b/app/src/full/java/com/celzero/bravedns/viewmodel/AppInfoViewModel.kt @@ -1,282 +1,243 @@ package com.celzero.bravedns.viewmodel -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.switchMap import androidx.lifecycle.viewModelScope -import androidx.paging.Pager -import androidx.paging.PagingConfig -import androidx.paging.PagingData -import androidx.paging.cachedIn -import androidx.paging.liveData import com.celzero.bravedns.database.AppInfo import com.celzero.bravedns.database.AppInfoDAO import com.celzero.bravedns.service.FirewallManager -import com.celzero.bravedns.ui.activity.AppListActivity -import com.celzero.bravedns.util.Constants -import kotlinx.coroutines.Job -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch +import com.celzero.bravedns.ui.compose.firewall.Filters +import com.celzero.bravedns.ui.compose.firewall.FirewallFilter +import com.celzero.bravedns.ui.compose.firewall.TopLevelFilter +import java.util.Locale +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock +@OptIn(FlowPreview::class) class AppInfoViewModel(private val appInfoDAO: AppInfoDAO) : ViewModel() { - private val filter: MutableLiveData = MutableLiveData() - private val category: MutableSet = mutableSetOf() - private var topLevelFilter = AppListActivity.TopLevelFilter.ALL - private var firewallFilter = AppListActivity.FirewallFilter.ALL - private var search: String = "" + private val defaultFilters = Filters(topLevelFilter = TopLevelFilter.INSTALLED) + private val baseFilters = MutableStateFlow(defaultFilters.copy(searchString = "")) + private val searchInput = MutableStateFlow(defaultFilters.searchString) + private val bulkUpdateMutex = Mutex() - init { - filter.value = "" - } - - val appInfo = filter.switchMap { input: String -> getAppInfo(input) } + private val effectiveFilters: StateFlow = + combine( + baseFilters, + searchInput + .debounce(300) + .distinctUntilChanged() + ) { base, debouncedSearch -> + base.copy(searchString = debouncedSearch.trim()) + } + .stateIn( + viewModelScope, + SharingStarted.Eagerly, + defaultFilters + ) - private fun setFilterWithDebounce(searchString: String) { - viewModelScope.launch { - debounceFilter(searchString) + val appInfo: StateFlow> = + combine( + appInfoDAO.getAllAppDetailsFlow(), + effectiveFilters + ) { apps, filters -> + filterAndSortApps(apps, filters) } + .stateIn( + viewModelScope, + SharingStarted.WhileSubscribed(5000), + emptyList() + ) + + fun setFilter(filters: Filters) { + baseFilters.value = filters.copy(searchString = "") + searchInput.value = filters.searchString } - private var debounceJob: Job? = null - private fun debounceFilter(searchString: String) { - debounceJob?.cancel() - debounceJob = viewModelScope.launch { - delay(300) // 300ms debounce delay - filter.value = searchString + private fun filterAndSortApps( + apps: List, + filters: Filters + ): List { + return apps + .asSequence() + .filter { app -> matchesTopLevelFilter(app, filters.topLevelFilter) } + .filter { app -> matchesCategoryFilter(app, filters.categoryFilters) } + .filter { app -> matchesFirewallFilter(app, filters.firewallFilter) } + .filter { app -> matchesSearch(app, filters.searchString) } + .sortedWith( + compareBy( + { app -> app.appName.ifBlank { app.packageName }.lowercase(Locale.getDefault()) }, + { app -> app.packageName.lowercase(Locale.getDefault()) }, + { app -> app.uid } + ) + ) + .toList() + } + + private fun matchesTopLevelFilter( + app: AppInfo, + filter: TopLevelFilter + ): Boolean { + return when (filter) { + TopLevelFilter.ALL -> true + TopLevelFilter.INSTALLED -> !app.isSystemApp + TopLevelFilter.SYSTEM -> app.isSystemApp } } - fun setFilter(filters: AppListActivity.Filters) { - this.category.clear() - this.category.addAll(filters.categoryFilters) + private fun matchesCategoryFilter( + app: AppInfo, + categories: Set + ): Boolean { + if (categories.isEmpty()) return true + return categories.contains(app.appCategory) + } - this.firewallFilter = filters.firewallFilter - this.topLevelFilter = filters.topLevelFilter + private fun matchesFirewallFilter( + app: AppInfo, + filter: FirewallFilter + ): Boolean { + val firewallMatches = + filter.getFilter().contains(app.firewallStatus) && + filter.getConnectionStatusFilter().contains(app.connectionStatus) + val bypassProxyMatches = filter == FirewallFilter.BYPASS && app.isProxyExcluded + return firewallMatches || bypassProxyMatches + } - this.search = filters.searchString - setFilterWithDebounce(filters.searchString) + private fun matchesSearch( + app: AppInfo, + search: String + ): Boolean { + if (search.isBlank()) return true + val query = search.trim() + return app.appName.contains(query, ignoreCase = true) } - private fun getAppInfo(searchString: String): LiveData> { - return when (topLevelFilter) { - // get the app info based on the filter - AppListActivity.TopLevelFilter.ALL -> { - allApps(searchString) - } - AppListActivity.TopLevelFilter.INSTALLED -> { - installedApps(searchString) - } - AppListActivity.TopLevelFilter.SYSTEM -> { - systemApps(searchString) - } + // apply the firewall rules to the filtered apps + suspend fun updateUnmeteredStatus(blocked: Boolean) { + bulkUpdateMutex.withLock { + val appList = appInfo.value + appList + .distinctBy { it.uid } + .forEach { + val connStatus = FirewallManager.connectionStatus(it.uid) + val appStatus = getAppStateForWifi(blocked, connStatus) + FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) + } } } - private fun getBypassProxyFilter(): Set { - val filter = firewallFilter.getFilter() - val bypassFilter = setOf(2, 7) - if (filter == bypassFilter) { - return setOf(1) + suspend fun updateMeteredStatus(blocked: Boolean) { + bulkUpdateMutex.withLock { + val appList = appInfo.value + appList + .distinctBy { it.uid } + .forEach { + val connStatus = FirewallManager.connectionStatus(it.uid) + val appStatus = getAppStateForMobileData(blocked, connStatus) + FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) + } } - return setOf() // empty set (as query uses or condition) } - private fun allApps(searchString: String): LiveData> { - val includeProxyBypass = getBypassProxyFilter() - return if (category.isEmpty()) { - Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - appInfoDAO.getAppInfos( - "%$searchString%", - firewallFilter.getFilter(), - firewallFilter.getConnectionStatusFilter(), - includeProxyBypass + suspend fun updateBypassStatus(bypass: Boolean) { + bulkUpdateMutex.withLock { + val appList = appInfo.value + val appStatus = + if (bypass) { + AppState( + FirewallManager.FirewallStatus.BYPASS_UNIVERSAL, + FirewallManager.ConnectionStatus.ALLOW ) - } - .liveData - .cachedIn(viewModelScope) - } else { - Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - appInfoDAO.getAppInfos( - "%$searchString%", - category, - firewallFilter.getFilter(), - firewallFilter.getConnectionStatusFilter(), - includeProxyBypass + } else { + AppState( + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.ALLOW ) } - .liveData - .cachedIn(viewModelScope) + appList + .distinctBy { it.uid } + .forEach { + FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) + } } } - private fun installedApps(search: String): LiveData> { - val includeProxyBypass = getBypassProxyFilter() - return if (category.isEmpty()) { - Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - appInfoDAO.getInstalledApps( - "%$search%", - firewallFilter.getFilter(), - firewallFilter.getConnectionStatusFilter(), - includeProxyBypass + suspend fun updateBypassDnsFirewall(bypass: Boolean) { + bulkUpdateMutex.withLock { + val appList = appInfo.value + val appStatus = + if (bypass) { + AppState( + FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL, + FirewallManager.ConnectionStatus.ALLOW ) - } - .liveData - .cachedIn(viewModelScope) - } else { - Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - appInfoDAO.getInstalledApps( - "%$search%", - category, - firewallFilter.getFilter(), - firewallFilter.getConnectionStatusFilter(), - includeProxyBypass + } else { + AppState( + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.ALLOW ) } - .liveData - .cachedIn(viewModelScope) + appList + .distinctBy { it.uid } + .forEach { + FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) + } } } - private fun systemApps(search: String): LiveData> { - val includeProxyBypass = getBypassProxyFilter() - return if (category.isEmpty()) { - Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - appInfoDAO.getSystemApps( - "%$search%", - firewallFilter.getFilter(), - firewallFilter.getConnectionStatusFilter(), - includeProxyBypass + suspend fun updateExcludeStatus(exclude: Boolean) { + bulkUpdateMutex.withLock { + val appList = appInfo.value + val appStatus = + if (exclude) { + AppState( + FirewallManager.FirewallStatus.EXCLUDE, + FirewallManager.ConnectionStatus.ALLOW ) - } - .liveData - .cachedIn(viewModelScope) - } else { - Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - appInfoDAO.getSystemApps( - "%$search%", - category, - firewallFilter.getFilter(), - firewallFilter.getConnectionStatusFilter(), - includeProxyBypass + } else { + AppState( + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.ALLOW ) } - .liveData - .cachedIn(viewModelScope) + appList + .distinctBy { it.uid } + .forEach { + FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) + } } } - // apply the firewall rules to the filtered apps - suspend fun updateUnmeteredStatus(blocked: Boolean) { - val appList = getFilteredApps() - appList - .distinctBy { it.uid } - .forEach { - val connStatus = FirewallManager.connectionStatus(it.uid) - val appStatus = getAppStateForWifi(blocked, connStatus) - FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) - } - } - - suspend fun updateMeteredStatus(blocked: Boolean) { - val appList = getFilteredApps() - appList - .distinctBy { it.uid } - .forEach { - val connStatus = FirewallManager.connectionStatus(it.uid) - val appStatus = getAppStateForMobileData(blocked, connStatus) - FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) - } - } - - suspend fun updateBypassStatus(bypass: Boolean) { - val appList = getFilteredApps() - // update the bypass status for the filtered apps - // if the app is already in the bypass list, remove it - // else add it to the bypass list - val appStatus = - if (bypass) { - AppState( - FirewallManager.FirewallStatus.BYPASS_UNIVERSAL, - FirewallManager.ConnectionStatus.ALLOW - ) - } else { - AppState( - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.ALLOW - ) - } - appList - .distinctBy { it.uid } - .forEach { FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) } - } - - suspend fun updateBypassDnsFirewall(bypass: Boolean) { - val appList = getFilteredApps() - // update the bypass status for the filtered apps - // if the app is already in the bypass list, remove it - // else add it to the bypass list - val appStatus = - if (bypass) { - AppState( - FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL, - FirewallManager.ConnectionStatus.ALLOW - ) - } else { - AppState( - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.ALLOW - ) - } - appList - .distinctBy { it.uid } - .forEach { FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) } - } - - suspend fun updateExcludeStatus(exclude: Boolean) { - val appList = getFilteredApps() - // update the exclude status for the filtered apps - // if the app is already in the exclude list, remove it - // else add it to the exclude list - val appStatus = - if (exclude) { - AppState( - FirewallManager.FirewallStatus.EXCLUDE, - FirewallManager.ConnectionStatus.ALLOW - ) - } else { - AppState( - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.ALLOW - ) - } - appList - .distinctBy { it.uid } - .forEach { FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) } - } - suspend fun updateLockdownStatus(lockdown: Boolean) { - val appList = getFilteredApps() - // update the lockdown status for the filtered apps - // if the app is already in the lockdown list, remove it - // else add it to the lockdown list - val appStatus = - if (lockdown) { - AppState( - FirewallManager.FirewallStatus.ISOLATE, - FirewallManager.ConnectionStatus.ALLOW - ) - } else { - AppState( - FirewallManager.FirewallStatus.NONE, - FirewallManager.ConnectionStatus.ALLOW - ) - } + bulkUpdateMutex.withLock { + val appList = appInfo.value + val appStatus = + if (lockdown) { + AppState( + FirewallManager.FirewallStatus.ISOLATE, + FirewallManager.ConnectionStatus.ALLOW + ) + } else { + AppState( + FirewallManager.FirewallStatus.NONE, + FirewallManager.ConnectionStatus.ALLOW + ) + } - appList - .distinctBy { it.uid } - .forEach { FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) } + appList + .distinctBy { it.uid } + .forEach { + FirewallManager.updateFirewallStatus(it.uid, appStatus.fid, appStatus.cid) + } + } } private fun getAppStateForWifi( @@ -406,34 +367,7 @@ class AppInfoViewModel(private val appInfoDAO: AppInfoDAO) : ViewModel() { } } - private fun getFilteredApps(): List { - val appType = - when (topLevelFilter) { - AppListActivity.TopLevelFilter.ALL -> { - setOf(0, 1) - } - AppListActivity.TopLevelFilter.INSTALLED -> { - setOf(0) - } - AppListActivity.TopLevelFilter.SYSTEM -> { - setOf(1) - } - } - return if (category.isEmpty()) { - appInfoDAO.getFilteredApps( - "%$search%", - firewallFilter.getFilter(), - appType, - firewallFilter.getConnectionStatusFilter() - ) - } else { - appInfoDAO.getFilteredApps( - "%$search%", - category, - firewallFilter.getFilter(), - appType, - firewallFilter.getConnectionStatusFilter() - ) - } + suspend fun getAppCount(): Int { + return appInfoDAO.getAppCount() } } diff --git a/app/src/full/java/com/celzero/bravedns/viewmodel/ConnectionTrackerViewModel.kt b/app/src/full/java/com/celzero/bravedns/viewmodel/ConnectionTrackerViewModel.kt index 9e0b4bd37..a92568cbd 100644 --- a/app/src/full/java/com/celzero/bravedns/viewmodel/ConnectionTrackerViewModel.kt +++ b/app/src/full/java/com/celzero/bravedns/viewmodel/ConnectionTrackerViewModel.kt @@ -27,7 +27,6 @@ import androidx.paging.cachedIn import androidx.paging.liveData import com.celzero.bravedns.database.ConnectionTracker import com.celzero.bravedns.database.ConnectionTrackerDAO -import com.celzero.bravedns.ui.fragment.ConnectionTrackerFragment import com.celzero.bravedns.util.Constants.Companion.LIVEDATA_PAGE_SIZE import kotlinx.coroutines.Job import kotlinx.coroutines.delay @@ -36,6 +35,10 @@ import kotlinx.coroutines.launch class ConnectionTrackerViewModel(private val connectionTrackerDAO: ConnectionTrackerDAO) : ViewModel() { + companion object { + const val PROTOCOL_FILTER_PREFIX = "P:" + } + private val _filterString = MutableLiveData() private val filterString: LiveData = _filterString private val filterRules: MutableSet = mutableSetOf() @@ -90,7 +93,7 @@ class ConnectionTrackerViewModel(private val connectionTrackerDAO: ConnectionTra private fun fetchNetworkLogs(input: String): LiveData> { // spl case: treat input with P:UDP, P:TCP, P:ICMP as protocol filter - val protocolPrefix = ConnectionTrackerFragment.PROTOCOL_FILTER_PREFIX.lowercase() + val protocolPrefix = PROTOCOL_FILTER_PREFIX.lowercase() val s = input.trim().lowercase() if (s.startsWith(protocolPrefix)) { val protocol = s.substringAfter(protocolPrefix) @@ -161,11 +164,20 @@ class ConnectionTrackerViewModel(private val connectionTrackerDAO: ConnectionTra } private fun getAllNetworkLogs(input: String): LiveData> { - return Pager(pagingConfig) { - if (input.isBlank()) connectionTrackerDAO.getConnectionTrackerByName() - else connectionTrackerDAO.getConnectionTrackerByName("%$input%") - } - .liveData - .cachedIn(viewModelScope) + return if (filterRules.isNotEmpty()) { + Pager(pagingConfig) { + if (input.isBlank()) connectionTrackerDAO.getConnectionsFiltered(filterRules) + else connectionTrackerDAO.getConnectionsFiltered("%$input%", filterRules) + } + .liveData + .cachedIn(viewModelScope) + } else { + Pager(pagingConfig) { + if (input.isBlank()) connectionTrackerDAO.getConnectionTrackerByName() + else connectionTrackerDAO.getConnectionTrackerByName("%$input%") + } + .liveData + .cachedIn(viewModelScope) + } } } diff --git a/app/src/full/java/com/celzero/bravedns/viewmodel/DetailedStatisticsViewModel.kt b/app/src/full/java/com/celzero/bravedns/viewmodel/DetailedStatisticsViewModel.kt index a18519797..620a356a9 100644 --- a/app/src/full/java/com/celzero/bravedns/viewmodel/DetailedStatisticsViewModel.kt +++ b/app/src/full/java/com/celzero/bravedns/viewmodel/DetailedStatisticsViewModel.kt @@ -15,35 +15,36 @@ */ package com.celzero.bravedns.viewmodel -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.switchMap import androidx.lifecycle.viewModelScope import androidx.paging.Pager import androidx.paging.PagingConfig +import androidx.paging.PagingData import androidx.paging.cachedIn -import androidx.paging.liveData +import com.celzero.bravedns.data.AppConnection +import com.celzero.bravedns.data.SummaryStatisticsType import com.celzero.bravedns.database.ConnectionTrackerDAO import com.celzero.bravedns.database.StatsSummaryDao import com.celzero.bravedns.service.VpnController -import com.celzero.bravedns.ui.fragment.SummaryStatisticsFragment import com.celzero.bravedns.util.Constants +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.* class DetailedStatisticsViewModel( private val connectionTrackerDAO: ConnectionTrackerDAO, private val statsDao: StatsSummaryDao ) : ViewModel() { - private val allActiveConns: MutableLiveData = MutableLiveData() - private val allowedNetworkActivity: MutableLiveData = MutableLiveData() - private val blockedNetworkActivity: MutableLiveData = MutableLiveData() - private val allowedAsn: MutableLiveData = MutableLiveData() - private val blockedAsn: MutableLiveData = MutableLiveData() - private val allowedDomains: MutableLiveData = MutableLiveData() - private val blockedDomains: MutableLiveData = MutableLiveData() - private val allowedIps: MutableLiveData = MutableLiveData() - private val blockedIps: MutableLiveData = MutableLiveData() - private val allowedCountries: MutableLiveData = MutableLiveData() - private val startTime: MutableLiveData = MutableLiveData() + private val _allActiveConns: MutableStateFlow = MutableStateFlow(0L) + private val _allowedNetworkActivity: MutableStateFlow = MutableStateFlow("") + private val _blockedNetworkActivity: MutableStateFlow = MutableStateFlow("") + private val _allowedAsn: MutableStateFlow = MutableStateFlow("") + private val _blockedAsn: MutableStateFlow = MutableStateFlow("") + private val _allowedDomains: MutableStateFlow = MutableStateFlow("") + private val _blockedDomains: MutableStateFlow = MutableStateFlow("") + private val _allowedIps: MutableStateFlow = MutableStateFlow("") + private val _blockedIps: MutableStateFlow = MutableStateFlow("") + private val _allowedCountries: MutableStateFlow = MutableStateFlow("") + private val _startTime: MutableStateFlow = MutableStateFlow(0L) companion object { private const val ONE_HOUR_MILLIS = 1 * 60 * 60 * 1000L @@ -51,37 +52,37 @@ class DetailedStatisticsViewModel( private const val ONE_WEEK_MILLIS = 7 * ONE_DAY_MILLIS } - fun setData(type: SummaryStatisticsFragment.SummaryStatisticsType) { + fun setData(type: SummaryStatisticsType) { when (type) { - SummaryStatisticsFragment.SummaryStatisticsType.TOP_ACTIVE_CONNS -> { - allActiveConns.value = VpnController.uptimeMs() + SummaryStatisticsType.TOP_ACTIVE_CONNS -> { + _allActiveConns.value = VpnController.uptimeMs() } - SummaryStatisticsFragment.SummaryStatisticsType.MOST_CONNECTED_APPS -> { - allowedNetworkActivity.value = "" + SummaryStatisticsType.MOST_CONNECTED_APPS -> { + _allowedNetworkActivity.value = "" } - SummaryStatisticsFragment.SummaryStatisticsType.MOST_BLOCKED_APPS -> { - blockedNetworkActivity.value = "" + SummaryStatisticsType.MOST_BLOCKED_APPS -> { + _blockedNetworkActivity.value = "" } - SummaryStatisticsFragment.SummaryStatisticsType.MOST_CONNECTED_ASN -> { - allowedAsn.value = "" + SummaryStatisticsType.MOST_CONNECTED_ASN -> { + _allowedAsn.value = "" } - SummaryStatisticsFragment.SummaryStatisticsType.MOST_BLOCKED_ASN -> { - blockedAsn.value = "" + SummaryStatisticsType.MOST_BLOCKED_ASN -> { + _blockedAsn.value = "" } - SummaryStatisticsFragment.SummaryStatisticsType.MOST_CONTACTED_DOMAINS -> { - allowedDomains.value = "" + SummaryStatisticsType.MOST_CONTACTED_DOMAINS -> { + _allowedDomains.value = "" } - SummaryStatisticsFragment.SummaryStatisticsType.MOST_BLOCKED_DOMAINS -> { - blockedDomains.value = "" + SummaryStatisticsType.MOST_BLOCKED_DOMAINS -> { + _blockedDomains.value = "" } - SummaryStatisticsFragment.SummaryStatisticsType.MOST_CONTACTED_IPS -> { - allowedIps.value = "" + SummaryStatisticsType.MOST_CONTACTED_IPS -> { + _allowedIps.value = "" } - SummaryStatisticsFragment.SummaryStatisticsType.MOST_BLOCKED_IPS -> { - blockedIps.value = "" + SummaryStatisticsType.MOST_BLOCKED_IPS -> { + _blockedIps.value = "" } - SummaryStatisticsFragment.SummaryStatisticsType.MOST_CONTACTED_COUNTRIES -> { - allowedCountries.value = "" + SummaryStatisticsType.MOST_CONTACTED_COUNTRIES -> { + _allowedCountries.value = "" } } } @@ -89,108 +90,114 @@ class DetailedStatisticsViewModel( fun timeCategoryChanged(timeCategory: SummaryStatisticsViewModel.TimeCategory) { when (timeCategory) { SummaryStatisticsViewModel.TimeCategory.ONE_HOUR -> { - startTime.value = System.currentTimeMillis() - ONE_HOUR_MILLIS + _startTime.value = System.currentTimeMillis() - ONE_HOUR_MILLIS } SummaryStatisticsViewModel.TimeCategory.TWENTY_FOUR_HOUR -> { - startTime.value = System.currentTimeMillis() - ONE_DAY_MILLIS + _startTime.value = System.currentTimeMillis() - ONE_DAY_MILLIS } SummaryStatisticsViewModel.TimeCategory.SEVEN_DAYS -> { - startTime.value = System.currentTimeMillis() - ONE_WEEK_MILLIS + _startTime.value = System.currentTimeMillis() - ONE_WEEK_MILLIS } } } - val getAllActiveConns = - allActiveConns.switchMap { - val to = System.currentTimeMillis() - it + @OptIn(ExperimentalCoroutinesApi::class) + val getAllActiveConns: Flow> = + _allActiveConns.flatMapLatest { uptime -> + val to = System.currentTimeMillis() - uptime Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - statsDao.getAllActiveConns(to) - } - .liveData - .cachedIn(viewModelScope) + statsDao.getAllActiveConns(to) + }.flow.cachedIn(viewModelScope) } - val getAllAllowedAppNetworkActivity = - allowedNetworkActivity.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getAllAllowedAppNetworkActivity: Flow> = + combine(_allowedNetworkActivity, _startTime) { _, start -> + start + }.flatMapLatest { start -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getAllAllowedApps(to) - } - .liveData - .cachedIn(viewModelScope) + statsDao.getAllAllowedApps(start) + }.flow.cachedIn(viewModelScope) } - val getAllAllowedAsn = - allowedAsn.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getAllAllowedAsn: Flow> = + combine(_allowedAsn, _startTime) { _, start -> + start + }.flatMapLatest { start -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getAllConnectedASN(to) - } - .liveData - .cachedIn(viewModelScope) + statsDao.getAllConnectedASN(start) + }.flow.cachedIn(viewModelScope) } - val getAllBlockedAsn = - blockedAsn.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getAllBlockedAsn: Flow> = + combine(_blockedAsn, _startTime) { _, start -> + start + }.flatMapLatest { start -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getAllBlockedASN(to) - } - .liveData - .cachedIn(viewModelScope) + statsDao.getAllBlockedASN(start) + }.flow.cachedIn(viewModelScope) } - val getAllBlockedAppNetworkActivity = - blockedNetworkActivity.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getAllBlockedAppNetworkActivity: Flow> = + combine(_blockedNetworkActivity, _startTime) { _, start -> + start + }.flatMapLatest { start -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getAllBlockedApps(to) - } - .liveData - .cachedIn(viewModelScope) + statsDao.getAllBlockedApps(start) + }.flow.cachedIn(viewModelScope) } - val getAllBlockedDomains = blockedDomains.switchMap { - Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getAllBlockedDomains(to) - }.liveData.cachedIn(viewModelScope) - } + @OptIn(ExperimentalCoroutinesApi::class) + val getAllBlockedDomains: Flow> = + combine(_blockedDomains, _startTime) { _, start -> + start + }.flatMapLatest { start -> + Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { + statsDao.getAllBlockedDomains(start) + }.flow.cachedIn(viewModelScope) + } - val getAllContactedDomains = allowedDomains.switchMap { - Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getAllContactedDomains(to) - }.liveData.cachedIn(viewModelScope) - } + @OptIn(ExperimentalCoroutinesApi::class) + val getAllContactedDomains: Flow> = + combine(_allowedDomains, _startTime) { _, start -> + start + }.flatMapLatest { start -> + Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { + statsDao.getAllContactedDomains(start) + }.flow.cachedIn(viewModelScope) + } - val getAllContactedIps = - allowedIps.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getAllContactedIps: Flow> = + combine(_allowedIps, _startTime) { _, start -> + start + }.flatMapLatest { start -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - connectionTrackerDAO.getAllContactedIps(to) - } - .liveData - .cachedIn(viewModelScope) + connectionTrackerDAO.getAllContactedIps(start) + }.flow.cachedIn(viewModelScope) } - val getAllBlockedIps = - blockedIps.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getAllBlockedIps: Flow> = + combine(_blockedIps, _startTime) { _, start -> + start + }.flatMapLatest { start -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - connectionTrackerDAO.getAllBlockedIps(to) - } - .liveData - .cachedIn(viewModelScope) + connectionTrackerDAO.getAllBlockedIps(start) + }.flow.cachedIn(viewModelScope) } - val getAllContactedCountries = - allowedCountries.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getAllContactedCountries: Flow> = + combine(_allowedCountries, _startTime) { _, start -> + start + }.flatMapLatest { start -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getAllContactedCountries(to) - } - .liveData - .cachedIn(viewModelScope) + statsDao.getAllContactedCountries(start) + }.flow.cachedIn(viewModelScope) } } + diff --git a/app/src/full/java/com/celzero/bravedns/viewmodel/DnsLogViewModel.kt b/app/src/full/java/com/celzero/bravedns/viewmodel/DnsLogViewModel.kt index 51c09fe04..19aeea8a9 100644 --- a/app/src/full/java/com/celzero/bravedns/viewmodel/DnsLogViewModel.kt +++ b/app/src/full/java/com/celzero/bravedns/viewmodel/DnsLogViewModel.kt @@ -27,19 +27,16 @@ import androidx.paging.cachedIn import androidx.paging.liveData import com.celzero.bravedns.database.DnsLog import com.celzero.bravedns.database.DnsLogDAO -import com.celzero.bravedns.ui.fragment.DnsLogFragment import com.celzero.bravedns.util.Constants.Companion.LIVEDATA_PAGE_SIZE import com.celzero.bravedns.util.ResourceRecordTypes.Companion.getHandledTypes class DnsLogViewModel(private val dnsLogDAO: DnsLogDAO) : ViewModel() { - private val filteredList: MutableLiveData = MutableLiveData() - private var filterType = DnsLogFragment.DnsLogFilter.ALL + private var filteredList: MutableLiveData = MutableLiveData() + private var filterType = DnsLogFilter.ALL private val pagingConfig: PagingConfig private var isWireGuardLogs = false - private var isRpnLogs = false private var wgDnsId: String = "" - private var rpnDnsId: String = "" init { filteredList.value = "" @@ -60,23 +57,21 @@ class DnsLogViewModel(private val dnsLogDAO: DnsLogDAO) : ViewModel() { if (isWireGuardLogs) { // WireGuard DNS logs are not handled currently return getWgDnsLogs(wgDnsId) - } else if (isRpnLogs) { - return getRpnDnsLogs(rpnDnsId) } return when (filterType) { - DnsLogFragment.DnsLogFilter.ALL -> { + DnsLogFilter.ALL -> { getAllDnsLogs(filter) } - DnsLogFragment.DnsLogFilter.ALLOWED -> { + DnsLogFilter.ALLOWED -> { getAllowedDnsLogs(filter) } - DnsLogFragment.DnsLogFilter.BLOCKED -> { + DnsLogFilter.BLOCKED -> { getBlockedDnsLogs(filter) } - DnsLogFragment.DnsLogFilter.MAYBE_BLOCKED -> { + DnsLogFilter.MAYBE_BLOCKED -> { getMaybeBlockedDnsLogs(filter) } - DnsLogFragment.DnsLogFilter.UNKNOWN_RECORDS -> { + DnsLogFilter.UNKNOWN_RECORDS -> { getUnknownRecordDnsLogs(filter) } } @@ -102,14 +97,6 @@ class DnsLogViewModel(private val dnsLogDAO: DnsLogDAO) : ViewModel() { .cachedIn(viewModelScope) } - private fun getRpnDnsLogs(rpnId: String): LiveData> { - return Pager(pagingConfig) { - dnsLogDAO.getDnsLogsForRpn(rpnId) - } - .liveData - .cachedIn(viewModelScope) - } - private fun getAllowedDnsLogs(filter: String): LiveData> { return Pager(pagingConfig) { if (filter.isEmpty()) { @@ -159,7 +146,7 @@ class DnsLogViewModel(private val dnsLogDAO: DnsLogDAO) : ViewModel() { .cachedIn(viewModelScope) } - fun setFilter(searchString: String, type: DnsLogFragment.DnsLogFilter) { + fun setFilter(searchString: String, type: DnsLogFilter) { filterType = type if (searchString.isNotBlank()) filteredList.value = searchString @@ -172,9 +159,11 @@ class DnsLogViewModel(private val dnsLogDAO: DnsLogDAO) : ViewModel() { filteredList.value = filteredList.value } - fun setIsRpnLogs(isRLogs: Boolean, rpnId: String) { - isRpnLogs = isRLogs - rpnDnsId = "%$rpnId%" - filteredList.value = filteredList.value + enum class DnsLogFilter(val id: Int) { + ALL(0), + ALLOWED(1), + BLOCKED(2), + MAYBE_BLOCKED(3), + UNKNOWN_RECORDS(4) } } diff --git a/app/src/full/java/com/celzero/bravedns/viewmodel/ProxyAppsMappingViewModel.kt b/app/src/full/java/com/celzero/bravedns/viewmodel/ProxyAppsMappingViewModel.kt index 755588baa..6c510b59e 100644 --- a/app/src/full/java/com/celzero/bravedns/viewmodel/ProxyAppsMappingViewModel.kt +++ b/app/src/full/java/com/celzero/bravedns/viewmodel/ProxyAppsMappingViewModel.kt @@ -16,60 +16,103 @@ package com.celzero.bravedns.viewmodel import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.switchMap import androidx.lifecycle.viewModelScope -import androidx.paging.Pager -import androidx.paging.PagingConfig -import androidx.paging.cachedIn -import androidx.paging.liveData import com.celzero.bravedns.database.ProxyApplicationMappingDAO -import com.celzero.bravedns.service.ProxyManager -import com.celzero.bravedns.ui.dialog.WgIncludeAppsDialog -import com.celzero.bravedns.util.Constants.Companion.LIVEDATA_PAGE_SIZE +import com.celzero.bravedns.database.ProxyApplicationMapping +import com.celzero.bravedns.ui.dialog.TopLevelFilter +import java.util.Locale +import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.stateIn +@OptIn(FlowPreview::class) class ProxyAppsMappingViewModel(private val mappingDAO: ProxyApplicationMappingDAO) : ViewModel() { - private val filteredList: MutableLiveData = MutableLiveData() - private var filterType: WgIncludeAppsDialog.TopLevelFilter = - WgIncludeAppsDialog.TopLevelFilter.ALL_APPS - private var proxyId: String = "" + private data class ProxyAppsFilterState( + val searchQuery: String, + val filterType: TopLevelFilter, + val proxyId: String + ) - init { - filterType = WgIncludeAppsDialog.TopLevelFilter.ALL_APPS - proxyId = "" - filteredList.postValue("%%") - } + private val filterState = + MutableStateFlow( + ProxyAppsFilterState( + searchQuery = "", + filterType = TopLevelFilter.ALL_APPS, + proxyId = "" + ) + ) - var apps = - filteredList.switchMap { searchTxt -> - Pager(PagingConfig(LIVEDATA_PAGE_SIZE)) { - when (filterType) { - WgIncludeAppsDialog.TopLevelFilter.ALL_APPS -> - mappingDAO.getAllAppsMapping(searchTxt, proxyId) - WgIncludeAppsDialog.TopLevelFilter.SELECTED_APPS -> - mappingDAO.getSelectedAppsMapping(searchTxt, proxyId) - WgIncludeAppsDialog.TopLevelFilter.UNSELECTED_APPS -> - mappingDAO.getUnSelectedAppsMapping(searchTxt, proxyId) - } - } - .liveData - .cachedIn(viewModelScope) - } + val apps = + combine( + mappingDAO.getWgAppMappingFlow(), + filterState + .debounce(200) + .distinctUntilChanged() + ) { apps, state -> + filterAndSortApps(apps, state) + }.stateIn( + viewModelScope, + SharingStarted.WhileSubscribed(5000), + emptyList() + ) - // helper to decide if an app is selected for a given proxyId using ProxyManager cache - fun isAppSelectedForProxy(uid: Int, proxyId: String): Boolean { - return ProxyManager.getProxyIdsForApp(uid).contains(proxyId) - } + // Unfiltered list for operations that must apply globally (for example, "Select all"). + val allApps: StateFlow> = + mappingDAO + .getWgAppMappingFlow() + .stateIn( + viewModelScope, + SharingStarted.WhileSubscribed(5000), + emptyList() + ) - fun setFilter(filter: String, type: WgIncludeAppsDialog.TopLevelFilter, pid: String) { - filterType = type - this.proxyId = pid - filteredList.postValue("%$filter%") + fun setFilter(filter: String, type: TopLevelFilter, pid: String) { + filterState.value = + ProxyAppsFilterState( + searchQuery = filter.trim(), + filterType = type, + proxyId = pid + ) } fun getAppCountById(configId: String): LiveData { return mappingDAO.getAppCountByIdLiveData(configId) } + + private fun filterAndSortApps( + apps: List, + state: ProxyAppsFilterState + ): List { + val query = state.searchQuery.lowercase(Locale.getDefault()) + val hasQuery = query.isNotBlank() + + return apps + .asSequence() + .filter { app -> + when (state.filterType) { + TopLevelFilter.ALL_APPS -> true + TopLevelFilter.SELECTED_APPS -> app.proxyId == state.proxyId + TopLevelFilter.UNSELECTED_APPS -> app.proxyId != state.proxyId + } + } + .filter { app -> + if (!hasQuery) return@filter true + app.appName.contains(query, ignoreCase = true) + } + .sortedWith( + compareBy( + { it.appName.ifBlank { it.packageName }.lowercase(Locale.getDefault()) }, + { it.packageName.lowercase(Locale.getDefault()) }, + { it.uid } + ) + ) + .toList() + } } diff --git a/app/src/full/java/com/celzero/bravedns/viewmodel/RethinkLocalFileTagViewModel.kt b/app/src/full/java/com/celzero/bravedns/viewmodel/RethinkLocalFileTagViewModel.kt index 5ec350540..5d0d8383a 100644 --- a/app/src/full/java/com/celzero/bravedns/viewmodel/RethinkLocalFileTagViewModel.kt +++ b/app/src/full/java/com/celzero/bravedns/viewmodel/RethinkLocalFileTagViewModel.kt @@ -25,14 +25,14 @@ import androidx.paging.cachedIn import androidx.paging.liveData import com.celzero.bravedns.data.FileTag import com.celzero.bravedns.database.RethinkLocalFileTagDao -import com.celzero.bravedns.ui.fragment.RethinkBlocklistFragment +import com.celzero.bravedns.ui.rethink.RethinkBlocklistState import com.celzero.bravedns.util.Constants.Companion.LIVEDATA_PAGE_SIZE class RethinkLocalFileTagViewModel(private val rethinkLocalDao: RethinkLocalFileTagDao) : ViewModel() { - private val list: MutableLiveData = MutableLiveData() - private var blocklistFilter: RethinkBlocklistFragment.Filters? = null + private var list: MutableLiveData = MutableLiveData() + private var blocklistFilter: RethinkBlocklistState.Filters? = null init { list.value = "" @@ -74,7 +74,7 @@ class RethinkLocalFileTagViewModel(private val rethinkLocalDao: RethinkLocalFile private fun getSelectedFilter(): MutableSet { if ( blocklistFilter?.filterSelected == - RethinkBlocklistFragment.BlocklistSelectionFilter.SELECTED + RethinkBlocklistState.BlocklistSelectionFilter.SELECTED ) { return mutableSetOf(1) } @@ -89,7 +89,7 @@ class RethinkLocalFileTagViewModel(private val rethinkLocalDao: RethinkLocalFile list.value = searchText } - fun setFilter(filter: RethinkBlocklistFragment.Filters) { + fun setFilter(filter: RethinkBlocklistState.Filters) { this.blocklistFilter = filter list.value = filter.query } diff --git a/app/src/full/java/com/celzero/bravedns/viewmodel/RethinkRemoteFileTagViewModel.kt b/app/src/full/java/com/celzero/bravedns/viewmodel/RethinkRemoteFileTagViewModel.kt index 36be65d62..519a9ee33 100644 --- a/app/src/full/java/com/celzero/bravedns/viewmodel/RethinkRemoteFileTagViewModel.kt +++ b/app/src/full/java/com/celzero/bravedns/viewmodel/RethinkRemoteFileTagViewModel.kt @@ -25,14 +25,14 @@ import androidx.paging.cachedIn import androidx.paging.liveData import com.celzero.bravedns.data.FileTag import com.celzero.bravedns.database.RethinkRemoteFileTagDao -import com.celzero.bravedns.ui.fragment.RethinkBlocklistFragment +import com.celzero.bravedns.ui.rethink.RethinkBlocklistState import com.celzero.bravedns.util.Constants.Companion.LIVEDATA_PAGE_SIZE class RethinkRemoteFileTagViewModel(private val rethinkRemoteDao: RethinkRemoteFileTagDao) : ViewModel() { - private val list: MutableLiveData = MutableLiveData() - private var blocklistFilter: RethinkBlocklistFragment.Filters? = null + private var list: MutableLiveData = MutableLiveData() + private var blocklistFilter: RethinkBlocklistState.Filters? = null init { list.value = "" @@ -77,7 +77,7 @@ class RethinkRemoteFileTagViewModel(private val rethinkRemoteDao: RethinkRemoteF private fun getSelectedFilter(): MutableSet { if ( blocklistFilter?.filterSelected == - RethinkBlocklistFragment.BlocklistSelectionFilter.SELECTED + RethinkBlocklistState.BlocklistSelectionFilter.SELECTED ) { return mutableSetOf(1) } @@ -92,7 +92,7 @@ class RethinkRemoteFileTagViewModel(private val rethinkRemoteDao: RethinkRemoteF list.value = searchText } - fun setFilter(filter: RethinkBlocklistFragment.Filters) { + fun setFilter(filter: RethinkBlocklistState.Filters) { this.blocklistFilter = filter list.value = filter.query } diff --git a/app/src/full/java/com/celzero/bravedns/viewmodel/SummaryStatisticsViewModel.kt b/app/src/full/java/com/celzero/bravedns/viewmodel/SummaryStatisticsViewModel.kt index 3f6f3e931..cbc21db7e 100644 --- a/app/src/full/java/com/celzero/bravedns/viewmodel/SummaryStatisticsViewModel.kt +++ b/app/src/full/java/com/celzero/bravedns/viewmodel/SummaryStatisticsViewModel.kt @@ -15,34 +15,40 @@ */ package com.celzero.bravedns.viewmodel -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.switchMap import androidx.lifecycle.viewModelScope import androidx.paging.Pager import androidx.paging.PagingConfig +import androidx.paging.PagingData import androidx.paging.cachedIn -import androidx.paging.liveData +import com.celzero.bravedns.data.AppConnection import com.celzero.bravedns.data.DataUsageSummary import com.celzero.bravedns.database.ConnectionTracker import com.celzero.bravedns.database.ConnectionTrackerDAO import com.celzero.bravedns.database.StatsSummaryDao import com.celzero.bravedns.service.VpnController import com.celzero.bravedns.util.Constants +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext class SummaryStatisticsViewModel( private val connectionTrackerDAO: ConnectionTrackerDAO, private val statsDao: StatsSummaryDao ) : ViewModel() { - private val topActiveConns: MutableLiveData = MutableLiveData() - private val networkActivity: MutableLiveData = MutableLiveData() - private val asn: MutableLiveData = MutableLiveData() - private val countryActivities: MutableLiveData = MutableLiveData() - private val domains: MutableLiveData = MutableLiveData() - private val ips: MutableLiveData = MutableLiveData() - private var timeCategory: TimeCategory = TimeCategory.ONE_HOUR - private val startTime: MutableLiveData = MutableLiveData() - private var loadMoreClicked: Boolean = false + private val _uiState = MutableStateFlow(SummaryStatisticsUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + private val startTime = MutableStateFlow(System.currentTimeMillis() - ONE_HOUR_MILLIS) + private val topActiveConnsTick = MutableStateFlow(VpnController.uptimeMs()) + private val refreshTick = MutableStateFlow(0L) companion object { private const val ONE_HOUR_MILLIS = 1 * 60 * 60 * 1000L @@ -60,148 +66,140 @@ class SummaryStatisticsViewModel( } } - init { - // set from and to time to current and 1 hr before - startTime.value = System.currentTimeMillis() - ONE_HOUR_MILLIS - topActiveConns.value = VpnController.uptimeMs() - networkActivity.value = "" - asn.value = "" - } + data class SummaryStatisticsUiState( + val timeCategory: TimeCategory = TimeCategory.ONE_HOUR, + val dataUsage: DataUsageSummary = DataUsageSummary(0, 0, 0, 0) + ) - fun getTimeCategory(): TimeCategory { - return timeCategory - } - fun setLoadMoreClicked(b: Boolean) { - loadMoreClicked = b - // initialise the live data to trigger the switchMap - domains.value = "" - countryActivities.value = "" - ips.value = "" + init { + updateDataUsage() } fun timeCategoryChanged(tc: TimeCategory) { - timeCategory = tc - when (tc) { - TimeCategory.ONE_HOUR -> { - startTime.value = System.currentTimeMillis() - ONE_HOUR_MILLIS - } - TimeCategory.TWENTY_FOUR_HOUR -> { - startTime.value = System.currentTimeMillis() - ONE_DAY_MILLIS - } - TimeCategory.SEVEN_DAYS -> { - startTime.value = System.currentTimeMillis() - ONE_WEEK_MILLIS - } + val st = when (tc) { + TimeCategory.ONE_HOUR -> System.currentTimeMillis() - ONE_HOUR_MILLIS + TimeCategory.TWENTY_FOUR_HOUR -> System.currentTimeMillis() - ONE_DAY_MILLIS + TimeCategory.SEVEN_DAYS -> System.currentTimeMillis() - ONE_WEEK_MILLIS } - networkActivity.value = "" - asn.value = "" - if (loadMoreClicked) { - countryActivities.value = "" - ips.value = "" - domains.value = "" + startTime.value = st + _uiState.update { it.copy(timeCategory = tc) } + refreshTick.update { it + 1 } + updateDataUsage() + } + + private fun updateDataUsage() { + viewModelScope.launch { + val to = startTime.value + val usage = withContext(Dispatchers.IO) { + connectionTrackerDAO.getTotalUsages(to, ConnectionTracker.ConnType.METERED.value) + } + _uiState.update { it.copy(dataUsage = usage) } } } - val getTopActiveConns = - topActiveConns.switchMap { + @OptIn(ExperimentalCoroutinesApi::class) + val getTopActiveConns: Flow> = + topActiveConnsTick.flatMapLatest { it -> val to = System.currentTimeMillis() - it Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { statsDao.getTopActiveConns(to) } - .liveData + .flow .cachedIn(viewModelScope) } - val getAllowedAppNetworkActivity = - networkActivity.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getAllowedAppNetworkActivity: Flow> = + refreshTick.flatMapLatest { _ -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - // use dnsQuery as appName - val to = startTime.value ?: 0L - statsDao.getMostAllowedApps(to) - } - .liveData + statsDao.getMostAllowedApps(startTime.value) + } + .flow .cachedIn(viewModelScope) } - val getBlockedAppNetworkActivity = - networkActivity.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getBlockedAppNetworkActivity: Flow> = + refreshTick.flatMapLatest { _ -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - // use dnsQuery as appName - val to = startTime.value ?: 0L - statsDao.getMostBlockedApps(to) - } - .liveData + statsDao.getMostBlockedApps(startTime.value) + } + .flow .cachedIn(viewModelScope) } - val getMostConnectedASN = - asn.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getMostConnectedASN: Flow> = + refreshTick.flatMapLatest { _ -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getMostConnectedASN(to) - } - .liveData + statsDao.getMostConnectedASN(startTime.value) + } + .flow .cachedIn(viewModelScope) } - val getMostBlockedASN = - asn.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getMostBlockedASN: Flow> = + refreshTick.flatMapLatest { _ -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getMostBlockedASN(to) - } - .liveData + statsDao.getMostBlockedASN(startTime.value) + } + .flow .cachedIn(viewModelScope) } - val mbd = domains.switchMap { + @OptIn(ExperimentalCoroutinesApi::class) + val mbd: Flow> = refreshTick.flatMapLatest { _ -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getMostBlockedDomains(to) + statsDao.getMostBlockedDomains(startTime.value) } - .liveData + .flow .cachedIn(viewModelScope) } - val mcd = domains.switchMap { + @OptIn(ExperimentalCoroutinesApi::class) + val mcd: Flow> = refreshTick.flatMapLatest { _ -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getMostContactedDomains(to) + statsDao.getMostContactedDomains(startTime.value) } - .liveData + .flow .cachedIn(viewModelScope) } - val getMostContactedIps = ips.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getMostContactedIps: Flow> = refreshTick.flatMapLatest { _ -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - connectionTrackerDAO.getMostContactedIps(to) + connectionTrackerDAO.getMostContactedIps(startTime.value) } - .liveData + .flow .cachedIn(viewModelScope) } - val getMostBlockedIps = ips.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getMostBlockedIps: Flow> = refreshTick.flatMapLatest { _ -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - connectionTrackerDAO.getMostBlockedIps(to) + connectionTrackerDAO.getMostBlockedIps(startTime.value) } - .liveData + .flow .cachedIn(viewModelScope) } - val getMostContactedCountries = - countryActivities.switchMap { _ -> + @OptIn(ExperimentalCoroutinesApi::class) + val getMostContactedCountries: Flow> = + refreshTick.flatMapLatest { _ -> Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { - val to = startTime.value ?: 0L - statsDao.getMostContactedCountries(to) - } - .liveData + statsDao.getMostContactedCountries(startTime.value) + } + .flow .cachedIn(viewModelScope) } - suspend fun totalUsage(): DataUsageSummary { - val to = startTime.value ?: 0L - return connectionTrackerDAO.getTotalUsages(to, ConnectionTracker.ConnType.METERED.value) + suspend fun getTopAppsForCountry(flag: String, limit: Int = 5): List { + if (flag.isBlank()) return emptyList() + val to = startTime.value + return withContext(Dispatchers.IO) { + statsDao.getFlagDetailsLimited(flag = flag, to = to, limit = limit) + } } } diff --git a/app/src/full/java/com/celzero/bravedns/viewmodel/ViewModelModule.kt b/app/src/full/java/com/celzero/bravedns/viewmodel/ViewModelModule.kt index 63247d3a9..447a13c39 100644 --- a/app/src/full/java/com/celzero/bravedns/viewmodel/ViewModelModule.kt +++ b/app/src/full/java/com/celzero/bravedns/viewmodel/ViewModelModule.kt @@ -15,11 +15,18 @@ */ package com.celzero.bravedns.viewmodel +import com.celzero.bravedns.ui.compose.home.HomeScreenViewModel +import com.celzero.bravedns.ui.compose.dns.DnsSettingsViewModel +import com.celzero.bravedns.ui.compose.about.AboutViewModel +import org.koin.android.ext.koin.androidApplication import org.koin.core.module.dsl.viewModel import org.koin.dsl.module object ViewModelModule { - private val modelModules = module { + private val viewModelModule = module { + viewModel { HomeScreenViewModel(get(), get()) } + viewModel { DnsSettingsViewModel(get(), get(), get()) } + viewModel { AboutViewModel(get(), get(), get()) } viewModel { ConnectionTrackerViewModel(get()) } viewModel { DnsCryptEndpointViewModel(get()) } viewModel { DnsCryptRelayEndpointViewModel(get()) } @@ -40,20 +47,16 @@ object ViewModelModule { viewModel { RemoteBlocklistPacksMapViewModel(get()) } viewModel { ProxyAppsMappingViewModel(get()) } viewModel { WgConfigViewModel(get()) } + viewModel { CheckoutViewModel(androidApplication(), get()) } viewModel { DoTEndpointViewModel(get()) } viewModel { ODoHEndpointViewModel(get()) } - viewModel { BlockFreeDnsViewModel(get(), get(), get(), get(), get(), get()) } viewModel { RethinkLogViewModel(get()) } viewModel { AlertsViewModel(get(), get()) } viewModel { ConsoleLogViewModel(get()) } viewModel { DomainConnectionsViewModel(get()) } viewModel { WgNwActivityViewModel(get()) } viewModel { EventsViewModel(get()) } - viewModel { PurchaseHistoryViewModel(get()) } - viewModel { ManagePurchaseViewModel() } - viewModel { ServerOrderHistoryViewModel(get()) } - viewModel { ServerSelectionViewModel() } } - val modules = listOf(modelModules) + val modules = listOf(viewModelModule) } diff --git a/app/src/main/assets/database/rethink_v22.db-shm b/app/src/main/assets/database/rethink_v22.db-shm new file mode 100644 index 000000000..fe9ac2845 Binary files /dev/null and b/app/src/main/assets/database/rethink_v22.db-shm differ diff --git a/app/src/main/assets/database/rethink_v22.db-wal b/app/src/main/assets/database/rethink_v22.db-wal new file mode 100644 index 000000000..e69de29bb diff --git a/app/src/main/java/com/celzero/bravedns/data/AppConfig.kt b/app/src/main/java/com/celzero/bravedns/data/AppConfig.kt index 3c40cd934..ada411067 100644 --- a/app/src/main/java/com/celzero/bravedns/data/AppConfig.kt +++ b/app/src/main/java/com/celzero/bravedns/data/AppConfig.kt @@ -372,6 +372,24 @@ internal constructor( } } + private data class ProxySelection( + val provider: ProxyProvider, + val type: ProxyType + ) + + private fun proxySelection(): ProxySelection { + return ProxySelection( + provider = ProxyProvider.getProxyProvider(persistentState.proxyProvider), + type = ProxyType.of(persistentState.proxyType) + ) + } + + private fun canEnableProxyForProviders(vararg allowedProviders: ProxyProvider): Boolean { + if (!canEnableProxy()) return false + val provider = proxySelection().provider + return allowedProviders.contains(provider) + } + enum class ProtoTranslationMode(val id: Int) { PTMODEAUTO(Settings.PtModeAuto), PTMODEFORCE64(Settings.PtModeForce64), @@ -535,8 +553,7 @@ internal constructor( } fun isWireGuardEnabled(): Boolean { - val proxyType = ProxyType.of(persistentState.proxyType) - return proxyType.isProxyTypeWireguard() + return proxySelection().type.isProxyTypeWireguard() } private suspend fun getDNSProxyServerDetails(): DnsProxyEndpoint? { @@ -1028,41 +1045,30 @@ internal constructor( return } - if (provider == ProxyProvider.WIREGUARD) { - setProxy(proxyType, provider) - return - } - - if (provider == ProxyProvider.ORBOT) { - setProxy(proxyType, provider) - return - } - - if (provider == ProxyProvider.TCP) { + if (provider == ProxyProvider.WIREGUARD || + provider == ProxyProvider.ORBOT || + provider == ProxyProvider.TCP + ) { setProxy(proxyType, provider) return } // If add proxy request is custom proxy (either http/socks5), check if the other // proxy is already set. if yes, then make the proxy type as HTTP_SOCKS5. - val currentProxyType = ProxyType.of(getProxyType()) - if (proxyType.isProxyTypeHttp()) { - if (currentProxyType.isProxyTypeSocks5()) { - setProxy(ProxyType.HTTP_SOCKS5, provider) - return - } - setProxy(ProxyType.HTTP, provider) - return - } - - if (proxyType.isProxyTypeSocks5()) { - if (currentProxyType.isProxyTypeHttp()) { - setProxy(ProxyType.HTTP_SOCKS5, provider) - return + val currentProxyType = proxySelection().type + val nextProxyType = + when { + proxyType.isProxyTypeHttp() && currentProxyType.isProxyTypeSocks5() -> + ProxyType.HTTP_SOCKS5 + + proxyType.isProxyTypeSocks5() && currentProxyType.isProxyTypeHttp() -> + ProxyType.HTTP_SOCKS5 + + proxyType.isProxyTypeHttp() -> ProxyType.HTTP + proxyType.isProxyTypeSocks5() -> ProxyType.SOCKS5 + else -> proxyType } - setProxy(ProxyType.SOCKS5, provider) - return - } + setProxy(nextProxyType, provider) } fun removeAllProxies() { @@ -1077,7 +1083,7 @@ internal constructor( } fun removeProxy(removeType: ProxyType, removeProvider: ProxyProvider) { - val currentProxyType = ProxyType.of(getProxyType()) + val currentProxyType = proxySelection().type if (currentProxyType.isProxyTypeHttpSocks5()) { if (removeType.isProxyTypeHttp()) { @@ -1116,67 +1122,59 @@ internal constructor( // Settings.ProxyModeSOCKS5 // Settings.ProxyModeHTTPS fun getTunProxyMode(): TunProxyMode { - val type = persistentState.proxyType - val provider = persistentState.proxyProvider - Logger.d(LOG_TAG_VPN, "selected proxy type: $type, with provider as $provider") - - if (ProxyProvider.WIREGUARD.name == provider) { - return TunProxyMode.WIREGUARD - } + val selection = proxySelection() + Logger.d( + LOG_TAG_VPN, + "selected proxy type: ${selection.type.name}, with provider as ${selection.provider.name}" + ) - if (ProxyProvider.ORBOT.name == provider) { - return TunProxyMode.ORBOT + when (selection.provider) { + ProxyProvider.WIREGUARD -> return TunProxyMode.WIREGUARD + ProxyProvider.ORBOT -> return TunProxyMode.ORBOT + else -> Unit } - when (type) { - ProxyType.HTTP.name -> { - return TunProxyMode.HTTPS - } - ProxyType.SOCKS5.name -> { - return TunProxyMode.SOCKS5 - } - ProxyType.HTTP_SOCKS5.name -> { + when (selection.type) { + ProxyType.HTTP -> return TunProxyMode.HTTPS + ProxyType.SOCKS5 -> return TunProxyMode.SOCKS5 + ProxyType.HTTP_SOCKS5 -> { // FIXME: tunnel does not support both http and socks5 at once. return TunProxyMode.SOCKS5 } + else -> Unit } return TunProxyMode.NONE } fun isCustomHttpProxyEnabled(): Boolean { - val proxyProvider = ProxyProvider.getProxyProvider(persistentState.proxyProvider) - // return false if the proxy provider is not custom - if (!proxyProvider.isProxyProviderCustom()) return false - - val proxyType = ProxyType.of(persistentState.proxyType) - return proxyType.isProxyTypeHttp() || proxyType.isProxyTypeHttpSocks5() + val selection = proxySelection() + return selection.provider.isProxyProviderCustom() && hasHttpProxyTypeEnabled() } fun isCustomSocks5Enabled(): Boolean { - val proxyProvider = ProxyProvider.getProxyProvider(persistentState.proxyProvider) - // return false if the proxy provider is not custom - if (!proxyProvider.isProxyProviderCustom()) return false - - val proxyType = ProxyType.of(persistentState.proxyType) - return proxyType.isProxyTypeSocks5() || proxyType.isProxyTypeHttpSocks5() + val selection = proxySelection() + return selection.provider.isProxyProviderCustom() && hasSocks5ProxyTypeEnabled() } fun isOrbotProxyEnabled(): Boolean { - val proxyProvider = ProxyProvider.getProxyProvider(persistentState.proxyProvider) - return proxyProvider.isProxyProviderOrbot() + return proxySelection().provider.isProxyProviderOrbot() } fun isWgEnabled(): Boolean { - val proxyProvider = ProxyProvider.getProxyProvider(persistentState.proxyProvider) - return proxyProvider.isProxyProviderWireguard() + return proxySelection().provider.isProxyProviderWireguard() } fun isProxyEnabled(): Boolean { - val proxyProvider = ProxyProvider.getProxyProvider(persistentState.proxyProvider) - if (proxyProvider.isProxyProviderNone()) return false + val selection = proxySelection() + return !selection.provider.isProxyProviderNone() && selection.type.isAnyProxyEnabled() + } + + fun hasHttpProxyTypeEnabled(): Boolean { + return proxySelection().type.isProxyTypeHasHttp() + } - val proxyType = ProxyType.of(persistentState.proxyType) - return proxyType.isAnyProxyEnabled() + fun hasSocks5ProxyTypeEnabled(): Boolean { + return proxySelection().type.isSocks5Enabled() } fun canEnableProxy(): Boolean { @@ -1184,33 +1182,23 @@ internal constructor( } fun canEnableSocks5Proxy(): Boolean { - val proxyProvider = ProxyProvider.getProxyProvider(persistentState.proxyProvider) - return !getBraveMode().isDnsMode() && - (proxyProvider.isProxyProviderNone() || proxyProvider.isProxyProviderCustom()) + return canEnableProxyForProviders(ProxyProvider.NONE, ProxyProvider.CUSTOM) } fun canEnableWireguardProxy(): Boolean { - val proxyProvider = ProxyProvider.getProxyProvider(persistentState.proxyProvider) - return !getBraveMode().isDnsMode() && - (proxyProvider.isProxyProviderNone() || proxyProvider.isProxyProviderWireguard()) + return canEnableProxyForProviders(ProxyProvider.NONE, ProxyProvider.WIREGUARD) } fun canEnableHttpProxy(): Boolean { - val proxyProvider = ProxyProvider.getProxyProvider(persistentState.proxyProvider) - return !getBraveMode().isDnsMode() && - (proxyProvider.isProxyProviderNone() || proxyProvider.isProxyProviderCustom()) + return canEnableProxyForProviders(ProxyProvider.NONE, ProxyProvider.CUSTOM) } fun canEnableTcpProxy(): Boolean { - val proxyProvider = ProxyProvider.getProxyProvider(persistentState.proxyProvider) - return !getBraveMode().isDnsMode() && - (proxyProvider.isProxyProviderNone() || proxyProvider.isProxyProviderTcp()) + return canEnableProxyForProviders(ProxyProvider.NONE, ProxyProvider.TCP) } fun canEnableOrbotProxy(): Boolean { - val proxyProvider = ProxyProvider.getProxyProvider(persistentState.proxyProvider) - return canEnableProxy() && - (proxyProvider.isProxyProviderNone() || proxyProvider.isProxyProviderOrbot()) + return canEnableProxyForProviders(ProxyProvider.NONE, ProxyProvider.ORBOT) } suspend fun getConnectedSocks5Proxy(): ProxyEndpoint? { @@ -1246,8 +1234,8 @@ internal constructor( val sb = StringBuilder() sb.append(" Brave mode: ${getBraveMode()}\n") sb.append(" DNS type: ${getDnsType()}\n") - sb.append(" Proxy type: ${ProxyType.of(getProxyType()).name}\n") - sb.append(" Proxy provider: ${getProxyProvider()}\n") + sb.append(" Proxy type: ${proxySelection().type.name}\n") + sb.append(" Proxy provider: ${proxySelection().provider.name}\n") sb.append(" Pcap mode: ${getPcapFilePath()}\n") sb.append(" Connected DNS: ${persistentState.connectedDnsName}\n") sb.append(" Prevent DNS leaks: ${persistentState.preventDnsLeaks}\n") diff --git a/app/src/main/java/com/celzero/bravedns/data/SummaryStatisticsType.kt b/app/src/main/java/com/celzero/bravedns/data/SummaryStatisticsType.kt new file mode 100644 index 000000000..f8fd53759 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/data/SummaryStatisticsType.kt @@ -0,0 +1,35 @@ +/* + * Copyright 2022 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.data + +enum class SummaryStatisticsType(val tid: Int) { + MOST_CONNECTED_APPS(0), + MOST_BLOCKED_APPS(1), + MOST_CONNECTED_ASN(2), + MOST_BLOCKED_ASN(3), + MOST_CONTACTED_DOMAINS(4), + MOST_CONTACTED_COUNTRIES(5), + MOST_BLOCKED_DOMAINS(6), + MOST_CONTACTED_IPS(7), + MOST_BLOCKED_IPS(8), + TOP_ACTIVE_CONNS(9); + + companion object { + fun getType(t: Int): SummaryStatisticsType { + return entries.find { it.tid == t } ?: MOST_CONNECTED_APPS + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/database/AppInfoDAO.kt b/app/src/main/java/com/celzero/bravedns/database/AppInfoDAO.kt index 48ac09cc0..1c3fb4a1d 100644 --- a/app/src/main/java/com/celzero/bravedns/database/AppInfoDAO.kt +++ b/app/src/main/java/com/celzero/bravedns/database/AppInfoDAO.kt @@ -24,6 +24,7 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update import com.celzero.bravedns.data.DataUsage +import kotlinx.coroutines.flow.Flow @Dao interface AppInfoDAO { @@ -64,6 +65,11 @@ interface AppInfoDAO { fun tombstoneApp(oldUid: Int, newUid: Int, tombstoneTs: Long, modifiedTs: Long) @Query("select * from AppInfo order by appCategory, uid") fun getAllAppDetails(): List + @Query("select * from AppInfo order by lower(appName), uid, packageName") + fun getAllAppDetailsFlow(): Flow> + + @Query("select count(*) from AppInfo") + suspend fun getAppCount(): Int @Query( "select * from AppInfo where isSystemApp = 1 and (appName like :search or uid like :search or packageName like :search) and (firewallStatus in (:firewall) or isProxyExcluded in (:isProxyExcluded)) and connectionStatus in (:connectionStatus) order by lower(appName)" @@ -129,24 +135,26 @@ interface AppInfoDAO { ): PagingSource @Query( - "select * from AppInfo where (appName like :search or uid like :search or packageName like :search) and appCategory in (:cat) and isSystemApp in (:appType) and firewallStatus in (:firewall) and connectionStatus in (:connectionStatus) order by lower(appName)" + "select * from AppInfo where (appName like :search or uid like :search or packageName like :search) and appCategory in (:cat) and isSystemApp in (:appType) and (firewallStatus in (:firewall) or isProxyExcluded in (:isProxyExcluded)) and connectionStatus in (:connectionStatus) order by lower(appName)" ) fun getFilteredApps( search: String, cat: Set, firewall: Set, appType: Set, - connectionStatus: Set + connectionStatus: Set, + isProxyExcluded: Set ): List @Query( - "select * from AppInfo where (appName like :search or uid like :search or packageName like :search) and isSystemApp in (:appType) and firewallStatus in (:firewall) and connectionStatus in (:connectionStatus) order by lower(appName)" + "select * from AppInfo where (appName like :search or uid like :search or packageName like :search) and isSystemApp in (:appType) and (firewallStatus in (:firewall) or isProxyExcluded in (:isProxyExcluded)) and connectionStatus in (:connectionStatus) order by lower(appName)" ) fun getFilteredApps( search: String, firewall: Set, appType: Set, - connectionStatus: Set + connectionStatus: Set, + isProxyExcluded: Set ): List @Query( @@ -177,7 +185,7 @@ interface AppInfoDAO { @Query("update AppInfo set isProxyExcluded = :bypass where packageName = 'com.celzero.bravedns'") fun setRethinkToBypassProxy(bypass: Boolean) - @Query("update AppInfo set firewallStatus = 7 and connectionStatus = 3 where packageName = 'com.celzero.bravedns'") + @Query("update AppInfo set firewallStatus = 7, connectionStatus = 3 where packageName = 'com.celzero.bravedns'") fun setRethinkToBypassDnsAndFirewall() @Query("select * from AppInfo where tempAllowEnabled = 1 and tempAllowExpiryTime > 0") diff --git a/app/src/main/java/com/celzero/bravedns/database/ConnectionTrackerDAO.kt b/app/src/main/java/com/celzero/bravedns/database/ConnectionTrackerDAO.kt index e8a8df8b9..eb14c7d6d 100644 --- a/app/src/main/java/com/celzero/bravedns/database/ConnectionTrackerDAO.kt +++ b/app/src/main/java/com/celzero/bravedns/database/ConnectionTrackerDAO.kt @@ -84,6 +84,17 @@ interface ConnectionTrackerDAO { ) fun getConnectionTrackerByName(query: String): PagingSource + @Query("select * from ConnectionTracker where blockedByRule in (:filter) order by id desc LIMIT $MAX_LOGS") + fun getConnectionsFiltered(filter: Set): PagingSource + + @Query( + "select * from ConnectionTracker where (appName like :query or ipAddress like :query or dnsQuery like :query or flag like :query or proxyDetails like :query or connId like :query) and blockedByRule in (:filter) order by id desc LIMIT $MAX_LOGS" + ) + fun getConnectionsFiltered( + query: String, + filter: Set + ): PagingSource + @Query("select * from ConnectionTracker where isBlocked = 1 order by id desc LIMIT $MAX_LOGS") fun getBlockedConnections(): PagingSource @@ -187,6 +198,36 @@ interface ConnectionTrackerDAO { @Query("select count(id) from ConnectionTracker") fun logsCount(): LiveData + @Query( + "SELECT appName AS appName, packageName AS packageName, COUNT(id) AS count FROM ConnectionTracker WHERE TRIM(appName) != '' GROUP BY appName, packageName ORDER BY count DESC" + ) + suspend fun getAllLoggedAppsWithCount(): List + + @Query( + "SELECT appName AS appName, packageName AS packageName, COUNT(id) AS count FROM ConnectionTracker WHERE blockedByRule in (:rules) AND TRIM(appName) != '' GROUP BY appName, packageName ORDER BY count DESC" + ) + suspend fun getAllLoggedAppsWithCountFiltered(rules: Set): List + + @Query( + "SELECT appName AS appName, packageName AS packageName, COUNT(id) AS count FROM ConnectionTracker WHERE isBlocked = 0 AND TRIM(appName) != '' GROUP BY appName, packageName ORDER BY count DESC" + ) + suspend fun getAllowedLoggedAppsWithCount(): List + + @Query( + "SELECT appName AS appName, packageName AS packageName, COUNT(id) AS count FROM ConnectionTracker WHERE isBlocked = 0 AND blockedByRule in (:rules) AND TRIM(appName) != '' GROUP BY appName, packageName ORDER BY count DESC" + ) + suspend fun getAllowedLoggedAppsWithCountFiltered(rules: Set): List + + @Query( + "SELECT appName AS appName, packageName AS packageName, COUNT(id) AS count FROM ConnectionTracker WHERE isBlocked = 1 AND TRIM(appName) != '' GROUP BY appName, packageName ORDER BY count DESC" + ) + suspend fun getBlockedLoggedAppsWithCount(): List + + @Query( + "SELECT appName AS appName, packageName AS packageName, COUNT(id) AS count FROM ConnectionTracker WHERE isBlocked = 1 AND blockedByRule in (:rules) AND TRIM(appName) != '' GROUP BY appName, packageName ORDER BY count DESC" + ) + suspend fun getBlockedLoggedAppsWithCountFiltered(rules: Set): List + @Query( "select timeStamp from ConnectionTracker where id = (select min(id) from ConnectionTracker)" ) diff --git a/app/src/main/java/com/celzero/bravedns/database/ConnectionTrackerRepository.kt b/app/src/main/java/com/celzero/bravedns/database/ConnectionTrackerRepository.kt index 31ad0bebc..af6d67903 100644 --- a/app/src/main/java/com/celzero/bravedns/database/ConnectionTrackerRepository.kt +++ b/app/src/main/java/com/celzero/bravedns/database/ConnectionTrackerRepository.kt @@ -77,6 +77,30 @@ class ConnectionTrackerRepository(private val connectionTrackerDAO: ConnectionTr return connectionTrackerDAO.logsCount() } + suspend fun getAllLoggedAppsWithCount(rules: Set = emptySet()): List { + return if (rules.isEmpty()) { + connectionTrackerDAO.getAllLoggedAppsWithCount() + } else { + connectionTrackerDAO.getAllLoggedAppsWithCountFiltered(rules) + } + } + + suspend fun getAllowedLoggedAppsWithCount(rules: Set = emptySet()): List { + return if (rules.isEmpty()) { + connectionTrackerDAO.getAllowedLoggedAppsWithCount() + } else { + connectionTrackerDAO.getAllowedLoggedAppsWithCountFiltered(rules) + } + } + + suspend fun getBlockedLoggedAppsWithCount(rules: Set = emptySet()): List { + return if (rules.isEmpty()) { + connectionTrackerDAO.getBlockedLoggedAppsWithCount() + } else { + connectionTrackerDAO.getBlockedLoggedAppsWithCountFiltered(rules) + } + } + fun getLeastLoggedTime(): Long { return connectionTrackerDAO.getLeastLoggedTime() } diff --git a/app/src/main/java/com/celzero/bravedns/database/ConsoleLogDatabase.kt b/app/src/main/java/com/celzero/bravedns/database/ConsoleLogDatabase.kt index 0b69bf6fd..54054fcf2 100644 --- a/app/src/main/java/com/celzero/bravedns/database/ConsoleLogDatabase.kt +++ b/app/src/main/java/com/celzero/bravedns/database/ConsoleLogDatabase.kt @@ -33,9 +33,9 @@ abstract class ConsoleLogDatabase : RoomDatabase() { } private val MIGRATION_1_2 = object : androidx.room.migration.Migration(1, 2) { - override fun migrate(database: androidx.sqlite.db.SupportSQLiteDatabase) { + override fun migrate(db: androidx.sqlite.db.SupportSQLiteDatabase) { // set default log level to 3 (INFO) - database.execSQL("ALTER TABLE ConsoleLog ADD COLUMN level INTEGER DEFAULT 3") + db.execSQL("ALTER TABLE ConsoleLog ADD COLUMN level INTEGER DEFAULT 3") } } } diff --git a/app/src/main/java/com/celzero/bravedns/database/DnsLogDAO.kt b/app/src/main/java/com/celzero/bravedns/database/DnsLogDAO.kt index 4516dc166..ad485973c 100644 --- a/app/src/main/java/com/celzero/bravedns/database/DnsLogDAO.kt +++ b/app/src/main/java/com/celzero/bravedns/database/DnsLogDAO.kt @@ -94,6 +94,21 @@ interface DnsLogDAO { @Query("select count(id) from DNSLogs") fun logsCount(): LiveData + @Query( + "SELECT appName AS appName, packageName AS packageName, COUNT(id) AS count FROM DNSLogs WHERE TRIM(appName) != '' GROUP BY appName, packageName ORDER BY count DESC" + ) + suspend fun getAllLoggedAppsWithCount(): List + + @Query( + "SELECT appName AS appName, packageName AS packageName, COUNT(id) AS count FROM DNSLogs WHERE isBlocked = 0 AND blockLists = '' AND TRIM(appName) != '' GROUP BY appName, packageName ORDER BY count DESC" + ) + suspend fun getAllowedLoggedAppsWithCount(): List + + @Query( + "SELECT appName AS appName, packageName AS packageName, COUNT(id) AS count FROM DNSLogs WHERE isBlocked = 1 AND TRIM(appName) != '' GROUP BY appName, packageName ORDER BY count DESC" + ) + suspend fun getBlockedLoggedAppsWithCount(): List + @Query("select time from DNSLogs where id = (select min(id) from DNSLogs)") fun getLeastLoggedTime(): Long diff --git a/app/src/main/java/com/celzero/bravedns/database/DnsLogRepository.kt b/app/src/main/java/com/celzero/bravedns/database/DnsLogRepository.kt index 72c604bff..ba20984db 100644 --- a/app/src/main/java/com/celzero/bravedns/database/DnsLogRepository.kt +++ b/app/src/main/java/com/celzero/bravedns/database/DnsLogRepository.kt @@ -39,6 +39,18 @@ class DnsLogRepository(private val dnsLogDAO: DnsLogDAO) { return dnsLogDAO.logsCount() } + suspend fun getAllLoggedAppsWithCount(): List { + return dnsLogDAO.getAllLoggedAppsWithCount() + } + + suspend fun getAllowedLoggedAppsWithCount(): List { + return dnsLogDAO.getAllowedLoggedAppsWithCount() + } + + suspend fun getBlockedLoggedAppsWithCount(): List { + return dnsLogDAO.getBlockedLoggedAppsWithCount() + } + fun getLeastLoggedTime(): Long { return dnsLogDAO.getLeastLoggedTime() } diff --git a/app/src/main/java/com/celzero/bravedns/database/LogAppCount.kt b/app/src/main/java/com/celzero/bravedns/database/LogAppCount.kt new file mode 100644 index 000000000..dbfb0088d --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/database/LogAppCount.kt @@ -0,0 +1,23 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.database + +data class LogAppCount( + val appName: String, + val packageName: String, + val count: Int +) + diff --git a/app/src/main/java/com/celzero/bravedns/database/RefreshDatabase.kt b/app/src/main/java/com/celzero/bravedns/database/RefreshDatabase.kt index d5c9065e0..b6996a392 100644 --- a/app/src/main/java/com/celzero/bravedns/database/RefreshDatabase.kt +++ b/app/src/main/java/com/celzero/bravedns/database/RefreshDatabase.kt @@ -47,8 +47,7 @@ import com.celzero.bravedns.service.PersistentState import com.celzero.bravedns.service.ProxyManager import com.celzero.bravedns.service.VpnController import com.celzero.bravedns.service.WireguardManager -import com.celzero.bravedns.ui.NotificationHandlerActivity -import com.celzero.bravedns.ui.activity.AppLockActivity +import com.celzero.bravedns.ui.HomeScreenActivity import com.celzero.bravedns.util.AndroidUidConfig import com.celzero.bravedns.util.Constants import com.celzero.bravedns.util.Constants.Companion.INVALID_UID @@ -686,7 +685,7 @@ internal constructor( ctx.getSystemService(VpnService.NOTIFICATION_SERVICE) as NotificationManager Logger.d(LOG_TAG_VPN, "Number of new apps: $appSize, show notification") - val intent = Intent(ctx, NotificationHandlerActivity::class.java) + val intent = Intent(ctx, HomeScreenActivity::class.java) intent.putExtra( Constants.NOTIF_INTENT_EXTRA_NEW_APP_NAME, Constants.NOTIF_INTENT_EXTRA_NEW_APP_VALUE @@ -698,7 +697,7 @@ internal constructor( var builder: NotificationCompat.Builder if (isAtleastO()) { val name: CharSequence = ctx.getString(R.string.notif_channel_firewall_alerts) - val description = ctx.resources.getString(R.string.notif_channel_desc_firewall_alerts) + val description = ctx.getString(R.string.notif_channel_desc_firewall_alerts) val importance = NotificationManager.IMPORTANCE_HIGH val channel = NotificationChannel(NOTIF_CHANNEL_ID_FIREWALL_ALERTS, name, importance) channel.description = description @@ -708,9 +707,9 @@ internal constructor( builder = NotificationCompat.Builder(ctx, NOTIF_CHANNEL_ID_FIREWALL_ALERTS) } - val contentTitle: String = ctx.resources.getString(R.string.new_app_bulk_notification_title) + val contentTitle: String = ctx.getString(R.string.new_app_bulk_notification_title) val contentText: String = - ctx.resources.getString(R.string.new_app_bulk_notification_content, appSize.toString()) + ctx.getString(R.string.new_app_bulk_notification_content, appSize.toString()) builder .setSmallIcon(R.drawable.ic_notification_icon) @@ -766,7 +765,7 @@ internal constructor( ctx.getSystemService(VpnService.NOTIFICATION_SERVICE) as NotificationManager Logger.d(LOG_TAG_VPN, "New app installed: $appName, show notification") - val intent = Intent(ctx, NotificationHandlerActivity::class.java) + val intent = Intent(ctx, HomeScreenActivity::class.java) intent.putExtra( Constants.NOTIF_INTENT_EXTRA_NEW_APP_NAME, Constants.NOTIF_INTENT_EXTRA_NEW_APP_VALUE @@ -784,7 +783,7 @@ internal constructor( val builder: NotificationCompat.Builder if (isAtleastO()) { val name: CharSequence = ctx.getString(R.string.notif_channel_firewall_alerts) - val description = ctx.resources.getString(R.string.notif_channel_desc_firewall_alerts) + val description = ctx.getString(R.string.notif_channel_desc_firewall_alerts) val importance = NotificationManager.IMPORTANCE_HIGH val channel = NotificationChannel(NOTIF_CHANNEL_ID_FIREWALL_ALERTS, name, importance) channel.description = description @@ -794,9 +793,9 @@ internal constructor( builder = NotificationCompat.Builder(ctx, NOTIF_CHANNEL_ID_FIREWALL_ALERTS) } - val contentTitle: String = ctx.resources.getString(R.string.lbl_action_required) + val contentTitle: String = ctx.getString(R.string.lbl_action_required) val contentText: String = - ctx.resources.getString(R.string.new_app_notification_content, appName) + ctx.getString(R.string.new_app_notification_content, appName) builder .setSmallIcon(R.drawable.ic_notification_icon) @@ -825,13 +824,13 @@ internal constructor( val notificationAction: NotificationCompat.Action = NotificationCompat.Action( 0, - ctx.resources.getString(R.string.allow).uppercase(), + ctx.getString(R.string.allow).uppercase(), openIntent1 ) val notificationAction2: NotificationCompat.Action = NotificationCompat.Action( 0, - ctx.resources.getString(R.string.new_app_notification_action_deny).uppercase(), + ctx.getString(R.string.new_app_notification_action_deny).uppercase(), openIntent2 ) builder.addAction(notificationAction) @@ -850,7 +849,7 @@ internal constructor( return } - val intent = Intent(ctx, AppLockActivity::class.java) + val intent = Intent(ctx, HomeScreenActivity::class.java) val nm = ctx.getSystemService(VpnService.NOTIFICATION_SERVICE) as NotificationManager val pendingIntent = getActivityPendingIntent( @@ -861,7 +860,7 @@ internal constructor( ) if (isAtleastO()) { val name: CharSequence = ctx.getString(R.string.notif_channel_firewall_alerts) - val description = ctx.resources.getString(R.string.notif_channel_desc_firewall_alerts) + val description = ctx.getString(R.string.notif_channel_desc_firewall_alerts) val importance = NotificationManager.IMPORTANCE_HIGH val channel = NotificationChannel(NOTIF_CHANNEL_ID_FIREWALL_ALERTS, name, importance) channel.description = description @@ -870,8 +869,8 @@ internal constructor( var builder: NotificationCompat.Builder = NotificationCompat.Builder(ctx, NOTIF_CHANNEL_ID_FIREWALL_ALERTS) - val contentTitle = ctx.resources.getString(R.string.rules_load_failure_heading) - val contentText = ctx.resources.getString(R.string.rules_load_failure_desc) + val contentTitle = ctx.getString(R.string.rules_load_failure_heading) + val contentText = ctx.getString(R.string.rules_load_failure_desc) builder .setSmallIcon(R.drawable.ic_notification_icon) .setContentTitle(contentTitle) @@ -884,7 +883,7 @@ internal constructor( val notificationAction: NotificationCompat.Action = NotificationCompat.Action( 0, - ctx.resources.getString(R.string.rules_load_failure_reload), + ctx.getString(R.string.rules_load_failure_reload), openIntent ) builder.addAction(notificationAction) diff --git a/app/src/main/java/com/celzero/bravedns/database/RethinkDnsEndpointRepository.kt b/app/src/main/java/com/celzero/bravedns/database/RethinkDnsEndpointRepository.kt index d677227da..2a9fe2210 100644 --- a/app/src/main/java/com/celzero/bravedns/database/RethinkDnsEndpointRepository.kt +++ b/app/src/main/java/com/celzero/bravedns/database/RethinkDnsEndpointRepository.kt @@ -17,70 +17,78 @@ package com.celzero.bravedns.database import androidx.room.Transaction +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext class RethinkDnsEndpointRepository(private val rethinkDnsEndpointDao: RethinkDnsEndpointDao) { @Transaction suspend fun update(rethinkDnsEndpoint: RethinkDnsEndpoint) { - rethinkDnsEndpointDao.removeConnectionStatus() - rethinkDnsEndpointDao.update(rethinkDnsEndpoint) + withContext(Dispatchers.IO) { + rethinkDnsEndpointDao.removeConnectionStatus() + rethinkDnsEndpointDao.update(rethinkDnsEndpoint) + } } suspend fun insertWithReplace(rethinkDnsEndpoint: RethinkDnsEndpoint) { - rethinkDnsEndpointDao.insertReplace(rethinkDnsEndpoint) + withContext(Dispatchers.IO) { rethinkDnsEndpointDao.insertReplace(rethinkDnsEndpoint) } } suspend fun removeConnectionStatus() { - rethinkDnsEndpointDao.removeConnectionStatus() + withContext(Dispatchers.IO) { rethinkDnsEndpointDao.removeConnectionStatus() } } suspend fun removeAppWiseDns(uid: Int) { - rethinkDnsEndpointDao.removeAppWiseDns(uid) + withContext(Dispatchers.IO) { rethinkDnsEndpointDao.removeAppWiseDns(uid) } } suspend fun isAppWiseDnsEnabled(uid: Int): Boolean { - return rethinkDnsEndpointDao.isAppWiseDnsEnabled(uid) ?: false + return withContext(Dispatchers.IO) { rethinkDnsEndpointDao.isAppWiseDnsEnabled(uid) ?: false } } suspend fun getConnectedEndpoint(): RethinkDnsEndpoint? { - return rethinkDnsEndpointDao.getConnectedEndpoint() + return withContext(Dispatchers.IO) { rethinkDnsEndpointDao.getConnectedEndpoint() } } suspend fun getDefaultRethinkEndpoint(): RethinkDnsEndpoint? { - return rethinkDnsEndpointDao.getDefaultRethinkEndpoint() + return withContext(Dispatchers.IO) { rethinkDnsEndpointDao.getDefaultRethinkEndpoint() } } suspend fun updateConnectionDefault() { - rethinkDnsEndpointDao.removeConnectionStatus() - rethinkDnsEndpointDao.updateConnectionDefault() + withContext(Dispatchers.IO) { + rethinkDnsEndpointDao.removeConnectionStatus() + rethinkDnsEndpointDao.updateConnectionDefault() + } } suspend fun setRethinkPlus() { - rethinkDnsEndpointDao.removeConnectionStatus() - rethinkDnsEndpointDao.setRethinkPlus() + withContext(Dispatchers.IO) { + rethinkDnsEndpointDao.removeConnectionStatus() + rethinkDnsEndpointDao.setRethinkPlus() + } } suspend fun getCount(): Int { - return rethinkDnsEndpointDao.getCount() + return withContext(Dispatchers.IO) { rethinkDnsEndpointDao.getCount() } } suspend fun updatePlusBlocklistCount(count: Int) { - rethinkDnsEndpointDao.updatePlusBlocklistCount(count) + withContext(Dispatchers.IO) { rethinkDnsEndpointDao.updatePlusBlocklistCount(count) } } suspend fun updateEndpoint(name: String, url: String, count: Int) { - rethinkDnsEndpointDao.updateEndpoint(name, url, count) + withContext(Dispatchers.IO) { rethinkDnsEndpointDao.updateEndpoint(name, url, count) } } suspend fun getRethinkPlusEndpoint(): RethinkDnsEndpoint? { - return rethinkDnsEndpointDao.getRethinkPlusEndpoint() + return withContext(Dispatchers.IO) { rethinkDnsEndpointDao.getRethinkPlusEndpoint() } } suspend fun switchToMax() { - rethinkDnsEndpointDao.switchToMax() + withContext(Dispatchers.IO) { rethinkDnsEndpointDao.switchToMax() } } suspend fun switchToSky() { - rethinkDnsEndpointDao.switchToSky() + withContext(Dispatchers.IO) { rethinkDnsEndpointDao.switchToSky() } } } diff --git a/app/src/main/java/com/celzero/bravedns/database/RethinkLocalFileTag.kt b/app/src/main/java/com/celzero/bravedns/database/RethinkLocalFileTag.kt index 8be55b98d..d3fb15333 100644 --- a/app/src/main/java/com/celzero/bravedns/database/RethinkLocalFileTag.kt +++ b/app/src/main/java/com/celzero/bravedns/database/RethinkLocalFileTag.kt @@ -87,9 +87,9 @@ class RethinkLocalFileTag { "group" -> group = it.value as String "subg" -> subg = it.value as String "url" -> { - if (it.value as Any? is String) { + if (it.value is String) { url = listOf(it.value as String) - } else if (it.value as Any? is List<*>) { + } else if (it.value is List<*>) { @Suppress("UNCHECKED_CAST") url = it.value as List } @@ -97,9 +97,9 @@ class RethinkLocalFileTag { "show" -> show = it.value as Int "entries" -> entries = it.value as Int "pack" -> { - if (it.value as Any? is String) { + if (it.value is String) { pack = listOf(it.value as String) - } else if (it.value as Any? is List<*>) { + } else if (it.value is List<*>) { @Suppress("UNCHECKED_CAST") pack = it.value as List } @@ -107,7 +107,7 @@ class RethinkLocalFileTag { "simpleTagId" -> simpleTagId = it.value as Int "isSelected" -> { isSelected = - if (it.value as Any? is Boolean) { + if (it.value is Boolean) { it.value as Boolean } else { (it.value as Int) == 1 diff --git a/app/src/main/java/com/celzero/bravedns/database/RethinkLocalFileTagDao.kt b/app/src/main/java/com/celzero/bravedns/database/RethinkLocalFileTagDao.kt index 2bab75d05..9c93b187f 100644 --- a/app/src/main/java/com/celzero/bravedns/database/RethinkLocalFileTagDao.kt +++ b/app/src/main/java/com/celzero/bravedns/database/RethinkLocalFileTagDao.kt @@ -94,7 +94,8 @@ interface RethinkLocalFileTagDao { selected: Set ): PagingSource - @Query("Update RethinkLocalFileTag set isSelected = 0") fun clearSelectedTags() + @Query("Update RethinkLocalFileTag set isSelected = 0") + suspend fun clearSelectedTags() @Query( "select value, uname, vname, `group`, subg, url as urls, show, entries, pack, level, simpleTagId, isSelected from RethinkLocalFileTag" diff --git a/app/src/main/java/com/celzero/bravedns/database/RethinkRemoteFileTagDao.kt b/app/src/main/java/com/celzero/bravedns/database/RethinkRemoteFileTagDao.kt index 52b0c1406..364b52b81 100644 --- a/app/src/main/java/com/celzero/bravedns/database/RethinkRemoteFileTagDao.kt +++ b/app/src/main/java/com/celzero/bravedns/database/RethinkRemoteFileTagDao.kt @@ -94,7 +94,8 @@ interface RethinkRemoteFileTagDao { ) fun fileTags(): List - @Query("Update RethinkRemoteFileTag set isSelected = 0") fun clearSelectedTags() + @Query("Update RethinkRemoteFileTag set isSelected = 0") + suspend fun clearSelectedTags() @Query("select value from RethinkRemoteFileTag where isSelected = 1") fun getSelectedTags(): List diff --git a/app/src/main/java/com/celzero/bravedns/database/StatsSummaryDao.kt b/app/src/main/java/com/celzero/bravedns/database/StatsSummaryDao.kt index 41e6c88bd..d690eb91a 100644 --- a/app/src/main/java/com/celzero/bravedns/database/StatsSummaryDao.kt +++ b/app/src/main/java/com/celzero/bravedns/database/StatsSummaryDao.kt @@ -929,6 +929,57 @@ interface StatsSummaryDao { ) fun getFlagDetails(flag: String, to: Long): PagingSource + @Query( + """ + SELECT uid AS uid, + '' AS ipAddress, + 0 AS port, + SUM(count) AS count, + flag AS flag, + 0 AS blocked, + appOrDnsName AS appOrDnsName, + Sum(uploadbytes) AS uploadBytes, + Sum(downloadbytes) AS downloadBytes, + Sum(uploadBytes + downloadBytes) AS totalBytes + FROM + ( + -- From ConnectionTracker + SELECT uid, + appName AS appOrDnsName, + COUNT(id) AS count, + flag as flag, + SUM(uploadBytes) AS uploadBytes, + SUM(downloadBytes) AS downloadBytes + FROM ConnectionTracker + WHERE timeStamp > :to + AND flag = :flag + AND isBlocked = 0 + GROUP BY uid + + UNION ALL + + -- From DnsLogs + SELECT uid, + appName AS appOrDnsName, + COUNT(id) AS count, + flag as flag, + 0 AS uploadBytes, + 0 AS downloadBytes + FROM DnsLogs + WHERE time > :to + AND flag = :flag + AND isBlocked = 0 + AND status = 'COMPLETE' + AND queryStr != '' + GROUP BY uid + ) AS combined + GROUP BY uid + ORDER BY count DESC + LIMIT :limit + """ + ) + suspend fun getFlagDetailsLimited(flag: String, to: Long, limit: Int): List + @Query( """ SELECT :uid AS uid, diff --git a/app/src/main/java/com/celzero/bravedns/service/AppsStatsManager.kt b/app/src/main/java/com/celzero/bravedns/service/AppsStatsManager.kt new file mode 100644 index 000000000..5140307dc --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/AppsStatsManager.kt @@ -0,0 +1,108 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import androidx.lifecycle.asFlow +import com.celzero.bravedns.database.AppInfo +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.withContext + +/** + * Manages app statistics for firewall. + * Extracted from BraveVPNService for better separation of concerns. + */ +class AppsStatsManager( + private val firewallManager: FirewallManager, + private val scope: CoroutineScope +) { + + companion object { + private const val TAG = "AppsStats" + } + + private val _appsStats = MutableStateFlow(AppsStats()) + val appsStats: StateFlow = _appsStats.asStateFlow() + + data class AppsStats( + val totalApps: Int = 0, + val allowedApps: Int = 0, + val blockedApps: Int = 0, + val bypassedApps: Int = 0, + val isolatedApps: Int = 0, + val excludedApps: Int = 0 + ) + + init { + observeAppChanges() + } + + private fun observeAppChanges() { + firewallManager.getApplistObserver().asFlow() + .onEach { appList -> + updateStats(appList) + } + .launchIn(scope) + } + + private fun updateStats(appList: Collection) { + val blockedCount = appList.count { appInfo -> + appInfo.connectionStatus != FirewallManager.ConnectionStatus.ALLOW.id + } + val bypassCount = appList.count { appInfo -> + appInfo.firewallStatus == FirewallManager.FirewallStatus.BYPASS_UNIVERSAL.id || + appInfo.firewallStatus == FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL.id + } + val excludedCount = appList.count { appInfo -> + appInfo.firewallStatus == FirewallManager.FirewallStatus.EXCLUDE.id + } + val isolatedCount = appList.count { appInfo -> + appInfo.firewallStatus == FirewallManager.FirewallStatus.ISOLATE.id + } + val totalApps = appList.size + val allowedApps = totalApps - (blockedCount + bypassCount + excludedCount + isolatedCount) + + _appsStats.update { state -> + state.copy( + totalApps = totalApps, + allowedApps = allowedApps, + blockedApps = blockedCount, + bypassedApps = bypassCount, + excludedApps = excludedCount, + isolatedApps = isolatedCount + ) + } + + Logger.d(LOG_TAG_VPN, "$TAG Updated: total=$totalApps, allowed=$allowedApps, blocked=$blockedCount") + } + + suspend fun refreshStats() { + // Stats are updated automatically via observer, no manual refresh needed + Logger.d(LOG_TAG_VPN, "$TAG Stats refresh via observer") + } + + fun getStatsSnapshot(): AppsStats { + return _appsStats.value + } +} diff --git a/app/src/main/java/com/celzero/bravedns/service/ConnectionMonitor.kt b/app/src/main/java/com/celzero/bravedns/service/ConnectionMonitor.kt index fcd6132c0..cbc7db4ed 100644 --- a/app/src/main/java/com/celzero/bravedns/service/ConnectionMonitor.kt +++ b/app/src/main/java/com/celzero/bravedns/service/ConnectionMonitor.kt @@ -42,7 +42,7 @@ import com.celzero.bravedns.RethinkDnsApplication.Companion.DEBUG import com.celzero.bravedns.service.FirewallManager.NOTIF_CHANNEL_ID_FIREWALL_ALERTS import com.celzero.bravedns.service.VpnBuilderPolicy.Companion.getNetworkBehaviourDuration import com.celzero.bravedns.service.WireguardManager.NOTIF_CHANNEL_ID_WIREGUARD_ALERTS -import com.celzero.bravedns.ui.NotificationHandlerActivity +import com.celzero.bravedns.ui.HomeScreenActivity import com.celzero.bravedns.util.ConnectivityCheckHelper import com.celzero.bravedns.util.Constants.Companion.NOTIF_WG_PERMISSION_NAME import com.celzero.bravedns.util.Constants.Companion.NOTIF_WG_PERMISSION_VALUE @@ -448,7 +448,7 @@ class ConnectionMonitor(private val context: Context, private val networkListene } Logger.w(LOG_TAG_VPN, "ssid wgs: missing permissions, show notification") - val intent = Intent(context, NotificationHandlerActivity::class.java) + val intent = Intent(context, HomeScreenActivity::class.java) intent.putExtra( NOTIF_WG_PERMISSION_NAME, NOTIF_WG_PERMISSION_VALUE @@ -464,7 +464,7 @@ class ConnectionMonitor(private val context: Context, private val networkListene var builder: NotificationCompat.Builder if (isAtleastO()) { val name: CharSequence = context.getString(R.string.notif_channel_firewall_alerts) - val description = context.resources.getString(R.string.notif_channel_desc_firewall_alerts) + val description = context.getString(R.string.notif_channel_desc_firewall_alerts) val importance = NotificationManager.IMPORTANCE_HIGH val channel = NotificationChannel(NOTIF_CHANNEL_ID_WIREGUARD_ALERTS, name, importance) channel.description = description @@ -474,7 +474,7 @@ class ConnectionMonitor(private val context: Context, private val networkListene builder = NotificationCompat.Builder(context, NOTIF_CHANNEL_ID_WIREGUARD_ALERTS) } - val contentTitle: String = context.resources.getString(R.string.lbl_action_required) + val contentTitle: String = context.getString(R.string.lbl_action_required) val contentText: String = context.getString(R.string.location_enable_explanation, context.getString(R.string.lbl_ssids)) diff --git a/app/src/main/java/com/celzero/bravedns/service/DnsConfigurationManager.kt b/app/src/main/java/com/celzero/bravedns/service/DnsConfigurationManager.kt new file mode 100644 index 000000000..d019c8090 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/DnsConfigurationManager.kt @@ -0,0 +1,133 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import android.content.Context +import android.content.SharedPreferences +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.util.Constants +import com.celzero.bravedns.util.Utilities +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +/** + * Manages DNS configuration and resolver updates. + * Extracted from BraveVPNService for better separation of concerns. + */ +class DnsConfigurationManager( + private val context: Context, + private val persistentState: PersistentState, + private val appConfig: AppConfig, + private val scope: CoroutineScope +) : SharedPreferences.OnSharedPreferenceChangeListener { + + companion object { + private const val TAG = "DnsConfig" + } + + private val _dnsLatency = MutableStateFlow("-- ms") + val dnsLatency: StateFlow = _dnsLatency.asStateFlow() + + private val _connectedDnsName = MutableStateFlow("") + val connectedDnsName: StateFlow = _connectedDnsName.asStateFlow() + + private val _dnsStatus = MutableStateFlow(DnsStatus.Idle) + val dnsStatus: StateFlow = _dnsStatus.asStateFlow() + + sealed class DnsStatus { + data object Idle : DnsStatus() + data object Connecting : DnsStatus() + data class Connected(val name: String, val latency: Long) : DnsStatus() + data class Error(val message: String) : DnsStatus() + } + + init { + persistentState.sharedPreferences.registerOnSharedPreferenceChangeListener(this) + } + + fun updateDnsLatency(latency: Long) { + _dnsLatency.value = if (latency > 0) "${latency}ms" else "-- ms" + } + + fun updateConnectedDnsName(name: String) { + _connectedDnsName.value = name + } + + suspend fun refreshResolvers() { + withContext(Dispatchers.IO) { + try { + // Refresh is handled by the VPN adapter directly + Logger.i(LOG_TAG_VPN, "$TAG Resolvers refresh requested") + } catch (e: Exception) { + Logger.e(LOG_TAG_VPN, "$TAG Failed to refresh resolvers: ${e.message}") + } + } + } + + override fun onSharedPreferenceChanged(preferences: SharedPreferences?, key: String?) { + when (key) { + PersistentState.DNS_CHANGE -> { + scope.launch(Dispatchers.IO) { + handleDnsTypeChange() + } + } + PersistentState.LOCAL_BLOCK_LIST -> { + scope.launch(Dispatchers.IO) { + handleLocalBlocklistChange() + } + } + PersistentState.REMOTE_BLOCKLIST_UPDATE -> { + scope.launch(Dispatchers.IO) { + handleRemoteBlocklistChange() + } + } + } + } + + private suspend fun handleDnsTypeChange() { + _dnsStatus.value = DnsStatus.Connecting + + when (appConfig.getDnsType()) { + AppConfig.DnsType.DOH -> Logger.i(LOG_TAG_VPN, "$TAG DNS type changed to DoH") + AppConfig.DnsType.DNSCRYPT -> Logger.i(LOG_TAG_VPN, "$TAG DNS type changed to DNSCrypt") + AppConfig.DnsType.DNS_PROXY -> Logger.i(LOG_TAG_VPN, "$TAG DNS type changed to DNS Proxy") + AppConfig.DnsType.RETHINK_REMOTE -> Logger.i(LOG_TAG_VPN, "$TAG DNS type changed to RDNS Remote") + AppConfig.DnsType.SYSTEM_DNS -> Logger.i(LOG_TAG_VPN, "$TAG DNS type changed to System DNS") + AppConfig.DnsType.SMART_DNS -> Logger.i(LOG_TAG_VPN, "$TAG DNS type changed to Smart DNS") + AppConfig.DnsType.DOT -> Logger.i(LOG_TAG_VPN, "$TAG DNS type changed to DoT") + AppConfig.DnsType.ODOH -> Logger.i(LOG_TAG_VPN, "$TAG DNS type changed to ODoH") + } + } + + private suspend fun handleLocalBlocklistChange() { + Logger.i(LOG_TAG_VPN, "$TAG Local blocklist changed") + } + + private suspend fun handleRemoteBlocklistChange() { + Logger.i(LOG_TAG_VPN, "$TAG Remote blocklist changed") + } + + fun cleanup() { + persistentState.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/service/FirewallRuleEvaluator.kt b/app/src/main/java/com/celzero/bravedns/service/FirewallRuleEvaluator.kt new file mode 100644 index 000000000..f76b52aca --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/FirewallRuleEvaluator.kt @@ -0,0 +1,523 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import android.app.KeyguardManager +import android.content.Context +import android.net.NetworkCapabilities +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.data.ConnTrackerMetaData +import com.celzero.bravedns.database.RefreshDatabase +import com.celzero.bravedns.util.Constants +import com.celzero.bravedns.util.IPUtil +import com.celzero.bravedns.util.InternetProtocol +import com.celzero.bravedns.util.KnownPorts +import com.celzero.bravedns.util.OrbotHelper +import com.celzero.bravedns.util.Protocol +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.isAtleastR +import com.celzero.bravedns.util.Utilities.isMissingOrInvalidUid +import inet.ipaddr.HostName +import inet.ipaddr.IPAddressString +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import java.util.Locale +import java.util.concurrent.TimeUnit +import kotlin.math.abs +import kotlin.math.min +import kotlin.random.Random + +/** + * Evaluates firewall rules for network connections. + * Extracted from BraveVPNService for better separation of concerns and testability. + */ +class FirewallRuleEvaluator( + private val context: Context, + private val persistentState: PersistentState, + private val appConfig: AppConfig, + private val refreshDatabase: RefreshDatabase, + private val networkInfoProvider: NetworkInfoProvider +) { + companion object { + private const val TAG = "FirewallEvaluator" + private const val UID_EVERYBODY = Constants.UID_EVERYBODY + private const val INVALID_UID = Constants.INVALID_UID + + // Backoff configuration + private const val BASE_WAIT_MS = 50L + } + + private val rand = Random + + private var keyguardManager: KeyguardManager? = null + + /** + * Checks if incoming connection is blocked by any user-set firewall rule. + * Returns the appropriate FirewallRuleset based on the evaluation. + */ + suspend fun evaluateFirewallRules( + connInfo: ConnTrackerMetaData, + domains: String?, + anyRealIpBlocked: Boolean = false, + isSplApp: Boolean, + rinr: Boolean, + rethinkUid: Int + ): FirewallRuleset { + val connId = connInfo.connId + + try { + // Skip firewall for Rethink app unless route-in-route is enabled + if (connInfo.uid == rethinkUid && !rinr) { + logd("firewall($connId): rethink uid, $rethinkUid, not processing firewall rules") + return FirewallRuleset.RULE0 + } + + logd("firewall($connId): $connInfo") + val uid = connInfo.uid + val appStatus = FirewallManager.appStatus(uid) + val connectionStatus = FirewallManager.connectionStatus(uid) + val isTempAllowed = FirewallManager.isTempAllowed(uid) + + // Evaluate rules in priority order + return evaluateRulesInOrder( + connInfo, domains, anyRealIpBlocked, isSplApp, rinr, + uid, appStatus, connectionStatus, isTempAllowed + ) + + } catch (ex: Exception) { + Logger.crash(LOG_TAG_VPN, "unexpected err in firewall()($connId), block anyway", ex) + return FirewallRuleset.RULE1C + } + } + + private suspend fun evaluateRulesInOrder( + connInfo: ConnTrackerMetaData, + domains: String?, + anyRealIpBlocked: Boolean, + isSplApp: Boolean, + rinr: Boolean, + uid: Int, + appStatus: FirewallManager.FirewallStatus, + connectionStatus: FirewallManager.ConnectionStatus, + isTempAllowed: Boolean + ): FirewallRuleset { + val connId = connInfo.connId + + // Rule 1: Allow Orbot during setup + if (allowOrbot(uid)) { + return FirewallRuleset.RULE9B + } + + // Rule 2: Block unknown apps if configured + if (unknownAppBlocked(uid)) { + logd("firewall($connId): unknown app blocked, $uid") + return FirewallRuleset.RULE5 + } + + // Rule 3: Handle new/unknown apps + if (appStatus.isUntracked() && uid != INVALID_UID) { + withContext(Dispatchers.IO) { refreshDatabase.addNewApp(uid) } + if (newAppBlocked(uid)) { + logd("firewall($connId): new app blocked, $uid") + return FirewallRuleset.RULE1B + } + } + + // Rule 4: Temporarily allowed apps + if (isTempAllowed) { + logd("firewall($connId): temp allowed, $uid") + return FirewallRuleset.RULE19 + } + + // Rule 5: App-level rules (unmetered, metered connections) + appBlocked(connInfo, connectionStatus)?.let { return it } + + // Rule 6: Lockdown + paused + if (isLockdown() && isAppPaused()) { + logd("firewall($connId): lockdown, app paused, $uid") + return FirewallRuleset.RULE16 + } + + // Rule 7: Domain rules (app-specific) + val domainPair = getDomainRule(domains, uid) + if (!domainPair.second.isNullOrEmpty()) { + connInfo.query = domainPair.second + } + when (domainPair.first) { + DomainRulesManager.Status.BLOCK -> { + logd("firewall($connId): domain blocked, $uid") + return FirewallRuleset.RULE2E + } + DomainRulesManager.Status.TRUST -> { + logd("firewall($connId): domain trusted, $uid") + return FirewallRuleset.RULE2F + } + DomainRulesManager.Status.NONE -> { /* fall-through */ } + } + + // Rule 8: IP rules (app-specific) + when (uidIpStatus(uid, connInfo.destIP, connInfo.destPort)) { + IpRulesManager.IpRuleStatus.BLOCK -> { + logd("firewall($connId): ip blocked, $uid") + return FirewallRuleset.RULE2 + } + IpRulesManager.IpRuleStatus.TRUST -> { + logd("firewall($connId): ip trusted, $uid") + return FirewallRuleset.RULE2B + } + IpRulesManager.IpRuleStatus.BYPASS_UNIVERSAL -> { /* no-op, pass-through */ } + IpRulesManager.IpRuleStatus.NONE -> { /* no-op, pass-through */ } + } + + // Rule 9: Bypass DNS Firewall mode + if (appStatus.bypassDnsFirewall()) { + logd("firewall($connId): bypass dns firewall, $uid") + return FirewallRuleset.RULE1H + } + + // Rule 10: Isolate mode + if (appStatus.isolate()) { + logd("firewall($connId): isolate mode, $uid") + return FirewallRuleset.RULE1G + } + + // Rule 11: Global domain rules + val globalDomainPair = getDomainRule(domains, UID_EVERYBODY) + val globalDomainRule = globalDomainPair.first + if (!globalDomainPair.second.isNullOrEmpty()) { + connInfo.query = globalDomainPair.second + } + + // Rule 12: Bypass Universal mode + if (appStatus.bypassUniversal()) { + if (anyRealIpBlocked && globalDomainRule != DomainRulesManager.Status.TRUST) { + logd("firewall($connId): bypass universal, dns blocked, $uid, ${connInfo.query}") + return FirewallRuleset.RULE2G + } + return if (dnsProxied(connInfo.destPort)) { + logd("firewall($connId): bypass universal, dns proxied, $uid") + FirewallRuleset.RULE9 + } else { + logd("firewall($connId): bypass universal, $uid") + FirewallRuleset.RULE8 + } + } + + // Rule 13: Global domain rules + when (globalDomainRule) { + DomainRulesManager.Status.TRUST -> { + logd("firewall($connId): global domain trusted, $uid, ${connInfo.query}") + return FirewallRuleset.RULE2I + } + DomainRulesManager.Status.BLOCK -> { + logd("firewall($connId): global domain blocked, $uid, ${connInfo.query}") + return FirewallRuleset.RULE2H + } + DomainRulesManager.Status.NONE -> { /* fall-through */ } + } + + // Rule 14: Global IP rules + when (globalIpRule(connInfo.destIP, connInfo.destPort)) { + IpRulesManager.IpRuleStatus.BLOCK -> { + logd("firewall($connId): global ip blocked, $uid, ${connInfo.destIP}") + return FirewallRuleset.RULE2D + } + IpRulesManager.IpRuleStatus.BYPASS_UNIVERSAL -> { + logd("firewall($connId): global ip bypass universal, $uid, ${connInfo.destIP}") + return FirewallRuleset.RULE2C + } + IpRulesManager.IpRuleStatus.TRUST -> { /* no-op, pass-through */ } + IpRulesManager.IpRuleStatus.NONE -> { /* no-op, pass-through */ } + } + + // Rule 15: DNS blocked IPs + if (anyRealIpBlocked) { + logd("firewall($connId): dns blocked, $uid, ${connInfo.query}") + return FirewallRuleset.RULE2G + } + + // Rule 16: Special apps (DNS proxy, SOCKS5, HTTP proxy) + if (isSplApp) { + logd("firewall($connId): special app, $uid, ${connInfo.query}") + return FirewallRuleset.RULE0 + } + + // Rule 17-24: Universal firewall rules + return evaluateUniversalRules(connInfo, uid) + } + + private suspend fun evaluateUniversalRules( + connInfo: ConnTrackerMetaData, + uid: Int + ): FirewallRuleset { + val connId = connInfo.connId + val isMetered = isConnectionMetered(connInfo.destIP) + + // Block metered connections + if (persistentState.getBlockMeteredConnections() && isMetered) { + logd("firewall($connId): metered blocked, $uid") + return FirewallRuleset.RULE1F + } + + // Universal lockdown + if (universalLockdown()) { + logd("firewall($connId): universal lockdown, $uid") + return FirewallRuleset.RULE11 + } + + // Block HTTP + if (httpBlocked(connInfo.destPort)) { + logd("firewall($connId): http blocked, $uid") + return FirewallRuleset.RULE10 + } + + // Device locked + if (deviceLocked()) { + logd("firewall($connId): device locked, $uid") + return FirewallRuleset.RULE3 + } + + // Block UDP (except DNS) + if (udpBlocked(uid, connInfo.protocol, connInfo.destPort)) { + logd("firewall($connId): udp blocked, $uid") + return FirewallRuleset.RULE6 + } + + // Block background data + if (blockBackgroundData(uid)) { + logd("firewall($connId): background data blocked, $uid") + return FirewallRuleset.RULE4 + } + + // DNS proxy mode + if (dnsProxied(connInfo.destPort)) { + logd("firewall($connId): dns proxied, $uid") + return FirewallRuleset.RULE9 + } + + // DNS bypass detection + if (dnsBypassed(connInfo.query)) { + logd("firewall($connId): dns bypassed, $uid") + return FirewallRuleset.RULE7 + } + + logd("no firewall rule($connId), uid=${connInfo.uid}") + return FirewallRuleset.RULE0 + } + + // Helper methods + + private fun logd(msg: String) { + Logger.d(LOG_TAG_VPN, "$TAG $msg") + } + + private suspend fun allowOrbot(uid: Int): Boolean { + return OrbotHelper.ORBOT_PACKAGE_NAME == FirewallManager.getPackageNameByUid(uid) + } + + private fun unknownAppBlocked(uid: Int): Boolean { + return persistentState.getBlockUnknownConnections() && isMissingOrInvalidUid(uid) + } + + private suspend fun newAppBlocked(uid: Int): Boolean { + if (!persistentState.getBlockNewlyInstalledApp() || isMissingOrInvalidUid(uid)) { + return false + } + return !waitAndCheckIfUidAllowed(uid) + } + + private suspend fun waitAndCheckIfUidAllowed(uid: Int): Boolean { + var remainingWaitMs = TimeUnit.SECONDS.toMillis(10) + var attempt = 0 + + while (remainingWaitMs > 0) { + if (FirewallManager.hasUid(uid) && !FirewallManager.isUidFirewalled(uid)) { + return true + } + remainingWaitMs = exponentialBackoff(remainingWaitMs, attempt) + attempt++ + } + return false + } + + private fun exponentialBackoff(remainingWaitMs: Long, attempt: Int): Long { + val exponent = exp(attempt) + val randomValue = rand.nextLong(exponent - BASE_WAIT_MS + 1) + BASE_WAIT_MS + val waitTimeMs = min(randomValue, remainingWaitMs) + Thread.sleep(waitTimeMs) + return remainingWaitMs - waitTimeMs + } + + private fun exp(pow: Int): Long { + return if (pow == 0) BASE_WAIT_MS else (1 shl pow) * BASE_WAIT_MS + } + + private fun appBlocked( + connInfo: ConnTrackerMetaData, + connectionStatus: FirewallManager.ConnectionStatus + ): FirewallRuleset? { + if (connectionStatus.blocked()) { + return FirewallRuleset.RULE1 + } + + val isMetered = isConnectionMetered(connInfo.destIP) + if (connectionStatus.wifi() && !isMetered) { + return FirewallRuleset.RULE1D + } + if (connectionStatus.mobileData() && isMetered) { + return FirewallRuleset.RULE1E + } + return null + } + + private fun getDomainRule(domain: String?, uid: Int): Pair { + if (domain.isNullOrEmpty()) { + return Pair(DomainRulesManager.Status.NONE, "") + } + + val domains = if (isAtleastR()) { + val d = domain.lowercase(Locale.getDefault()).split(",").firstOrNull() + if (d.isNullOrEmpty()) return Pair(DomainRulesManager.Status.NONE, "") + listOf(d) + } else { + domain.lowercase(Locale.getDefault()).split(",") + } + + if (domains.isEmpty()) { + return Pair(DomainRulesManager.Status.NONE, "") + } + + for (d in domains) { + val status = DomainRulesManager.status(d, uid) + if (status != DomainRulesManager.Status.NONE) { + return Pair(status, d) + } + } + return Pair(DomainRulesManager.Status.NONE, domains.firstOrNull()) + } + + private fun uidIpStatus(uid: Int, destIp: String, destPort: Int): IpRulesManager.IpRuleStatus { + return ipStatus(uid, destIp, destPort) + } + + private fun globalIpRule(destIp: String, destPort: Int): IpRulesManager.IpRuleStatus { + return ipStatus(UID_EVERYBODY, destIp, destPort) + } + + private fun ipStatus(uid: Int, destIp: String, destPort: Int): IpRulesManager.IpRuleStatus { + if (destIp.isEmpty() || Utilities.isUnspecifiedIp(destIp)) { + return IpRulesManager.IpRuleStatus.NONE + } + + val statusIpPort = IpRulesManager.hasRule(uid, destIp, destPort) + if (statusIpPort != IpRulesManager.IpRuleStatus.NONE) { + return statusIpPort + } + + // Check IPv4-in-IPv6 if configured + if (persistentState.filterIpv4inIpv6) { + val addr = try { + IPAddressString(destIp).address + } catch (_: Exception) { + return IpRulesManager.IpRuleStatus.NONE + } + + val ip4in6 = IPUtil.ip4in6(addr) ?: return IpRulesManager.IpRuleStatus.NONE + val ip4str = ip4in6.toNormalizedString() + return IpRulesManager.hasRule(uid, ip4str, destPort) + } + return statusIpPort + } + + private fun universalLockdown(): Boolean = persistentState.getUniversalLockdown() + + private fun httpBlocked(port: Int): Boolean { + return port == KnownPorts.HTTP_PORT && persistentState.getBlockHttpConnections() + } + + private fun dnsProxied(port: Int): Boolean { + return appConfig.getBraveMode().isDnsFirewallMode() && + appConfig.preventDnsLeaks() && + KnownPorts.isDns(port) + } + + private fun dnsBypassed(query: String?): Boolean { + return persistentState.getDisallowDnsBypass() && query.isNullOrEmpty() + } + + private fun isLockdown(): Boolean = networkInfoProvider.isLockdown() + + private fun isAppPaused(): Boolean = networkInfoProvider.isAppPaused() + + private fun isConnectionMetered(dst: String): Boolean = networkInfoProvider.isConnectionMetered(dst) + + private fun udpBlocked(uid: Int, protocol: Int, port: Int): Boolean { + if (!persistentState.getUdpBlocked()) return false + if (protocol != Protocol.UDP.protocolType) return false + if (KnownPorts.isDns(port)) return false // Allow DNS + + // For NTP, allow from system apps - simplified check + if (KnownPorts.isNtp(port)) { + // Assume non-system apps are blocked for NTP + return false // Allow NTP for now + } + return true + } + + private suspend fun blockBackgroundData(uid: Int): Boolean { + if (!persistentState.getBlockAppWhenBackground()) return false + + if (keyguardManager == null) { + keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager + } + return !waitAndCheckIfAppForeground(uid) + } + + private suspend fun waitAndCheckIfAppForeground(uid: Int): Boolean { + var remainingWaitMs = TimeUnit.SECONDS.toMillis(10) + var attempt = 0 + + while (remainingWaitMs > 0) { + if (FirewallManager.isAppForeground(uid, keyguardManager)) { + return true + } + remainingWaitMs = exponentialBackoff(remainingWaitMs, attempt) + attempt++ + } + return false + } + + private fun deviceLocked(): Boolean { + if (!persistentState.getBlockWhenDeviceLocked()) return false + + if (keyguardManager == null) { + keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager + } + return keyguardManager?.isKeyguardLocked == true + } +} + +/** + * Provides network information for firewall evaluation. + * Implement this interface to supply network state to the firewall evaluator. + */ +interface NetworkInfoProvider { + fun isLockdown(): Boolean + fun isAppPaused(): Boolean + fun isConnectionMetered(dstIp: String): Boolean +} diff --git a/app/src/main/java/com/celzero/bravedns/service/FirewallRuleset.kt b/app/src/main/java/com/celzero/bravedns/service/FirewallRuleset.kt index fc0ae6d72..c91e3ca8e 100644 --- a/app/src/main/java/com/celzero/bravedns/service/FirewallRuleset.kt +++ b/app/src/main/java/com/celzero/bravedns/service/FirewallRuleset.kt @@ -283,7 +283,7 @@ enum class FirewallRuleset(val id: String, val title: Int, val desc: Int, val ac // TODO: Move ico to enum var like for label and desc fun getRulesIcon(ruleId: String?): Int { return when (ruleId) { - RULE0.id -> R.drawable.ic_whats_new + RULE0.id -> R.drawable.ic_update RULE1.id -> R.drawable.ic_app_info RULE1B.id -> R.drawable.ic_auto_start RULE1C.id -> R.drawable.ic_filter_error diff --git a/app/src/main/java/com/celzero/bravedns/service/FirewallStatsManager.kt b/app/src/main/java/com/celzero/bravedns/service/FirewallStatsManager.kt new file mode 100644 index 000000000..9c81d369f --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/FirewallStatsManager.kt @@ -0,0 +1,111 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import androidx.lifecycle.asFlow +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update + +/** + * Manages firewall statistics including rules counts. + * Extracted from BraveVPNService for better separation of concerns. + */ +class FirewallStatsManager( + private val persistentState: PersistentState, + private val ipRulesManager: IpRulesManager, + private val domainRulesManager: DomainRulesManager, + private val scope: CoroutineScope +) { + + companion object { + private const val TAG = "FirewallStats" + } + + private val _universalRulesCount = MutableStateFlow(0) + val universalRulesCount: StateFlow = _universalRulesCount.asStateFlow() + + private val _ipRulesCount = MutableStateFlow(0) + val ipRulesCount: StateFlow = _ipRulesCount.asStateFlow() + + private val _domainRulesCount = MutableStateFlow(0) + val domainRulesCount: StateFlow = _domainRulesCount.asStateFlow() + + private val _firewallStats = MutableStateFlow(FirewallStats()) + val firewallStats: StateFlow = _firewallStats.asStateFlow() + + data class FirewallStats( + val universalRules: Int = 0, + val ipRules: Int = 0, + val domainRules: Int = 0, + val totalRules: Int = 0 + ) + + init { + observeRulesChanges() + } + + private fun observeRulesChanges() { + persistentState.universalRulesCount.asFlow() + .onEach { count -> + _universalRulesCount.update { count } + updateTotalStats() + Logger.d(LOG_TAG_VPN, "$TAG Universal rules: $count") + } + .launchIn(scope) + + ipRulesManager.getCustomIpsLiveData().asFlow() + .onEach { count -> + _ipRulesCount.update { count } + updateTotalStats() + Logger.d(LOG_TAG_VPN, "$TAG IP rules: $count") + } + .launchIn(scope) + + domainRulesManager.getUniversalCustomDomainCount().asFlow() + .onEach { count -> + _domainRulesCount.update { count } + updateTotalStats() + Logger.d(LOG_TAG_VPN, "$TAG Domain rules: $count") + } + .launchIn(scope) + } + + private fun updateTotalStats() { + _firewallStats.update { + it.copy( + universalRules = _universalRulesCount.value, + ipRules = _ipRulesCount.value, + domainRules = _domainRulesCount.value, + totalRules = _universalRulesCount.value + _ipRulesCount.value + _domainRulesCount.value + ) + } + } + + fun getStatsSnapshot(): FirewallStats { + return _firewallStats.value + } + + fun getTotalRulesCount(): Int { + return _firewallStats.value.totalRules + } +} diff --git a/app/src/main/java/com/celzero/bravedns/service/LogsCountManager.kt b/app/src/main/java/com/celzero/bravedns/service/LogsCountManager.kt new file mode 100644 index 000000000..1d43d86d4 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/LogsCountManager.kt @@ -0,0 +1,80 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import androidx.lifecycle.asFlow +import com.celzero.bravedns.data.AppConfig +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update + +/** + * Manages DNS and network log counts. + * Extracted from BraveVPNService for better separation of concerns. + */ +class LogsCountManager( + private val appConfig: AppConfig, + private val scope: CoroutineScope +) { + + companion object { + private const val TAG = "LogsCount" + } + + private val _dnsLogsCount = MutableStateFlow(0L) + val dnsLogsCount: StateFlow = _dnsLogsCount.asStateFlow() + + private val _networkLogsCount = MutableStateFlow(0L) + val networkLogsCount: StateFlow = _networkLogsCount.asStateFlow() + + init { + observeLogCounts() + } + + private fun observeLogCounts() { + appConfig.dnsLogsCount.asFlow() + .onEach { count -> + _dnsLogsCount.update { count } + Logger.d(LOG_TAG_VPN, "$TAG DNS logs count: $count") + } + .launchIn(scope) + + appConfig.networkLogsCount.asFlow() + .onEach { count -> + _networkLogsCount.update { count } + Logger.d(LOG_TAG_VPN, "$TAG Network logs count: $count") + } + .launchIn(scope) + } + + fun getDnsLogsCount(): Long { + return _dnsLogsCount.value + } + + fun getNetworkLogsCount(): Long { + return _networkLogsCount.value + } + + fun getTotalLogsCount(): Long { + return _dnsLogsCount.value + _networkLogsCount.value + } +} diff --git a/app/src/main/java/com/celzero/bravedns/service/NetworkBindingService.kt b/app/src/main/java/com/celzero/bravedns/service/NetworkBindingService.kt new file mode 100644 index 000000000..2802e445e --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/NetworkBindingService.kt @@ -0,0 +1,273 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import android.net.Network +import android.net.VpnService +import android.os.ParcelFileDescriptor +import com.celzero.bravedns.util.InternetProtocol +import com.celzero.bravedns.util.KnownPorts +import inet.ipaddr.IPAddressString +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.withContext +import java.io.IOException +import java.net.Socket + +/** + * Handles network binding and socket protection for VPN traffic. + * Extracted from BraveVPNService for better separation of concerns. + */ +class NetworkBindingService( + private val vpnService: VpnService, + private val persistentState: PersistentState, + private val scope: CoroutineScope, + private val ioDispatcher: CoroutineDispatcher +) { + companion object { + private const val TAG = "NetworkBinding" + + // Route IPv4 in IPv6 only networks? + private const val ROUTE4IN6 = true + } + + /** + * Data class representing underlying network information + */ + data class UnderlyingNetworks( + val ipv4Net: List = emptyList(), + val ipv6Net: List = emptyList(), + val dnsServers: Map = emptyMap(), + val useActive: Boolean = true, + val vpnLockdown: Boolean = false, + val minMtu: Int = Int.MAX_VALUE, + var lastUpdated: Long = 0L, + var isActiveNetworkMetered: Boolean = false, + var isActiveNetworkCellular: Boolean = false + ) + + data class NetworkProperties( + val network: Network, + val capabilities: android.net.NetworkCapabilities + ) + + // Current underlying networks - should be updated by ConnectionMonitor + var underlyingNetworks: UnderlyingNetworks? = null + + /** + * Binds a socket to an IPv4 network. + * Called from Go code via Bridge interface. + */ + suspend fun bind4(who: String, addrPort: String, fid: Long): Boolean { + return withContext(ioDispatcher) { + var v4Net = underlyingNetworks?.ipv4Net + val isAuto = InternetProtocol.isAuto(persistentState.internetProtocolType) + + // Fall back to IPv6 net if IPv4 is empty and auto mode + if (ROUTE4IN6 && isAuto && v4Net.isNullOrEmpty()) { + v4Net = underlyingNetworks?.ipv6Net + } + + bindAny(who, addrPort, fid, v4Net ?: emptyList()) + } + } + + /** + * Binds a socket to an IPv6 network. + * Called from Go code via Bridge interface. + */ + suspend fun bind6(who: String, addrPort: String, fid: Long): Boolean { + return withContext(ioDispatcher) { + bindAny(who, addrPort, fid, underlyingNetworks?.ipv6Net ?: emptyList()) + } + } + + /** + * Protects a file descriptor from going through the VPN. + * Called from Go code via Bridge interface. + */ + suspend fun protectSocket(who: String?, fd: Long) { + withContext(ioDispatcher) { + if (who == null) { + Logger.w(LOG_TAG_VPN, "$TAG protect: who is null, fd: $fd") + return@withContext + } + + val rinr = persistentState.routeRethinkInRethink + logd("protect: $who, fd: $fd, rinr? $rinr") + + if (rinr && shouldSkipForRethinkInRethink(who)) { + return@withContext + } + + vpnService.protect(fd.toInt()) + } + } + + /** + * Protects a socket from going through the VPN. + */ + fun protectSocket(socket: Socket) { + vpnService.protect(socket) + Logger.v(LOG_TAG_VPN, "$TAG socket protected") + } + + /** + * Binds a file descriptor to a specific network for connectivity checks. + */ + fun bindToNetworkForConnectivityChecks(network: Network, fid: Long): Boolean { + var pfd: ParcelFileDescriptor? = null + try { + pfd = ParcelFileDescriptor.adoptFd(fid.toInt()) + return bindToNetwork(network, pfd, fid) + } catch (e: Exception) { + Logger.i(LOG_TAG_VPN, "$TAG err bindToNetworkForConnectivityChecks, ${e.message}") + } finally { + pfd?.detachFd() + } + return false + } + + /** + * Protects a file descriptor for connectivity checks. + */ + fun protectFdForConnectivityChecks(fd: Long) { + vpnService.protect(fd.toInt()) + Logger.v(LOG_TAG_VPN, "$TAG fd($fd) protected for connectivity checks") + } + + private suspend fun bindAny( + who: String, + addrPort: String, + fid: Long, + networks: List + ): Boolean { + val rinr = persistentState.routeRethinkInRethink + val currentNetworks = underlyingNetworks + + logd("bind: who: $who, addr: $addrPort, fd: $fid, rinr? $rinr") + + if (rinr && shouldSkipForRethinkInRethink(who)) { + return true + } + + // Protect the socket first + vpnService.protect(fid.toInt()) + + if (networks.isEmpty()) { + Logger.w(LOG_TAG_VPN, "$TAG no network to bind, who: $who, fd: $fid, addr: $addrPort") + return false + } + + var pfd: ParcelFileDescriptor? = null + try { + val dest = IpRulesManager.splitHostPort(addrPort) + val destIp = IPAddressString(dest.first).address + val destPort = dest.second.toIntOrNull() + val destAddr = destIp.toInetAddress() + + // Skip binding for zero addresses, loopback, or WireGuard + if (destIp.isZero && !who.startsWith(ProxyManager.ID_WG_BASE)) { + logd("bind: zero addr, who: $who, addr: $addrPort") + return true + } + if (destIp.isZero || destIp.isLoopback) { + logd("bind: invalid destIp: $destIp, who: $who, addr: $addrPort") + return true + } + + pfd = ParcelFileDescriptor.adoptFd(fid.toInt()) + + // Check if destination is DNS port, bind to appropriate network + if (KnownPorts.isDns(destPort)) { + currentNetworks?.dnsServers?.get(destAddr)?.let { net -> + if (bindToNetwork(net, pfd, fid)) { + logd("bind: dns, who: $who, addr: $addrPort, fd: $fid, ok: true") + return true + } + } + } + + // Use active network if configured + if (currentNetworks?.useActive == true) { + logd("bind: use active network is true, who: $who, addr: $addrPort, fd: $fid") + return true + } + + // Try binding to available networks + for (networkProp in networks) { + if (bindToNetwork(networkProp.network, pfd, fid)) { + logd("bind: nw, who: $who, addr: $addrPort, fd: $fid, ok: true") + return true + } + } + } catch (e: Exception) { + Logger.e(LOG_TAG_VPN, "$TAG err bind: who: $who, addr: $addrPort, fd: $fid, ${e.message}", e) + } finally { + pfd?.detachFd() + } + + Logger.e(LOG_TAG_VPN, "$TAG bind failed: who: $who, addr: $addrPort, fd: $fid") + return false + } + + private fun bindToNetwork(network: Network, pfd: ParcelFileDescriptor, fid: Long): Boolean { + return try { + network.bindSocket(pfd.fileDescriptor) + true + } catch (e: IOException) { + val netId = netid(network.networkHandle) + Logger.e(LOG_TAG_VPN, "$TAG err bindToNetwork(netId: $netId, fid: $fid, ${e.message}") + false + } + } + + private fun shouldSkipForRethinkInRethink(who: String): Boolean { + val rethinkUid = try { + vpnService.packageManager.getApplicationInfo(vpnService.packageName, 0).uid + } catch (e: Exception) { + return false + } + + // Simplified check - assume rethink is not bypassed from proxy + val isRethinkBypassedFromProxy = false + + if (!isRethinkBypassedFromProxy) { + if (!ProxyManager.isAnyUserSetProxy(who) && who != com.celzero.firestack.backend.Backend.Exit) { + Logger.vv(LOG_TAG_VPN, "$TAG rinr, bypassed rethink, who: $who") + return true + } + } else if (who != com.celzero.firestack.backend.Backend.Exit) { + Logger.vv(LOG_TAG_VPN, "$TAG rinr, within rethink, who: $who") + return true + } + return false + } + + /** + * Extracts network ID from network handle. + */ + fun netid(nwHandle: Long): Long { + // ref: cs.android.com/android/platform/superproject/main/+/main:packages/modules/Connectivity/framework/src/android/net/Network.java + return nwHandle shr 32 + } + + private fun logd(msg: String) { + Logger.d(LOG_TAG_VPN, "$TAG $msg") + } +} diff --git a/app/src/main/java/com/celzero/bravedns/service/PauseStateManager.kt b/app/src/main/java/com/celzero/bravedns/service/PauseStateManager.kt new file mode 100644 index 000000000..3beae179f --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/PauseStateManager.kt @@ -0,0 +1,107 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import android.app.KeyguardManager +import android.content.Context +import android.content.SharedPreferences +import androidx.lifecycle.Observer +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.channels.awaitClose +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.callbackFlow +import kotlinx.coroutines.launch + +/** + * Manages app pause/resume state and timers. + * Extracted from BraveVPNService for better separation of concerns. + * Wraps the existing PauseTimer for StateFlow-based observation. + */ +class PauseStateManager( + private val context: Context, + private val persistentState: PersistentState, + private val scope: CoroutineScope +) : SharedPreferences.OnSharedPreferenceChangeListener { + + companion object { + private const val TAG = "PauseState" + } + + private val _isPaused = MutableStateFlow(false) + val isPaused: StateFlow = _isPaused.asStateFlow() + + private val _pauseCountdown = MutableStateFlow(0L) + val pauseCountdown: StateFlow = _pauseCountdown.asStateFlow() + + private var keyguardManager: KeyguardManager? = null + + init { + // Observe the existing PauseTimer's LiveData and convert to StateFlow + scope.launch(Dispatchers.Main) { + PauseTimer.getPauseCountDownObserver().toFlow().collect { remaining -> + _pauseCountdown.value = remaining + _isPaused.value = remaining > 0 + } + } + } + + fun startPause() { + PauseTimer.start(PauseTimer.DEFAULT_PAUSE_TIME_MS) + _isPaused.value = true + Logger.i(LOG_TAG_VPN, "$TAG App paused") + } + + fun stopPause() { + PauseTimer.stop() + _isPaused.value = false + Logger.i(LOG_TAG_VPN, "$TAG App resumed") + } + + fun increasePauseDuration(durationMs: Long) { + PauseTimer.addDuration(durationMs) + } + + fun decreasePauseDuration(durationMs: Long) { + PauseTimer.subtractDuration(durationMs) + } + + fun isDeviceLocked(): Boolean { + if (!persistentState.getBlockWhenDeviceLocked()) return false + + if (keyguardManager == null) { + keyguardManager = context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager + } + return keyguardManager?.isKeyguardLocked == true + } + + override fun onSharedPreferenceChanged(preferences: SharedPreferences?, key: String?) { + // Handle preference changes if needed + } +} + +// Extension to convert LiveData to Flow +private fun androidx.lifecycle.LiveData.toFlow() = callbackFlow { + val observer = Observer { value -> + trySend(value) + } + observeForever(observer) + awaitClose { removeObserver(observer) } +} diff --git a/app/src/main/java/com/celzero/bravedns/service/ProxyRoutingEngine.kt b/app/src/main/java/com/celzero/bravedns/service/ProxyRoutingEngine.kt new file mode 100644 index 000000000..53f03ab8d --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/ProxyRoutingEngine.kt @@ -0,0 +1,211 @@ +package com.celzero.bravedns.service + +import com.celzero.firestack.backend.Backend + +object ProxyRoutingEngine { + + enum class Reason { + RETHINK_DIRECT, + EXCLUDED_APP, + WIREGUARD, + NO_PROXY_ACTIVE, + ORBOT_DIRECT_APP, + ORBOT_PROXY, + SOCKS5_DIRECT_APP, + SOCKS5_PROXY, + HTTP_DIRECT_APP, + HTTP_PROXY, + DNS_PROXY_DIRECT_APP, + FALLBACK_BASE_OR_EXIT + } + + data class SpecialAppRequest( + val isDnsFirewallMode: Boolean, + val isOrbotProxyEnabled: Boolean, + val isCustomSocks5Enabled: Boolean, + val isCustomHttpProxyEnabled: Boolean, + val isDnsProxyActive: Boolean, + val packageName: String?, + val orbotProxyAppName: String?, + val socks5ProxyAppName: String?, + val httpProxyAppName: String?, + val dnsProxyAppName: String? + ) + + data class RoutingRequest( + val uid: Int, + val rethinkUid: Int, + val rinr: Boolean, + val autoProxyEnabled: Boolean, + val blockedByRule: String, + val appExcludedFromProxy: Boolean, + val baseOrExitProxyId: String, + val wireguardProxyIds: List, + val isProxyEnabled: Boolean, + val isDnsProxyActive: Boolean, + val isOrbotProxyEnabled: Boolean, + val isCustomSocks5Enabled: Boolean, + val isCustomHttpProxyEnabled: Boolean, + val packageName: String?, + val orbotProxyAppName: String?, + val orbotProxyAssignedToApp: Boolean, + val socks5ProxyAppName: String?, + val httpProxyAppName: String?, + val dnsProxyAppName: String? + ) + + data class RoutingDecision( + val proxyIds: String, + val reason: Reason, + val markBlocked: Boolean = false, + val blockedByRuleOverride: String? = null, + val orbotProxyEnabledButAppNotIncluded: Boolean = false + ) + + fun matchesSelectedProxyApp(proxyAppPackageName: String?, packageName: String?): Boolean { + return !proxyAppPackageName.isNullOrBlank() && + !packageName.isNullOrBlank() && + proxyAppPackageName == packageName + } + + fun resolveBaseOrExitProxyId( + doubleLoopback: Boolean, + blockedByRule: String, + rinr: Boolean, + uid: Int, + rethinkUid: Int, + autoProxyEnabled: Boolean + ): String { + val autoOrExit = if (autoProxyEnabled) Backend.Auto else Backend.Exit + var baseOrExit = + if (doubleLoopback || blockedByRule == FirewallRuleset.RULE9.id) { + Backend.Base + } else { + autoOrExit + } + + // When route-rethink-in-rethink is on, rethink itself should not use Base. + if (rinr && uid == rethinkUid) { + baseOrExit = autoOrExit + } + return baseOrExit + } + + fun isSpecialApp(request: SpecialAppRequest): Boolean { + if (!request.isDnsFirewallMode) return false + + val anySpecialProxyEnabled = + request.isOrbotProxyEnabled || + request.isCustomSocks5Enabled || + request.isCustomHttpProxyEnabled || + request.isDnsProxyActive + + if (!anySpecialProxyEnabled) return false + + if (request.isOrbotProxyEnabled && + matchesSelectedProxyApp(request.orbotProxyAppName, request.packageName) + ) { + return true + } + + if (request.isCustomSocks5Enabled && + matchesSelectedProxyApp(request.socks5ProxyAppName, request.packageName) + ) { + return true + } + + if (request.isCustomHttpProxyEnabled && + matchesSelectedProxyApp(request.httpProxyAppName, request.packageName) + ) { + return true + } + + return request.isDnsProxyActive && + matchesSelectedProxyApp(request.dnsProxyAppName, request.packageName) + } + + fun determineRoute(request: RoutingRequest): RoutingDecision { + val autoOrExit = if (request.autoProxyEnabled) Backend.Auto else Backend.Exit + + if (request.uid == request.rethinkUid && !request.rinr) { + return RoutingDecision(proxyIds = autoOrExit, reason = Reason.RETHINK_DIRECT) + } + + if (request.appExcludedFromProxy) { + val overrideRule = + if (request.blockedByRule == FirewallRuleset.RULE0.id) { + FirewallRuleset.RULE15.id + } else { + null + } + + return RoutingDecision( + proxyIds = request.baseOrExitProxyId, + reason = Reason.EXCLUDED_APP, + blockedByRuleOverride = overrideRule + ) + } + + if (request.wireguardProxyIds.isNotEmpty() && + request.wireguardProxyIds.first() != request.baseOrExitProxyId + ) { + val hasBlock = request.wireguardProxyIds.contains(Backend.Block) + val ids = request.wireguardProxyIds.joinToString(",") + + return RoutingDecision( + proxyIds = if (ids.isEmpty()) request.baseOrExitProxyId else ids, + reason = Reason.WIREGUARD, + markBlocked = hasBlock, + blockedByRuleOverride = if (hasBlock) FirewallRuleset.RULE17.id else null + ) + } + + if (!request.isProxyEnabled && !request.isDnsProxyActive) { + return RoutingDecision( + proxyIds = request.baseOrExitProxyId, + reason = Reason.NO_PROXY_ACTIVE + ) + } + + if (request.isOrbotProxyEnabled) { + if (matchesSelectedProxyApp(request.orbotProxyAppName, request.packageName)) { + return RoutingDecision(proxyIds = autoOrExit, reason = Reason.ORBOT_DIRECT_APP) + } + + if (request.orbotProxyAssignedToApp) { + return RoutingDecision( + proxyIds = ProxyManager.ID_ORBOT_BASE, + reason = Reason.ORBOT_PROXY + ) + } + } + + if (request.isCustomSocks5Enabled) { + if (matchesSelectedProxyApp(request.socks5ProxyAppName, request.packageName)) { + return RoutingDecision(proxyIds = autoOrExit, reason = Reason.SOCKS5_DIRECT_APP) + } + + return RoutingDecision(proxyIds = ProxyManager.ID_S5_BASE, reason = Reason.SOCKS5_PROXY) + } + + if (request.isCustomHttpProxyEnabled) { + if (matchesSelectedProxyApp(request.httpProxyAppName, request.packageName)) { + return RoutingDecision(proxyIds = autoOrExit, reason = Reason.HTTP_DIRECT_APP) + } + + return RoutingDecision(proxyIds = ProxyManager.ID_HTTP_BASE, reason = Reason.HTTP_PROXY) + } + + if (request.isDnsProxyActive && + matchesSelectedProxyApp(request.dnsProxyAppName, request.packageName) + ) { + return RoutingDecision(proxyIds = autoOrExit, reason = Reason.DNS_PROXY_DIRECT_APP) + } + + return RoutingDecision( + proxyIds = request.baseOrExitProxyId, + reason = Reason.FALLBACK_BASE_OR_EXIT, + orbotProxyEnabledButAppNotIncluded = request.isOrbotProxyEnabled + ) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/service/ProxyStateManager.kt b/app/src/main/java/com/celzero/bravedns/service/ProxyStateManager.kt new file mode 100644 index 000000000..137000fae --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/ProxyStateManager.kt @@ -0,0 +1,160 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.util.UIUtils +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +/** + * Manages proxy state and status updates. + * Extracted from BraveVPNService for better separation of concerns. + */ +class ProxyStateManager( + private val appConfig: AppConfig, + private val persistentState: PersistentState, + private val scope: CoroutineScope +) { + + companion object { + private const val TAG = "ProxyState" + + suspend fun calculateWireguardProxyStatus(now: Long = System.currentTimeMillis()): ProxyStatus { + val proxies = WireguardManager.getActiveConfigs() + if (proxies.isEmpty()) { + return ProxyStatus(isActive = true, statusText = "Active") + } + + var active = 0 + var failing = 0 + var idle = 0 + + proxies.forEach { config -> + val proxyId = "${ProxyManager.ID_WG_BASE}${config.getId()}" + val stats = VpnController.getProxyStats(proxyId) + val statusPair = VpnController.getProxyStatusById(proxyId) + + when (statusPair.first) { + UIUtils.ProxyStatus.TPU.id -> { + idle++ + } + UIUtils.ProxyStatus.TUP.id -> { + active++ + } + UIUtils.ProxyStatus.TOK.id -> { + val lastOk = stats?.lastOK ?: 0L + val since = stats?.since ?: now + + if (lastOk > 0L && (now - lastOk < WireguardManager.WG_HANDSHAKE_TIMEOUT)) { + active++ + } else if (lastOk > 0L) { + idle++ + } else if (now - since < WireguardManager.WG_UPTIME_THRESHOLD) { + active++ + } else { + failing++ + } + } + else -> { + val lastOk = stats?.lastOK ?: 0L + val since = stats?.since ?: now + + if (lastOk > 0L || now - since < WireguardManager.WG_UPTIME_THRESHOLD) { + idle++ + } else { + failing++ + } + } + } + } + + return ProxyStatus( + isActive = active > 0, + statusText = buildStatusText(active, failing, idle), + activeCount = active, + failingCount = failing, + idleCount = idle + ) + } + + private fun buildStatusText(active: Int, failing: Int, idle: Int): String { + val parts = mutableListOf() + if (active > 0) parts.add("$active Active") + if (failing > 0) parts.add("$failing Failing") + if (idle > 0) parts.add("$idle Idle") + return if (parts.isEmpty()) "Inactive" else parts.joinToString("\n") + } + } + + private val _proxyStatus = MutableStateFlow(ProxyStatus()) + val proxyStatus: StateFlow = _proxyStatus.asStateFlow() + + private val _activeProxiesCount = MutableStateFlow(0) + val activeProxiesCount: StateFlow = _activeProxiesCount.asStateFlow() + + private val _failingProxiesCount = MutableStateFlow(0) + val failingProxiesCount: StateFlow = _failingProxiesCount.asStateFlow() + + data class ProxyStatus( + val isActive: Boolean = false, + val statusText: String = "Inactive", + val activeCount: Int = 0, + val failingCount: Int = 0, + val idleCount: Int = 0 + ) + + suspend fun updateProxyStatus() { + withContext(Dispatchers.IO) { + if (!persistentState.getVpnEnabled()) { + _proxyStatus.value = ProxyStatus(statusText = "Inactive") + return@withContext + } + + val proxyType = AppConfig.ProxyType.of(appConfig.getProxyType()) + + if (!proxyType.isProxyTypeWireguard()) { + val isEnabled = appConfig.isProxyEnabled() + _proxyStatus.value = ProxyStatus( + isActive = isEnabled, + statusText = if (isEnabled) "Active" else "Inactive" + ) + return@withContext + } + + val wgStatus = calculateWireguardProxyStatus() + _proxyStatus.value = wgStatus + _activeProxiesCount.value = wgStatus.activeCount + _failingProxiesCount.value = wgStatus.failingCount + } + } + + fun isProxyEnabled(): Boolean { + return appConfig.isProxyEnabled() + } + + fun getProxyType(): AppConfig.ProxyType { + return AppConfig.ProxyType.of(appConfig.getProxyType()) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/service/RethinkBlocklistManager.kt b/app/src/main/java/com/celzero/bravedns/service/RethinkBlocklistManager.kt index 5fd7b8290..81bd98051 100644 --- a/app/src/main/java/com/celzero/bravedns/service/RethinkBlocklistManager.kt +++ b/app/src/main/java/com/celzero/bravedns/service/RethinkBlocklistManager.kt @@ -44,6 +44,7 @@ import com.google.gson.JsonObject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.io.IOException @@ -316,35 +317,35 @@ object RethinkBlocklistManager : KoinComponent { } suspend fun updateFiletagRemote(remote: RethinkRemoteFileTag) { - remoteFileTagRepository.update(remote) + withContext(Dispatchers.IO) { remoteFileTagRepository.update(remote) } } suspend fun updateFiletagLocal(local: RethinkLocalFileTag) { - localFileTagRepository.update(local) + withContext(Dispatchers.IO) { localFileTagRepository.update(local) } } suspend fun updateFiletagsRemote(values: Set, isSelected: Int) { - remoteFileTagRepository.updateTags(values, isSelected) + withContext(Dispatchers.IO) { remoteFileTagRepository.updateTags(values, isSelected) } } suspend fun updateFiletagsLocal(values: Set, isSelected: Int) { - localFileTagRepository.updateTags(values, isSelected) + withContext(Dispatchers.IO) { localFileTagRepository.updateTags(values, isSelected) } } suspend fun getSelectedFileTagsLocal(): List { - return localFileTagRepository.getSelectedTags() + return withContext(Dispatchers.IO) { localFileTagRepository.getSelectedTags() } } suspend fun getSelectedFileTagsRemote(): List { - return remoteFileTagRepository.getSelectedTags() + return withContext(Dispatchers.IO) { remoteFileTagRepository.getSelectedTags() } } suspend fun clearTagsSelectionRemote() { - remoteFileTagRepository.clearSelectedTags() + withContext(Dispatchers.IO) { remoteFileTagRepository.clearSelectedTags() } } suspend fun clearTagsSelectionLocal() { - localFileTagRepository.clearSelectedTags() + withContext(Dispatchers.IO) { localFileTagRepository.clearSelectedTags() } } fun cpSelectFileTag(localFileTags: RethinkLocalFileTag): Int { diff --git a/app/src/main/java/com/celzero/bravedns/service/UnderlyingNetworkManager.kt b/app/src/main/java/com/celzero/bravedns/service/UnderlyingNetworkManager.kt new file mode 100644 index 000000000..7f61c3c07 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/UnderlyingNetworkManager.kt @@ -0,0 +1,199 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import android.content.Context +import android.net.ConnectivityManager +import android.net.Network +import android.net.NetworkCapabilities +import android.net.NetworkRequest +import com.celzero.bravedns.util.Utilities.isAtleastO +import com.celzero.bravedns.util.Utilities.isAtleastP +import com.celzero.bravedns.util.Utilities.isAtleastS +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch + +/** + * Manages underlying network monitoring and callbacks. + * Extracted from BraveVPNService for better separation of concerns. + */ +class UnderlyingNetworkManager( + private val context: Context, + private val scope: CoroutineScope +) { + + companion object { + private const val TAG = "UnderlyingNetwork" + } + + private val _activeNetwork = MutableStateFlow(null) + val activeNetwork: StateFlow = _activeNetwork.asStateFlow() + + private val _hasIpv4 = MutableStateFlow(false) + val hasIpv4: StateFlow = _hasIpv4.asStateFlow() + + private val _hasIpv6 = MutableStateFlow(false) + val hasIpv6: StateFlow = _hasIpv6.asStateFlow() + + private val _isNetworkValid = MutableStateFlow(false) + val isNetworkValid: StateFlow = _isNetworkValid.asStateFlow() + + private val _networkCapabilities = MutableStateFlow(null) + val networkCapabilities: StateFlow = _networkCapabilities.asStateFlow() + + private var connectivityManager: ConnectivityManager? = null + private var networkCallback: ConnectivityManager.NetworkCallback? = null + + fun initialize() { + connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + + if (isAtleastS()) { + registerNetworkCallback() + } + } + + private fun registerNetworkCallback() { + val cm = connectivityManager ?: return + + val request = NetworkRequest.Builder() + .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED) + .build() + + networkCallback = object : ConnectivityManager.NetworkCallback() { + override fun onAvailable(network: Network) { + Logger.d(LOG_TAG_VPN, "$TAG Network available: $network") + _activeNetwork.value = network + _isNetworkValid.value = true + updateCapabilities(network) + } + + override fun onLost(network: Network) { + Logger.d(LOG_TAG_VPN, "$TAG Network lost: $network") + if (_activeNetwork.value == network) { + _activeNetwork.value = null + _isNetworkValid.value = false + _hasIpv4.value = false + _hasIpv6.value = false + } + } + + override fun onCapabilitiesChanged( + network: Network, + capabilities: NetworkCapabilities + ) { + Logger.d(LOG_TAG_VPN, "$TAG Capabilities changed for $network") + if (_activeNetwork.value == network) { + updateCapabilities(network) + _networkCapabilities.value = capabilities + } + } + + override fun onUnavailable() { + Logger.d(LOG_TAG_VPN, "$TAG Network unavailable") + _isNetworkValid.value = false + _activeNetwork.value = null + } + } + + cm.registerNetworkCallback(request, networkCallback!!) + } + + private fun updateCapabilities(network: Network) { + val cm = connectivityManager ?: return + + try { + val caps = if (isAtleastO()) { + cm.getNetworkCapabilities(network) + } else { + null + } + + caps?.let { capabilities -> + _networkCapabilities.value = capabilities + + // Check for IPv4/IPv6 based on link properties + val linkProperties = if (isAtleastP()) { + cm.getLinkProperties(network) + } else { + null + } + + linkProperties?.let { lp -> + val has4 = lp.linkAddresses.any { + it.address.hostAddress?.contains(":") == false + } + val has6 = lp.linkAddresses.any { + it.address.hostAddress?.contains(":") == true + } + _hasIpv4.value = has4 + _hasIpv6.value = has6 + } + } + } catch (e: Exception) { + Logger.e(LOG_TAG_VPN, "$TAG Error updating capabilities: ${e.message}") + } + } + + fun getCurrentNetwork(): Network? { + return connectivityManager?.activeNetwork + } + + fun isNetworkConnected(): Boolean { + val cm = connectivityManager ?: return false + val network = cm.activeNetwork ?: return false + val caps = cm.getNetworkCapabilities(network) ?: return false + return caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) + } + + fun isMetered(): Boolean { + val cm = connectivityManager ?: return false + val network = cm.activeNetwork ?: return false + val caps = cm.getNetworkCapabilities(network) ?: return false + return !caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED) + } + + fun isWifi(): Boolean { + val cm = connectivityManager ?: return false + val network = cm.activeNetwork ?: return false + val caps = cm.getNetworkCapabilities(network) ?: return false + return caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) + } + + fun isCellular(): Boolean { + val cm = connectivityManager ?: return false + val network = cm.activeNetwork ?: return false + val caps = cm.getNetworkCapabilities(network) ?: return false + return caps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) + } + + fun cleanup() { + networkCallback?.let { + try { + connectivityManager?.unregisterNetworkCallback(it) + } catch (e: Exception) { + Logger.w(LOG_TAG_VPN, "$TAG Error unregistering network callback: ${e.message}") + } + } + networkCallback = null + } +} diff --git a/app/src/main/java/com/celzero/bravedns/service/VpnConnectionHandler.kt b/app/src/main/java/com/celzero/bravedns/service/VpnConnectionHandler.kt new file mode 100644 index 000000000..0551e26a3 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/VpnConnectionHandler.kt @@ -0,0 +1,214 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import android.content.pm.PackageManager +import android.net.VpnService +import com.celzero.bravedns.R +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.util.InternetProtocol +import com.celzero.bravedns.util.Utilities + +/** + * Handles VPN connection builder configuration. + * Extracted from BraveVPNService for better separation of concerns. + */ +class VpnConnectionHandler( + private val vpnService: VpnService, + private val persistentState: PersistentState, + private val appConfig: AppConfig +) { + companion object { + private const val TAG = "VpnConnHandler" + + // IPv4 VPN constants + const val IPV4_TEMPLATE = "10.111.222.%d" + const val IPV4_PREFIX_LENGTH = 24 + + // IPv6 VPN constants + const val IPV6_TEMPLATE = "fd66:f83a:c650::%d" + const val IPV6_PREFIX_LENGTH = 120 + + const val VPN_INTERFACE_MTU = 1500 + const val MIN_MTU = 1280 + const val MAX_MTU = 10000 + + private const val IPV4_DNS_ADDR = 44 + private const val IPV6_DNS_ADDR = 44 + } + + enum class LanIp(val id: Int) { + DNS(44); + + fun make(template: String): String { + return String.format(template, id) + } + } + + /** + * Creates a new VPN.Builder with appropriate configuration. + */ + fun createBuilder( + underlyingNetworks: NetworkBindingService.UnderlyingNetworks?, + isVpnLockdown: Boolean, + excludedApps: Set, + rethinkUid: Int + ): VpnService.Builder { + var builder = vpnService.Builder() + + val networks = getUnderlyingNetworkArray(underlyingNetworks) + builder.setUnderlyingNetworks(networks) + + if (!isVpnLockdown && !Utilities.isPlayStoreFlavour() && canAllowBypass()) { + Logger.i(LOG_TAG_VPN, "$TAG allow apps to bypass vpn on-demand") + builder = builder.allowBypass() + } + + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { + builder.setMetered(persistentState.setVpnBuilderToMetered) + } + + if (!persistentState.routeRethinkInRethink) { + Logger.i(LOG_TAG_VPN, "$TAG builder: exclude rethink app from builder") + addDisallowedApplication(builder, vpnService.packageName) + } + + if (isAppPaused()) { + if (!isVpnLockdown) { + // Simplified: in paused mode, just skip excluded apps handling + Logger.i(LOG_TAG_VPN, "$TAG paused mode, skipping app exclusions") + } + return builder + } + + if (appConfig.determineFirewallMode().isFirewallSinkMode()) { + addAllowedApplication(builder, excludedApps) + } else if (!isVpnLockdown) { + Logger.i(LOG_TAG_VPN, "$TAG builder, vpn is not lockdown, exclude-apps ${excludedApps.size}") + addDisallowedApplications(builder, excludedApps) + } + + return builder + } + + /** + * Configures the VPN interface with addresses and routes. + */ + fun configureInterface( + builder: VpnService.Builder, + mtu: Int, + customLanMode: Boolean + ): VpnService.Builder { + builder.setMtu(mtu) + + val ipType = persistentState.internetProtocolType + + when (ipType) { + InternetProtocol.IPv4.id -> { + configureIPv4(builder, customLanMode) + } + InternetProtocol.IPv6.id -> { + configureIPv6(builder, customLanMode) + } + InternetProtocol.IPv46.id, InternetProtocol.ALWAYSv46.id -> { + configureIPv4(builder, customLanMode) + configureIPv6(builder, customLanMode) + } + } + + return builder + } + + private fun configureIPv4(builder: VpnService.Builder, customLanMode: Boolean) { + val fakeDns = LanIp.DNS.make(IPV4_TEMPLATE) + + if (customLanMode) { + val customDns = persistentState.customLanDnsIpv4.split("/").firstOrNull() ?: "" + if (customDns.isNotEmpty()) { + builder.addAddress(customDns, IPV4_PREFIX_LENGTH) + } + } else { + builder.addAddress(fakeDns, IPV4_PREFIX_LENGTH) + } + + if (!customLanMode) { + builder.addDnsServer(fakeDns) + } + + builder.addRoute("0.0.0.0", 0) + } + + private fun configureIPv6(builder: VpnService.Builder, customLanMode: Boolean) { + val fakeDns = LanIp.DNS.make(IPV6_TEMPLATE) + + if (customLanMode) { + val customDns = persistentState.customLanDnsIpv6.split("/").firstOrNull() ?: "" + if (customDns.isNotEmpty()) { + builder.addAddress(customDns, IPV6_PREFIX_LENGTH) + } + } else { + builder.addAddress(fakeDns, IPV6_PREFIX_LENGTH) + } + + if (!customLanMode) { + builder.addDnsServer(fakeDns) + } + + builder.addRoute("::", 0) + } + + private fun canAllowBypass(): Boolean { + return persistentState.allowBypass && !appConfig.isProxyEnabled() + } + + private fun addDisallowedApplication(builder: VpnService.Builder, packageName: String) { + try { + builder.addDisallowedApplication(packageName) + } catch (e: PackageManager.NameNotFoundException) { + Logger.w(LOG_TAG_VPN, "$TAG failed to exclude $packageName: ${e.message}") + } + } + + private fun addDisallowedApplications(builder: VpnService.Builder, packageNames: Collection) { + packageNames.forEach { addDisallowedApplication(builder, it) } + } + + private fun addAllowedApplication(builder: VpnService.Builder, packageNames: Collection) { + packageNames.forEach { pkg -> + try { + builder.addAllowedApplication(pkg) + } catch (e: PackageManager.NameNotFoundException) { + Logger.w(LOG_TAG_VPN, "$TAG failed to allow $pkg: ${e.message}") + } + } + } + + private fun getUnderlyingNetworkArray( + networks: NetworkBindingService.UnderlyingNetworks? + ): Array? { + if (networks == null) return null + + val allNetworks = mutableListOf() + allNetworks.addAll(networks.ipv4Net.map { it.network }) + allNetworks.addAll(networks.ipv6Net.map { it.network }) + + return if (allNetworks.isEmpty()) null else allNetworks.toTypedArray() + } + + private fun isAppPaused(): Boolean = VpnController.isAppPaused() +} diff --git a/app/src/main/java/com/celzero/bravedns/service/VpnNotificationManager.kt b/app/src/main/java/com/celzero/bravedns/service/VpnNotificationManager.kt new file mode 100644 index 000000000..c242df834 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/service/VpnNotificationManager.kt @@ -0,0 +1,165 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.service + +import Logger +import Logger.LOG_TAG_VPN +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import androidx.core.app.NotificationCompat +import androidx.core.app.ServiceCompat +import androidx.core.content.ContextCompat +import com.celzero.bravedns.R +import com.celzero.bravedns.receiver.NotificationActionReceiver +import com.celzero.bravedns.ui.HomeScreenActivity +import com.celzero.bravedns.util.NotificationActionType +import com.celzero.bravedns.util.Utilities.isAtleastO +import com.celzero.bravedns.util.Utilities.isAtleastU +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow + +/** + * Manages all VPN notification operations. + * Extracted from BraveVPNService for better separation of concerns. + */ +class VpnNotificationManager( + private val context: Context, + private val persistentState: PersistentState +) { + companion object { + const val SERVICE_ID = 1 + const val MEMORY_NOTIFICATION_ID = 29001 + const val NW_ENGINE_NOTIFICATION_ID = 29002 + const val NOTIF_ID_ACCESSIBILITY_FAILURE = 104 + + private const val MAIN_CHANNEL_ID = "vpn" + private const val WARNING_CHANNEL_ID = "warning" + + private const val TAG = "VpnNotifMgr" + } + + private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + + private val _connectionState = MutableStateFlow(BraveVPNService.State.NEW) + val connectionState: StateFlow = _connectionState.asStateFlow() + + init { + createNotificationChannels() + } + + private fun createNotificationChannels() { + if (!isAtleastO()) return + + val mainChannel = NotificationChannel( + MAIN_CHANNEL_ID, + context.getString(R.string.notif_channel_vpn_notification), + NotificationManager.IMPORTANCE_LOW + ).apply { + description = context.getString(R.string.notif_channel_desc_vpn_notification) + setShowBadge(false) + } + notificationManager.createNotificationChannel(mainChannel) + + val warningChannel = NotificationChannel( + WARNING_CHANNEL_ID, + context.getString(R.string.notif_channel_vpn_failure), + NotificationManager.IMPORTANCE_LOW + ).apply { + description = context.getString(R.string.notif_channel_desc_vpn_failure) + setShowBadge(false) + } + notificationManager.createNotificationChannel(warningChannel) + } + + fun updateConnectionState(state: BraveVPNService.State) { + _connectionState.value = state + } + + fun buildNotification(): Notification { + return NotificationCompat.Builder(context, MAIN_CHANNEL_ID).apply { + setSmallIcon(R.drawable.ic_notification_icon) + setContentTitle(context.getString(R.string.app_name)) + setContentText(getNotificationContentText()) + setOngoing(true) + setOnlyAlertOnce(true) + setShowWhen(false) + priority = NotificationCompat.PRIORITY_LOW + color = ContextCompat.getColor(context, getAccentColor()) + setVisibility(NotificationCompat.VISIBILITY_PUBLIC) + + setContentIntent(createContentIntent()) + + setStyle(NotificationCompat.BigTextStyle().bigText(getNotificationContentText())) + }.build() + } + + private fun getNotificationContentText(): String { + return when (_connectionState.value) { + BraveVPNService.State.WORKING -> context.getString(R.string.hybrid_mode_notification_title) + BraveVPNService.State.PAUSED -> context.getString(R.string.pause_mode_notification_title) + BraveVPNService.State.NEW -> context.getString(R.string.lbl_starting) + else -> context.getString(R.string.hybrid_mode_notification_title) + } + } + + private fun createContentIntent(): PendingIntent { + val intent = Intent(context, HomeScreenActivity::class.java).apply { + flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP + } + return PendingIntent.getActivity( + context, + 0, + intent, + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + ) + } + + fun showNotification() { + notificationManager.notify(SERVICE_ID, buildNotification()) + } + + fun dismissNotification(id: Int = SERVICE_ID) { + notificationManager.cancel(id) + } + + fun startForegroundSafely(service: android.app.Service): Boolean { + return try { + if (isAtleastU()) { + ServiceCompat.startForeground( + service, + SERVICE_ID, + buildNotification(), + android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE + ) + } else { + service.startForeground(SERVICE_ID, buildNotification()) + } + true + } catch (e: Exception) { + Logger.e(LOG_TAG_VPN, "$TAG startForeground failed", e) + false + } + } + + private fun getAccentColor(): Int { + return com.celzero.bravedns.util.UIUtils.getAccentColor(persistentState.theme) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/TestDialogActivity.kt b/app/src/main/java/com/celzero/bravedns/ui/TestDialogActivity.kt index b03fce9f4..00c859973 100644 --- a/app/src/main/java/com/celzero/bravedns/ui/TestDialogActivity.kt +++ b/app/src/main/java/com/celzero/bravedns/ui/TestDialogActivity.kt @@ -16,16 +16,15 @@ package com.celzero.bravedns.ui import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity +import androidx.activity.ComponentActivity /** * Minimal test activity for dialog instrumentation tests. * This activity has no dependencies and provides a stable context for showing dialogs. */ -class TestDialogActivity : AppCompatActivity() { +class TestDialogActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) // No setContentView needed - we just need a valid activity context for dialogs } } - diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/about/AboutScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/about/AboutScreen.kt new file mode 100644 index 000000000..a244e84c7 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/about/AboutScreen.kt @@ -0,0 +1,855 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@file:OptIn(ExperimentalMaterial3Api::class) + +package com.celzero.bravedns.ui.compose.about + +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.tween +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.rounded.Article +import androidx.compose.material.icons.automirrored.rounded.HelpOutline +import androidx.compose.material.icons.rounded.Backup +import androidx.compose.material.icons.rounded.Favorite +import androidx.compose.material.icons.rounded.Gavel +import androidx.compose.material.icons.rounded.HelpOutline +import androidx.compose.material.icons.rounded.Info +import androidx.compose.material.icons.rounded.NewReleases +import androidx.compose.material.icons.rounded.Notifications +import androidx.compose.material.icons.rounded.Policy +import androidx.compose.material.icons.rounded.Public +import androidx.compose.material.icons.rounded.Settings +import androidx.compose.material.icons.rounded.VpnKey +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.luminance +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.graphics.vector.rememberVectorPainter +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.ui.compose.settings.AppearanceSettingsCard +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkAnimatedSection +import com.celzero.bravedns.ui.compose.theme.RethinkGridTile +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.ui.compose.theme.cardPositionFor + +private data class AboutItem( + val headline: String, + val iconPainter: Painter, + val onClick: () -> Unit, +) + +private fun aboutTopClusterPosition(index: Int, lastIndex: Int): CardPosition { + return when { + lastIndex <= 0 -> CardPosition.Last + index == lastIndex -> CardPosition.Last + else -> CardPosition.Middle + } +} + +@Composable +fun AboutScreen( + uiState: AboutUiState, + onSponsorClick: () -> Unit, + onTelegramClick: () -> Unit, + onBugReportClick: () -> Unit, + onWhatsNewClick: () -> Unit, + onAppUpdateClick: () -> Unit, + onContributorsClick: () -> Unit, + onTranslateClick: () -> Unit, + onWebsiteClick: () -> Unit, + onGithubClick: () -> Unit, + onFaqClick: () -> Unit, + onDocsClick: () -> Unit, + onPrivacyPolicyClick: () -> Unit, + onTermsOfServiceClick: () -> Unit, + onLicenseClick: () -> Unit, + onTwitterClick: () -> Unit, + onEmailClick: () -> Unit, + onRedditClick: () -> Unit, + onElementClick: () -> Unit, + onMastodonClick: () -> Unit, + onGeneralSettingsClick: () -> Unit, + onAppInfoClick: () -> Unit, + onVpnProfileClick: () -> Unit, + onNotificationClick: () -> Unit, + onStatsClick: () -> Unit, + onDbStatsClick: () -> Unit, + onFlightRecordClick: () -> Unit, + onEventLogsClick: () -> Unit, + onTokenClick: () -> Unit, + onTokenDoubleTap: () -> Unit, + onFossClick: () -> Unit, + onFlossFundsClick: () -> Unit, + persistentState: PersistentState, + onThemeModeChanged: ((Int) -> Unit)? = null, + onThemeColorChanged: ((Int) -> Unit)? = null +) { + val aboutTitle = stringResource(id = R.string.title_about) + val appName = stringResource(id = R.string.app_name) + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + val expandedTitle = remember(appName) { appName } + val expandedSubtitle = remember(uiState.versionName, uiState.slicedVersion) { + fun withSingleVPrefix(version: String): String { + return if (version.startsWith("v", ignoreCase = true)) version else "v$version" + } + + when { + uiState.versionName.isNotBlank() -> withSingleVPrefix(uiState.versionName) + uiState.slicedVersion.isNotBlank() -> withSingleVPrefix(uiState.slicedVersion) + else -> null + } + } + val topBarTitle by remember(scrollBehavior.state, expandedTitle, aboutTitle) { + derivedStateOf { + if (scrollBehavior.state.collapsedFraction >= 0.55f) { + aboutTitle + } else { + expandedTitle + } + } + } + val topBarSubtitle by remember(scrollBehavior.state, expandedSubtitle) { + derivedStateOf { + if (scrollBehavior.state.collapsedFraction >= 0.55f) { + null + } else { + expandedSubtitle + } + } + } + val quickActionIconTint = MaterialTheme.colorScheme.onPrimaryFixed.copy(alpha = 0.8f) + val telegramTint = Color(0xFF74C5FF) + val bugReportTint = Color(0xFFFF907F) + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + containerColor = MaterialTheme.colorScheme.surface, + topBar = { + RethinkLargeTopBar( + title = topBarTitle, + subtitle = topBarSubtitle, + scrollBehavior = scrollBehavior, + titleTextStyle = MaterialTheme.typography.headlineMedium + ) + } + ) { paddingValues -> + LazyColumn( + state = rememberLazyListState(), + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = Dimensions.spacing3xl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + // ── Sponsor card (hidden intentionally) ─────────────────── + // item { + // RethinkAnimatedSection(index = 0) { + // SponsorCard(uiState, onSponsorClick) + // } + // } + + // ── Appearance (shared settings component) ─────────────── + item { + RethinkAnimatedSection(index = 1) { + AppearanceSettingsCard( + themePreference = persistentState.theme, + colorPresetId = persistentState.themeColorPreset, + onAppearanceModeSelected = { mode -> + val themeId = mode.toThemePreference() + persistentState.theme = themeId + onThemeModeChanged?.invoke(themeId) + }, + onColorPresetSelected = { preset -> + persistentState.themeColorPreset = preset.id + onThemeColorChanged?.invoke(preset.id) + }, + sectionHeaderColor = MaterialTheme.colorScheme.primary, + showSectionHeader = true + ) + } + } + + // ── Quick actions (Telegram + Bug Report) ───────────────── + item { + RethinkAnimatedSection(index = 2) { + AboutAppSection( + uiState = uiState, + onTelegramClick = onTelegramClick, + onBugReportClick = onBugReportClick, + onWhatsNewClick = onWhatsNewClick, + onAppUpdateClick = onAppUpdateClick, + quickActionIconTint = quickActionIconTint, + telegramTint = telegramTint, + bugReportTint = bugReportTint + ) + } + } + + // ── Web section ─────────────────────────────────────────── + item { + RethinkAnimatedSection(index = 3) { + AboutSection( + title = stringResource(id = R.string.about_web), + accentColor = MaterialTheme.colorScheme.secondary, + items = listOf( + AboutItem( + headline = stringResource(id = R.string.about_website), + iconPainter = rememberVectorPainter(image = Icons.Rounded.Public), + onClick = onWebsiteClick + ), + AboutItem(stringResource(id = R.string.about_github), painterResource(id = R.drawable.ic_github), onGithubClick), + AboutItem( + headline = stringResource(id = R.string.about_faq), + iconPainter = rememberVectorPainter(image = Icons.AutoMirrored.Rounded.HelpOutline), + onClick = onFaqClick + ), + AboutItem( + headline = stringResource(id = R.string.about_docs), + iconPainter = rememberVectorPainter(image = Icons.AutoMirrored.Rounded.Article), + onClick = onDocsClick + ), + AboutItem( + stringResource(id = R.string.about_privacy_policy), + rememberVectorPainter(image = Icons.Rounded.Policy), + onPrivacyPolicyClick + ), + AboutItem( + stringResource(id = R.string.about_terms_of_service), + rememberVectorPainter(image = Icons.Rounded.Gavel), + onTermsOfServiceClick + ), + AboutItem( + stringResource(id = R.string.about_license), + rememberVectorPainter(image = Icons.AutoMirrored.Rounded.Article), + onLicenseClick + ), + ), + ) + } + } + + // ── Connect / community section ─────────────────────────── + item { + RethinkAnimatedSection(index = 4) { + AboutConnectSection( + onTwitterClick = onTwitterClick, + onEmailClick = onEmailClick, + onRedditClick = onRedditClick, + onElementClick = onElementClick, + onMastodonClick = onMastodonClick + ) + } + } + + // ── System settings section ─────────────────────────────── + item { + RethinkAnimatedSection(index = 5) { + AboutSection( + title = stringResource(id = R.string.about_settings), + accentColor = MaterialTheme.colorScheme.primary, + items = listOf( + AboutItem( + stringResource(id = R.string.settings_general_header), + rememberVectorPainter(image = Icons.Rounded.Settings), + onGeneralSettingsClick + ), + AboutItem( + stringResource(id = R.string.about_settings_app_info), + rememberVectorPainter(image = Icons.Rounded.Info), + onAppInfoClick + ), + AboutItem( + stringResource(id = R.string.about_settings_vpn_profile), + rememberVectorPainter(image = Icons.Rounded.VpnKey), + onVpnProfileClick + ), + AboutItem( + stringResource(id = R.string.about_settings_notification), + rememberVectorPainter(image = Icons.Rounded.Notifications), + onNotificationClick + ), + ), + ) + } + } + + // ── Debug / diagnostics section ─────────────────────────── + item { + val items = buildList { + add(AboutItem(stringResource(id = R.string.title_statistics), painterResource(id = R.drawable.ic_log_level), onStatsClick)) + add( + AboutItem( + stringResource(id = R.string.title_database_dump), + rememberVectorPainter(image = Icons.Rounded.Backup), + onDbStatsClick + ) + ) + if (uiState.isDebug) { + add( + AboutItem( + "Flight Recorder", + rememberVectorPainter(image = Icons.Rounded.Backup), + onFlightRecordClick + ) + ) + } + add( + AboutItem( + stringResource(id = R.string.event_logs_title), + rememberVectorPainter(image = Icons.AutoMirrored.Rounded.Article), + onEventLogsClick + ) + ) + } + RethinkAnimatedSection(index = 6) { + AboutSection( + title = stringResource(id = R.string.title_statistics), + accentColor = MaterialTheme.colorScheme.secondary, + items = items, + ) + } + } + + // ── Partner logos ───────────────────────────────────────── + item { + RethinkAnimatedSection(index = 7) { + PartnerLogosCard(onFossClick, onFlossFundsClick) + } + } + + // ── Version footer ──────────────────────────────────────── + item { + RethinkAnimatedSection(index = 8) { + Column( + modifier = Modifier.fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally + ) { + if (uiState.isFirebaseEnabled && !uiState.isFdroid) { + Text( + text = uiState.firebaseToken, + style = MaterialTheme.typography.labelSmall, + textAlign = TextAlign.Center, + modifier = Modifier + .fillMaxWidth() + .alpha(0.5f) + .padding(bottom = Dimensions.spacingMd) + .clickable { onTokenClick() } + ) + } + Text( + text = "${uiState.versionName} · ${uiState.installSource}", + style = MaterialTheme.typography.bodySmall, + fontWeight = FontWeight.Medium, + textAlign = TextAlign.Center, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier + .fillMaxWidth() + .alpha(0.75f) + ) + if (uiState.buildNumber.isNotBlank()) { + Spacer(modifier = Modifier.height(2.dp)) + Text( + text = uiState.buildNumber, + style = MaterialTheme.typography.labelSmall, + textAlign = TextAlign.Center, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier + .fillMaxWidth() + .alpha(0.55f) + ) + } + } + } + } + } + } +} + +// ─── Sponsor Card ─────────────────────────────────────────────────────────── + +@Suppress("unused") +@Composable +private fun SponsorCard(uiState: AboutUiState, onSponsorClick: () -> Unit) { + val interactionSource = remember { MutableInteractionSource() } + val isPressed by interactionSource.collectIsPressedAsState() + val scale by animateFloatAsState( + targetValue = if (isPressed) 0.98f else 1f, + animationSpec = tween(100), + label = "sponsor_scale" + ) + + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadius3xl), + color = MaterialTheme.colorScheme.surfaceContainer, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.35f)), + tonalElevation = 0.dp, + shadowElevation = 0.dp, + onClick = onSponsorClick, + interactionSource = interactionSource, + modifier = Modifier + .fillMaxWidth() + .scale(scale) + ) { + Column( + modifier = Modifier.padding(20.dp), + verticalArrangement = Arrangement.spacedBy(14.dp) + ) { + Row( + horizontalArrangement = Arrangement.spacedBy(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + color = MaterialTheme.colorScheme.primaryContainer, + modifier = Modifier.size(52.dp) + ) { + Box(contentAlignment = Alignment.Center) { + Icon( + painter = painterResource(id = R.drawable.ic_launcher_foreground), + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimaryContainer, + modifier = Modifier.size(32.dp) + ) + } + } + Text( + text = stringResource(id = R.string.about_bravedns_explantion), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.weight(1f) + ) + } + + Row( + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalAlignment = Alignment.Top + ) { + Text( + text = stringResource( + id = R.string.sponser_dialog_usage_msg, + uiState.daysSinceInstall, + uiState.sponsoredAmount + ), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.weight(1f) + ) + } + + Button( + onClick = onSponsorClick, + modifier = Modifier + .fillMaxWidth() + .height(48.dp), + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primary, + contentColor = MaterialTheme.colorScheme.onPrimary + ), + elevation = ButtonDefaults.buttonElevation(defaultElevation = 0.dp) + ) { + Icon( + imageVector = Icons.Rounded.Favorite, + contentDescription = null, + modifier = Modifier.size(20.dp) + ) + Spacer(modifier = Modifier.width(10.dp)) + Text( + text = stringResource(id = R.string.about_sponsor_link_text), + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.Bold + ) + } + } + } +} + +// ─── Section composable with colored icon containers ──────────────────────── + +@Composable +private fun AboutSection( + title: String, + accentColor: Color, + items: List, +) { + Column { + SectionHeader(title = title, color = accentColor) + items.forEachIndexed { index, item -> + RethinkListItem( + headline = item.headline, + leadingIconPainter = item.iconPainter, + leadingIconTint = accentColor, + leadingIconContainerColor = accentColor.copy(alpha = 0.14f), + position = cardPositionFor(index = index, lastIndex = items.lastIndex), + highlightContainerColor = accentColor.copy(alpha = 0.24f), + onClick = item.onClick + ) + } + } +} + +@Composable +private fun AboutAppSection( + uiState: AboutUiState, + onTelegramClick: () -> Unit, + onBugReportClick: () -> Unit, + onWhatsNewClick: () -> Unit, + onAppUpdateClick: () -> Unit, + quickActionIconTint: Color, + telegramTint: Color, + bugReportTint: Color +) { + val accentColor = MaterialTheme.colorScheme.primary + val listItems = buildList { + add( + AboutItem( + headline = stringResource(id = R.string.about_whats_new, uiState.slicedVersion), + iconPainter = rememberVectorPainter(image = Icons.Rounded.NewReleases), + onClick = onWhatsNewClick + ) + ) + if (!uiState.isFdroid) { + add( + AboutItem( + headline = stringResource(id = R.string.about_app_update_check), + iconPainter = painterResource(id = R.drawable.ic_update), + onClick = onAppUpdateClick + ) + ) + } + } + + Column { + SectionHeader(title = stringResource(id = R.string.about_app), color = accentColor) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingGridTile) + ) { + RethinkGridTile( + title = stringResource(id = R.string.about_join_telegram), + iconRes = R.drawable.ic_telegram, + accentColor = telegramTint, + iconTint = quickActionIconTint, + iconContainerColor = telegramTint, + shape = RoundedCornerShape( + topStart = 22.dp, + topEnd = 12.dp, + bottomStart = 6.dp, + bottomEnd = 6.dp + ), + modifier = Modifier.weight(1f), + onClick = onTelegramClick + ) + if (uiState.isBugReportRunning) { + RethinkGridTile( + title = stringResource(id = R.string.collecting_logs_progress_text), + iconRes = R.drawable.ic_android_icon, + accentColor = bugReportTint, + iconTint = quickActionIconTint, + iconContainerColor = bugReportTint, + shape = RoundedCornerShape( + topStart = 12.dp, + topEnd = 22.dp, + bottomStart = 6.dp, + bottomEnd = 6.dp + ), + modifier = Modifier.weight(1f), + trailing = { + CircularProgressIndicator( + modifier = Modifier.size(18.dp), + strokeWidth = 2.dp, + color = bugReportTint + ) + } + ) + } else { + RethinkGridTile( + title = stringResource(id = R.string.about_bug_report), + iconRes = R.drawable.ic_android_icon, + accentColor = bugReportTint, + iconTint = quickActionIconTint, + iconContainerColor = bugReportTint, + shape = RoundedCornerShape( + topStart = 12.dp, + topEnd = 22.dp, + bottomStart = 6.dp, + bottomEnd = 6.dp + ), + modifier = Modifier.weight(1f), + onClick = onBugReportClick + ) + } + } + + listItems.forEachIndexed { index, item -> + RethinkListItem( + headline = item.headline, + leadingIconPainter = item.iconPainter, + leadingIconTint = accentColor, + leadingIconContainerColor = accentColor.copy(alpha = 0.14f), + position = aboutTopClusterPosition(index = index, lastIndex = listItems.lastIndex), + highlightContainerColor = accentColor.copy(alpha = 0.24f), + onClick = item.onClick + ) + } + } +} + +@Composable +private fun AboutConnectSection( + onTwitterClick: () -> Unit, + onEmailClick: () -> Unit, + onRedditClick: () -> Unit, + onElementClick: () -> Unit, + onMastodonClick: () -> Unit +) { + val accentColor = MaterialTheme.colorScheme.tertiary + Column { + SectionHeader(title = stringResource(id = R.string.about_connect), color = accentColor) + + RethinkListItem( + headline = stringResource(id = R.string.about_twitter), + leadingIconPainter = painterResource(id = R.drawable.ic_twitter), + leadingIconTint = accentColor, + leadingIconContainerColor = accentColor.copy(alpha = 0.14f), + position = CardPosition.First, + highlightContainerColor = accentColor.copy(alpha = 0.24f), + onClick = onTwitterClick + ) + + Spacer(modifier = Modifier.height(Dimensions.spacingXs)) + + Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(2.dp) + ) { + RethinkGridTile( + title = stringResource(id = R.string.about_email), + iconRes = R.drawable.ic_mail, + accentColor = accentColor, + shape = RoundedCornerShape( + topStart = 12.dp, + topEnd = 12.dp, + bottomStart = 12.dp, + bottomEnd = 12.dp + ), + modifier = Modifier.weight(1f), + onClick = onEmailClick + ) + RethinkGridTile( + title = stringResource(id = R.string.lbl_reddit), + iconRes = R.drawable.ic_reddit, + accentColor = accentColor, + shape = RoundedCornerShape( + topStart = 12.dp, + topEnd = 12.dp, + bottomStart = 12.dp, + bottomEnd = 12.dp + ), + modifier = Modifier.weight(1f), + onClick = onRedditClick + ) + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(2.dp) + ) { + RethinkGridTile( + title = stringResource(id = R.string.lbl_matrix), + iconRes = R.drawable.ic_element, + accentColor = accentColor, + shape = RoundedCornerShape( + topStart = 12.dp, + topEnd = 12.dp, + bottomStart = 28.dp, + bottomEnd = 12.dp + ), + modifier = Modifier.weight(1f), + onClick = onElementClick + ) + RethinkGridTile( + title = stringResource(id = R.string.lbl_mastodon), + iconRes = R.drawable.ic_mastodon, + accentColor = accentColor, + shape = RoundedCornerShape( + topStart = 12.dp, + topEnd = 12.dp, + bottomStart = 12.dp, + bottomEnd = 28.dp + ), + modifier = Modifier.weight(1f), + onClick = onMastodonClick + ) + } + } + } +} + +// ─── Partner Logos Card ────────────────────────────────────────────────────── + +@Composable +private fun PartnerLogosCard(onFossClick: () -> Unit, onFlossFundsClick: () -> Unit) { + val isLightTheme = MaterialTheme.colorScheme.surface.luminance() > 0.5f + val cardColor = + if (isLightTheme) Color(0xFF141922) else MaterialTheme.colorScheme.surfaceContainerLow + val cardBorderColor = + if (isLightTheme) Color.White.copy(alpha = 0.18f) + else MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.3f) + val textColor = + if (isLightTheme) Color(0xFFE8EDF8) else MaterialTheme.colorScheme.onSurfaceVariant + val logoChipColor = + if (isLightTheme) Color.White.copy(alpha = 0.08f) else MaterialTheme.colorScheme.surface + val logoChipBorderColor = + if (isLightTheme) Color.White.copy(alpha = 0.22f) + else MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.35f) + + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadius3xl), + color = cardColor, + border = BorderStroke(1.dp, cardBorderColor), + tonalElevation = 0.dp, + shadowElevation = 0.dp, + modifier = Modifier.fillMaxWidth() + ) { + Column( + modifier = Modifier.padding(20.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + Text( + text = stringResource(id = R.string.about_mozilla), + style = MaterialTheme.typography.bodySmall, + fontWeight = FontWeight.Medium, + textAlign = TextAlign.Center, + color = textColor, + modifier = Modifier.alpha(0.8f) + ) + Image( + painter = painterResource(id = R.drawable.mozilla), + contentDescription = null, + modifier = Modifier.width(150.dp), + contentScale = ContentScale.FillWidth + ) + Row( + horizontalArrangement = Arrangement.spacedBy(14.dp), + verticalAlignment = Alignment.CenterVertically + ) { + val logoShape = RoundedCornerShape(Dimensions.cornerRadiusMdLg) + Surface( + shape = logoShape, + color = logoChipColor, + border = BorderStroke(1.dp, logoChipBorderColor), + modifier = Modifier + .clip(logoShape) + .clickable( + interactionSource = remember { MutableInteractionSource() }, + onClick = onFossClick + ) + ) { + Image( + painter = painterResource(id = R.drawable.foss_logo), + contentDescription = null, + modifier = Modifier + .width(126.dp) + .height(46.dp) + .padding(horizontal = 8.dp, vertical = 6.dp), + contentScale = ContentScale.Fit + ) + } + Surface( + shape = logoShape, + color = logoChipColor, + border = BorderStroke(1.dp, logoChipBorderColor), + modifier = Modifier + .clip(logoShape) + .clickable( + interactionSource = remember { MutableInteractionSource() }, + onClick = onFlossFundsClick + ) + ) { + Image( + painter = painterResource(id = R.drawable.ic_floss_fund_badge), + contentDescription = null, + modifier = Modifier + .width(126.dp) + .height(46.dp) + .padding(horizontal = 8.dp, vertical = 6.dp), + contentScale = ContentScale.Fit + ) + } + } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/about/AboutViewModel.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/about/AboutViewModel.kt new file mode 100644 index 000000000..f5bf16d42 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/about/AboutViewModel.kt @@ -0,0 +1,164 @@ +package com.celzero.bravedns.ui.compose.about + +import android.content.Context +import android.content.pm.PackageInfo +import android.os.SystemClock +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import androidx.work.WorkInfo +import androidx.work.WorkManager +import com.celzero.bravedns.R +import com.celzero.bravedns.RethinkDnsApplication.Companion.DEBUG +import com.celzero.bravedns.database.AppDatabase +import com.celzero.bravedns.scheduler.WorkScheduler +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.util.Constants.Companion.INIT_TIME_MS +import com.celzero.bravedns.util.FirebaseErrorReporting.TOKEN_LENGTH +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.getPackageMetadata +import com.celzero.bravedns.util.Utilities.getRandomString +import com.celzero.bravedns.util.Utilities.isFdroidFlavour +import com.celzero.bravedns.util.Utilities.isPlayStoreFlavour +import com.celzero.firestack.intra.Intra +import kotlinx.coroutines.Dispatchers +import androidx.lifecycle.asFlow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import java.util.concurrent.TimeUnit + +data class AboutUiState( + val versionName: String = "", + val installSource: String = "", + val buildNumber: String = "", + val lastUpdated: String = "", + val slicedVersion: String = "", + val daysSinceInstall: String = "", + val sponsoredAmount: String = "", + val firebaseToken: String = "", + val isFirebaseEnabled: Boolean = false, + val isFdroid: Boolean = false, + val isPlayStore: Boolean = false, + val isDebug: Boolean = DEBUG, + val isBugReportRunning: Boolean = false +) + +class AboutViewModel( + private val persistentState: PersistentState, + private val workScheduler: WorkScheduler, + private val context: Context +) : ViewModel() { + + private val _uiState = MutableStateFlow(AboutUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + private var lastAppExitInfoDialogInvokeTime = INIT_TIME_MS + + init { + updateUiState() + observeBugReportWork() + } + + fun updateUiState() { + val version = getVersionName() + val slicedVersion = if (version.length > 6) version.slice(0..6) else version + val installSource = getDownloadSource() + val build = Intra.build(false) + val updatedTs = getLastUpdatedTs() + val sponsorInfo = calculateSponsorInfo() + + _uiState.update { + it.copy( + versionName = version, + slicedVersion = slicedVersion, + installSource = installSource, + buildNumber = build, + lastUpdated = updatedTs, + daysSinceInstall = sponsorInfo.first, + sponsoredAmount = sponsorInfo.second, + firebaseToken = persistentState.firebaseUserToken, + isFirebaseEnabled = persistentState.firebaseErrorReportingEnabled, + isFdroid = isFdroidFlavour(), + isPlayStore = isPlayStoreFlavour() + ) + } + } + + private fun getVersionName(): String { + val pInfo: PackageInfo? = getPackageMetadata(context.packageManager, context.packageName) + return pInfo?.versionName ?: "" + } + + private fun getLastUpdatedTs(): String { + val pInfo: PackageInfo? = getPackageMetadata(context.packageManager, context.packageName) + val updatedTs = pInfo?.lastUpdateTime ?: return "" + return if (updatedTs > 0) { + Utilities.convertLongToTime(updatedTs, com.celzero.bravedns.util.Constants.TIME_FORMAT_4) + } else { + "" + } + } + + private fun getDownloadSource(): String { + return if (isFdroidFlavour()) "F-Droid" + else if (isPlayStoreFlavour()) "Google Play" + else "Website" + } + + private fun calculateSponsorInfo(): Pair { + val installTime = try { + context.packageManager.getPackageInfo(context.packageName, 0).firstInstallTime + } catch (e: Exception) { + System.currentTimeMillis() + } + val timeDiff = System.currentTimeMillis() - installTime + val millisecondsPerDay = 1000L * 60L * 60L * 24L + val days = (timeDiff / millisecondsPerDay).toDouble() + val month = days / 30.0 + val amount = month * (0.60 + 0.20) + return Pair(days.toInt().toString(), "%.2f".format(amount)) + } + + fun generateNewToken() { + if (isFdroidFlavour()) return + val newToken = getRandomString(TOKEN_LENGTH) + persistentState.firebaseUserToken = newToken + persistentState.firebaseUserTokenTimestamp = System.currentTimeMillis() + _uiState.update { it.copy(firebaseToken = newToken) } + } + + private fun observeBugReportWork() { + val workManager = WorkManager.getInstance(context) + workManager.getWorkInfosByTagLiveData(WorkScheduler.APP_EXIT_INFO_ONE_TIME_JOB_TAG) + .asFlow() + .onEach { workInfoList -> + val workInfo = workInfoList.getOrNull(0) ?: return@onEach + when (workInfo.state) { + WorkInfo.State.SUCCEEDED -> { + _uiState.update { it.copy(isBugReportRunning = false) } + } + WorkInfo.State.FAILED, WorkInfo.State.CANCELLED -> { + _uiState.update { it.copy(isBugReportRunning = false) } + } + WorkInfo.State.RUNNING, WorkInfo.State.ENQUEUED -> { + _uiState.update { it.copy(isBugReportRunning = true) } + } + else -> {} + } + }.launchIn(viewModelScope) + } + + fun triggerBugReport() { + if (WorkScheduler.isWorkRunning(context, WorkScheduler.APP_EXIT_INFO_JOB_TAG)) return + workScheduler.scheduleOneTimeWorkForAppExitInfo() + _uiState.update { it.copy(isBugReportRunning = true) } + } + + fun setBugReportRunning(isRunning: Boolean) { + _uiState.update { it.copy(isBugReportRunning = isRunning) } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/alerts/AlertsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/alerts/AlertsScreen.kt new file mode 100644 index 000000000..02712c1c5 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/alerts/AlertsScreen.kt @@ -0,0 +1,82 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.alerts + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.CompactEmptyState +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AlertsScreen(onBackClick: () -> Unit) { + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = stringResource(id = R.string.notif_channel_firewall_alerts), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { + Surface( + modifier = Modifier.padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingSm + ), + shape = androidx.compose.foundation.shape.RoundedCornerShape(Dimensions.cardCornerRadiusLarge), + color = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 1.dp + ) { + Column(modifier = Modifier.padding(Dimensions.spacingLg)) { + Text( + text = stringResource(id = R.string.notif_channel_firewall_alerts), + style = MaterialTheme.typography.titleMedium + ) + Text( + text = stringResource(id = R.string.alerts_empty_state), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + CompactEmptyState( + message = stringResource(id = R.string.alerts_empty_state), + modifier = Modifier.align(Alignment.Center) + ) + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/apps/AppListScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/apps/AppListScreen.kt new file mode 100644 index 000000000..c7d406567 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/apps/AppListScreen.kt @@ -0,0 +1,340 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.apps + +import android.widget.Toast +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import com.celzero.bravedns.R +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.RefreshDatabase +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.ui.compose.firewall.AppListScreen as FirewallAppListScreen +import com.celzero.bravedns.ui.compose.firewall.BlockType +import com.celzero.bravedns.ui.compose.firewall.Filters +import com.celzero.bravedns.ui.compose.firewall.FirewallFilter +import com.celzero.bravedns.ui.compose.firewall.TopLevelFilter +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.viewmodel.AppInfoViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import androidx.compose.runtime.LaunchedEffect + +private fun defaultAppFilters() = Filters(topLevelFilter = TopLevelFilter.INSTALLED) + +/** + * Full App List Screen for navigation integration. + * Manages all state internally and delegates UI to firewall/AppListScreen. + */ +@Composable +fun AppListScreen( + viewModel: AppInfoViewModel, + eventLogger: EventLogger, + refreshDatabase: RefreshDatabase, + onAppClick: ((Int) -> Unit)? = null, + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val refreshCompleteText = stringResource(R.string.refresh_complete) + val bypassDnsText = stringResource(R.string.bypass_dns_firewall) + val bypassDnsTooltipText = stringResource(R.string.bypass_dns_firewall_tooltip, bypassDnsText) + + // State + var queryText by remember { mutableStateOf("") } + var selectedFirewallFilter by remember { mutableStateOf(FirewallFilter.ALL) } + var isRefreshing by remember { mutableStateOf(false) } + var currentFilters by remember { mutableStateOf(defaultAppFilters()) } + val latestFilters by remember { derivedStateOf { currentFilters } } + + // Bulk action states + var bulkWifi by remember { mutableStateOf(false) } + var bulkMobile by remember { mutableStateOf(false) } + var bulkBypass by remember { mutableStateOf(false) } + var bulkBypassDns by remember { mutableStateOf(false) } + var bulkExclude by remember { mutableStateOf(false) } + var bulkLockdown by remember { mutableStateOf(false) } + var showBulkUpdateDialog by remember { mutableStateOf(false) } + var bulkDialogTitle by remember { mutableStateOf("") } + var bulkDialogMessage by remember { mutableStateOf("") } + var bulkDialogType by remember { mutableStateOf(null) } + var showInfoDialog by remember { mutableStateOf(false) } + var showBypassToolTip by remember { mutableStateOf(true) } + + val unmeteredBlockDialogTitle = stringResource(id = R.string.fapps_unmetered_block_dialog_title) + val unmeteredUnblockDialogTitle = stringResource(id = R.string.fapps_unmetered_unblock_dialog_title) + val meteredBlockDialogTitle = stringResource(id = R.string.fapps_metered_block_dialog_title) + val meteredUnblockDialogTitle = stringResource(id = R.string.fapps_metered_unblock_dialog_title) + val isolateBlockDialogTitle = stringResource(id = R.string.fapps_isolate_block_dialog_title) + val isolateUnblockDialogTitle = stringResource(id = R.string.fapps_unblock_dialog_title) + val bypassBlockDialogTitle = stringResource(id = R.string.fapps_bypass_block_dialog_title) + val bypassUnblockDialogTitle = stringResource(id = R.string.fapps_unblock_dialog_title) + val excludeBlockDialogTitle = stringResource(id = R.string.fapps_exclude_block_dialog_title) + val excludeUnblockDialogTitle = stringResource(id = R.string.fapps_unblock_dialog_title) + val bypassDnsFirewallBlockDialogTitle = stringResource(id = R.string.fapps_bypass_dns_firewall_dialog_title) + val bypassDnsFirewallUnblockDialogTitle = stringResource(id = R.string.fapps_unblock_dialog_title) + val unmeteredBlockDialogMessage = stringResource(id = R.string.fapps_unmetered_block_dialog_message) + val unmeteredUnblockDialogMessage = stringResource(id = R.string.fapps_unmetered_unblock_dialog_message) + val meteredBlockDialogMessage = stringResource(id = R.string.fapps_metered_block_dialog_message) + val meteredUnblockDialogMessage = stringResource(id = R.string.fapps_metered_unblock_dialog_message) + val isolateBlockDialogMessage = stringResource(id = R.string.fapps_isolate_block_dialog_message) + val bypassBlockDialogMessage = stringResource(id = R.string.fapps_bypass_block_dialog_message) + val bypassDnsFirewallBlockDialogMessage = stringResource(id = R.string.fapps_bypass_dns_firewall_dialog_message) + val excludeBlockDialogMessage = stringResource(id = R.string.fapps_exclude_block_dialog_message) + val unblockDialogMessage = stringResource(id = R.string.fapps_unblock_dialog_message) + + + // Apply filters + fun applyFilters(filters: Filters) { + currentFilters = filters + viewModel.setFilter(filters) + selectedFirewallFilter = filters.firewallFilter + queryText = filters.searchString + } + + fun resetBulkStates(type: BlockType) { + when (type) { + BlockType.UNMETER -> { + bulkMobile = false; bulkBypass = false; bulkBypassDns = false + bulkExclude = false; bulkLockdown = false + } + BlockType.METER -> { + bulkWifi = false; bulkBypass = false; bulkBypassDns = false + bulkExclude = false; bulkLockdown = false + } + BlockType.LOCKDOWN -> { + bulkWifi = false; bulkMobile = false; bulkBypass = false + bulkBypassDns = false; bulkExclude = false + } + BlockType.BYPASS -> { + bulkWifi = false; bulkMobile = false; bulkBypassDns = false + bulkExclude = false; bulkLockdown = false + } + BlockType.BYPASS_DNS_FIREWALL -> { + bulkWifi = false; bulkMobile = false; bulkBypass = false + bulkExclude = false; bulkLockdown = false + } + BlockType.EXCLUDE -> { + bulkWifi = false; bulkMobile = false; bulkBypass = false + bulkBypassDns = false; bulkLockdown = false + } + } + } + + fun logEvent(details: String) { + eventLogger.log(EventType.FW_RULE_MODIFIED, Severity.LOW, "App list, bulk change", EventSource.UI, false, details) + } + + fun updateBulkRules(type: BlockType) { + scope.launch(Dispatchers.IO) { + when (type) { + BlockType.UNMETER -> { + val unmeter = !bulkWifi + viewModel.updateUnmeteredStatus(unmeter) + withContext(Dispatchers.Main) { + bulkWifi = unmeter + resetBulkStates(BlockType.UNMETER) + } + logEvent("Bulk unmetered rule update, isUnmetered: $unmeter") + } + BlockType.METER -> { + val metered = !bulkMobile + viewModel.updateMeteredStatus(metered) + withContext(Dispatchers.Main) { + bulkMobile = metered + resetBulkStates(BlockType.METER) + } + logEvent("Bulk metered rule update, isMetered: $metered") + } + BlockType.LOCKDOWN -> { + val lockdown = !bulkLockdown + viewModel.updateLockdownStatus(lockdown) + withContext(Dispatchers.Main) { + bulkLockdown = lockdown + resetBulkStates(BlockType.LOCKDOWN) + } + logEvent("Bulk lockdown rule update, isLockdown: $lockdown") + } + BlockType.BYPASS -> { + val bypass = !bulkBypass + viewModel.updateBypassStatus(bypass) + withContext(Dispatchers.Main) { + bulkBypass = bypass + resetBulkStates(BlockType.BYPASS) + } + logEvent("Bulk bypass rule update, isBypass: $bypass") + } + BlockType.BYPASS_DNS_FIREWALL -> { + val bypassDns = !bulkBypassDns + viewModel.updateBypassDnsFirewall(bypassDns) + withContext(Dispatchers.Main) { + bulkBypassDns = bypassDns + resetBulkStates(BlockType.BYPASS_DNS_FIREWALL) + } + logEvent("Bulk bypass DNS firewall rule update, isBypassDnsFirewall: $bypassDns") + } + BlockType.EXCLUDE -> { + val exclude = !bulkExclude + viewModel.updateExcludeStatus(exclude) + withContext(Dispatchers.Main) { + bulkExclude = exclude + resetBulkStates(BlockType.EXCLUDE) + } + logEvent("Bulk exclude rule update, isExclude: $exclude") + } + } + } + } + + fun refreshAppList(action: Int = RefreshDatabase.ACTION_REFRESH_INTERACTIVE, showToast: Boolean = true) { + if (isRefreshing) return + + isRefreshing = true + scope.launch(Dispatchers.IO) { + refreshDatabase.refresh(action) { + withContext(Dispatchers.Main) { + isRefreshing = false + if (showToast) { + Utilities.showToastUiCentered( + context, + refreshCompleteText, + Toast.LENGTH_SHORT + ) + } + } + } + } + } + + // Initialize + LaunchedEffect(Unit) { + applyFilters(defaultAppFilters()) + + val appCount = + withContext(Dispatchers.IO) { + viewModel.getAppCount() + } + if (appCount == 0) { + // Bootstrap app entries immediately when local app cache is empty. + refreshAppList(action = RefreshDatabase.ACTION_REFRESH_FORCE, showToast = false) + } + } + + // Delegate to the firewall AppListScreen with all parameters + FirewallAppListScreen( + viewModel = viewModel, + eventLogger = eventLogger, + queryText = queryText, + selectedFirewallFilter = selectedFirewallFilter, + isRefreshing = isRefreshing, + bulkWifi = bulkWifi, + bulkMobile = bulkMobile, + bulkBypass = bulkBypass, + bulkBypassDns = bulkBypassDns, + bulkExclude = bulkExclude, + bulkLockdown = bulkLockdown, + showBulkUpdateDialog = showBulkUpdateDialog, + bulkDialogTitle = bulkDialogTitle, + bulkDialogMessage = bulkDialogMessage, + bulkDialogType = bulkDialogType, + showInfoDialog = showInfoDialog, + currentFilters = currentFilters, + onQueryChange = { query -> + queryText = query + applyFilters(latestFilters.copy(searchString = query)) + }, + onRefreshClick = { refreshAppList() }, + onFilterApply = { applied -> applyFilters(applied) }, + onFilterClear = { cleared -> + applyFilters( + cleared.copy( + topLevelFilter = TopLevelFilter.INSTALLED, + searchString = queryText + ) + ) + }, + onFirewallFilterClick = { filter -> + val updated = currentFilters.copy(firewallFilter = filter) + applyFilters(updated) + }, + onBulkDialogConfirm = { type -> + showBulkUpdateDialog = false + bulkDialogType = null + updateBulkRules(type) + }, + onBulkDialogDismiss = { + showBulkUpdateDialog = false + bulkDialogType = null + }, + onInfoDialogDismiss = { showInfoDialog = false }, + onShowInfoDialog = { showInfoDialog = true }, + onShowBulkDialog = { type -> + when (type) { + BlockType.UNMETER -> { + bulkDialogTitle = if (!bulkWifi) unmeteredBlockDialogTitle else unmeteredUnblockDialogTitle + bulkDialogMessage = + if (!bulkWifi) unmeteredBlockDialogMessage else unmeteredUnblockDialogMessage + } + BlockType.METER -> { + bulkDialogTitle = if (!bulkMobile) meteredBlockDialogTitle else meteredUnblockDialogTitle + bulkDialogMessage = + if (!bulkMobile) meteredBlockDialogMessage else meteredUnblockDialogMessage + } + BlockType.LOCKDOWN -> { + bulkDialogTitle = if (!bulkLockdown) isolateBlockDialogTitle else isolateUnblockDialogTitle + bulkDialogMessage = if (!bulkLockdown) isolateBlockDialogMessage else unblockDialogMessage + } + BlockType.BYPASS -> { + bulkDialogTitle = if (!bulkBypass) bypassBlockDialogTitle else bypassUnblockDialogTitle + bulkDialogMessage = if (!bulkBypass) bypassBlockDialogMessage else unblockDialogMessage + } + BlockType.BYPASS_DNS_FIREWALL -> { + bulkDialogTitle = + if (!bulkBypassDns) bypassDnsFirewallBlockDialogTitle else bypassDnsFirewallUnblockDialogTitle + bulkDialogMessage = + if (!bulkBypassDns) bypassDnsFirewallBlockDialogMessage else unblockDialogMessage + } + BlockType.EXCLUDE -> { + bulkDialogTitle = if (!bulkExclude) excludeBlockDialogTitle else excludeUnblockDialogTitle + bulkDialogMessage = if (!bulkExclude) excludeBlockDialogMessage else unblockDialogMessage + } + } + bulkDialogType = type + showBulkUpdateDialog = true + }, + onBypassDnsTooltip = { + showBypassToolTip = false + Utilities.showToastUiCentered( + context, + bypassDnsTooltipText, + Toast.LENGTH_SHORT + ) + }, + showBypassToolTip = showBypassToolTip, + onAppClick = onAppClick, + onBackClick = onBackClick + ) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/apps/DiagonalWipeIcon.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/apps/DiagonalWipeIcon.kt new file mode 100644 index 000000000..796928b81 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/apps/DiagonalWipeIcon.kt @@ -0,0 +1,210 @@ +package com.celzero.bravedns.ui.compose.apps + +import androidx.compose.animation.core.CubicBezierEasing +import androidx.compose.animation.core.Easing +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.tween +import androidx.compose.animation.core.updateTransition +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.Immutable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ClipOp +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.CompositingStrategy +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.rememberVectorPainter +import androidx.compose.material3.Icon +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.graphics.drawscope.clipPath + +/** + * Defaults for [DiagonalWipeIcon]. + * + * Keep these values centralized so callers can reuse the same motion language or override + * a single knob (for example only duration) without rewriting the full component. + */ +@Immutable +object DiagonalWipeIconDefaults { + // "Enable" here means toggling from allowed -> blocked. + const val EnableDurationMillis: Int = 530 + + // "Disable" here means toggling from blocked -> allowed. + const val DisableDurationMillis: Int = 610 + + // Snappy entry to make blocked feel responsive. + val EnableEasing: Easing = CubicBezierEasing(0.22f, 1f, 0.36f, 1f) + + // Slightly gentler exit for a softer return to allowed. + val DisableEasing: Easing = CubicBezierEasing(0.4f, 0f, 0.2f, 1f) + + // Small overlap avoids a visible seam between clipped layers on some densities. + const val SeamOverlapPx: Float = 0.8f +} + +/** + * Two-layer icon morph using one diagonal wipe boundary. + * + * Layer model: + * 1) Allowed icon exits from the non-revealed side. + * 2) Blocked icon enters from the revealed side. + * + * Because both layers use the same path and same progress in the same frame, they remain synced. + * + * @param blocked Target state: true = blocked icon fully visible; false = allowed icon fully visible. + * @param allowedIcon Icon used when state is allowed. + * @param blockedIcon Icon used when state is blocked. + * @param allowedTint Tint for [allowedIcon]. + * @param blockedTint Tint for [blockedIcon]. + * @param contentDescription Optional semantics description. + * @param modifier Standard modifier. + * @param enableDurationMillis Duration when moving from allowed -> blocked. + * @param disableDurationMillis Duration when moving from blocked -> allowed. + * @param enableEasing Easing for allowed -> blocked transition. + * @param disableEasing Easing for blocked -> allowed transition. + * @param seamOverlapPx Tiny overlap to prevent hairline seams. + */ +@Composable +fun DiagonalWipeIcon( + blocked: Boolean, + allowedIcon: ImageVector, + blockedIcon: ImageVector, + allowedTint: Color, + blockedTint: Color, + contentDescription: String?, + modifier: Modifier = Modifier, + enableDurationMillis: Int = DiagonalWipeIconDefaults.EnableDurationMillis, + disableDurationMillis: Int = DiagonalWipeIconDefaults.DisableDurationMillis, + enableEasing: Easing = DiagonalWipeIconDefaults.EnableEasing, + disableEasing: Easing = DiagonalWipeIconDefaults.DisableEasing, + seamOverlapPx: Float = DiagonalWipeIconDefaults.SeamOverlapPx, +) { + // Transition is keyed by the target blocked state. + val transition = updateTransition(targetState = blocked, label = "diagonalWipeIcon") + + // Vector painters are reused across frames for efficient icon drawing in Canvas. + val allowedPainter = rememberVectorPainter(allowedIcon) + val blockedPainter = rememberVectorPainter(blockedIcon) + + // Shared progress for both layers. 0 = fully allowed, 1 = fully blocked. + val blockedRevealProgress by transition.animateFloat( + transitionSpec = { + if (false isTransitioningTo true) { + tween(durationMillis = enableDurationMillis, easing = enableEasing) + } else { + tween(durationMillis = disableDurationMillis, easing = disableEasing) + } + }, + label = "diagonalWipeReveal", + ) { isBlocked -> + if (isBlocked) 1f else 0f + } + + // Clamp to protect against tiny numeric overshoots. + val blockedProgress = blockedRevealProgress.coerceIn(0f, 1f) + + Box( + modifier = modifier + // Offscreen composition ensures clipping behaves consistently across draws. + .graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen } + // Keep accessibility semantics attached to the whole icon. + .semantics { + if (contentDescription != null) { + this.contentDescription = contentDescription + } + }, + ) { + // Fast path: no in-between draw work when fully allowed. + if (blockedProgress <= 0.001f) { + Icon( + imageVector = allowedIcon, + contentDescription = contentDescription, + modifier = Modifier.fillMaxSize(), + tint = allowedTint, + ) + return@Box + } + + // Fast path: no in-between draw work when fully blocked. + if (blockedProgress >= 0.999f) { + Icon( + imageVector = blockedIcon, + contentDescription = contentDescription, + modifier = Modifier.fillMaxSize(), + tint = blockedTint, + ) + return@Box + } + + Canvas(modifier = Modifier.fillMaxSize()) { + // Convert normalized progress into diagonal coverage (x+y plane), + // then add a tiny overlap so both clipped regions meet without a gap. + val adjustedBlockedProgress = ( + (blockedProgress * (size.width + size.height) + seamOverlapPx) / + (size.width + size.height) + ).coerceIn(0f, 1f) + + // This single path defines both entering and exiting regions. + val blockedRevealPath = buildDiagonalRevealPath( + width = size.width, + height = size.height, + progress = adjustedBlockedProgress, + ) + + // Allowed (first layer) exits while blocked (second layer) enters + // with the exact same boundary from opposite clipped regions. + clipPath(path = blockedRevealPath, clipOp = ClipOp.Difference) { + with(allowedPainter) { + draw(size = size, colorFilter = ColorFilter.tint(allowedTint)) + } + } + clipPath(path = blockedRevealPath, clipOp = ClipOp.Intersect) { + with(blockedPainter) { + draw(size = size, colorFilter = ColorFilter.tint(blockedTint)) + } + } + } + } +} + +/** + * Builds a polygon that grows diagonally from top-left toward bottom-right. + * + * Geometry note: + * - We drive progression along `x + y = constant`. + * - At p=0, the polygon is empty. + * - At p=1, the polygon covers the full icon bounds. + */ +private fun buildDiagonalRevealPath(width: Float, height: Float, progress: Float): Path { + val p = progress.coerceIn(0f, 1f) + return Path().apply { + if (p <= 0f) return@apply + if (p >= 1f) { + moveTo(0f, 0f) + lineTo(width, 0f) + lineTo(width, height) + lineTo(0f, height) + close() + return@apply + } + + val diagonal = (width + height) * p + moveTo(0f, 0f) + lineTo(diagonal.coerceAtMost(width), 0f) + if (diagonal > width) { + lineTo(width, (diagonal - width).coerceAtMost(height)) + } + if (diagonal > height) { + lineTo((diagonal - height).coerceAtMost(width), height) + } + lineTo(0f, diagonal.coerceAtMost(height)) + close() + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/bubble/BubbleScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/bubble/BubbleScreen.kt new file mode 100644 index 000000000..919d0cd07 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/bubble/BubbleScreen.kt @@ -0,0 +1,510 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.bubble + +import android.graphics.drawable.Drawable +import androidx.compose.foundation.Image +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.core.content.ContextCompat +import androidx.paging.LoadState +import androidx.paging.compose.LazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.data.AllowedAppInfo +import com.celzero.bravedns.data.BlockedAppInfo +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import io.github.aakira.napier.Napier +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale +import java.util.concurrent.TimeUnit + +@Composable +fun BubbleScreen( + vpnOn: Boolean, + allowedItems: LazyPagingItems, + blockedItems: LazyPagingItems, + onAllowApp: (BlockedAppInfo, () -> Unit) -> Unit, + onRemoveAllowed: (AllowedAppInfo, () -> Unit) -> Unit +) { + val allowedLoaded = allowedItems.loadState.refresh is LoadState.NotLoading + val allowedCount = allowedItems.itemCount + val showAllowedSection = vpnOn && allowedLoaded && allowedCount > 0 + + val blockedLoading = blockedItems.loadState.refresh is LoadState.Loading + val blockedError = blockedItems.loadState.refresh is LoadState.Error + val blockedLoaded = blockedItems.loadState.refresh is LoadState.NotLoading + val blockedEmpty = blockedLoaded && blockedItems.itemCount == 0 + + val showEmptyState = !vpnOn || blockedError || blockedEmpty + + LazyColumn( + modifier = Modifier + .fillMaxSize() + .background(MaterialTheme.colorScheme.background), + contentPadding = PaddingValues( + top = Dimensions.spacingMd, + bottom = Dimensions.spacingXl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + item { + HeaderSection() + } + + if (showAllowedSection) { + item { + AllowedHeader(count = allowedCount) + } + itemsIndexed( + items = List(allowedItems.itemCount) { it }, + key = { index, _ -> allowedItems[index]?.uid ?: index } + ) { index, _ -> + val app = allowedItems[index] ?: return@itemsIndexed + AllowedAppRow( + app = app, + onRemove = { + onRemoveAllowed(app) { + allowedItems.refresh() + blockedItems.refresh() + } + } + ) + } + } + + item { + BlockedHeader() + } + + when { + blockedLoading -> { + item { LoadingCard() } + } + showEmptyState -> { + item { EmptyState() } + } + else -> { + itemsIndexed( + items = List(blockedItems.itemCount) { it }, + key = { index, _ -> blockedItems[index]?.uid ?: index } + ) { index, _ -> + val app = blockedItems[index] ?: return@itemsIndexed + BlockedAppRow( + app = app, + onAllow = { + onAllowApp(app) { + blockedItems.refresh() + allowedItems.refresh() + } + } + ) + } + } + } + } +} + +@Composable +private fun HeaderSection() { + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + shape = RoundedCornerShape(Dimensions.cardCornerRadiusLarge), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)), + tonalElevation = 1.dp + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(Dimensions.spacingLg), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingMd), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + painter = painterResource(R.drawable.ic_firewall_bubble), + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(20.dp) + ) + Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text( + text = stringResource(R.string.firewall_bubble_title), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold + ) + Text( + text = stringResource(R.string.firewall_bubble_subtitle), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } +} + +@Composable +private fun AllowedHeader(count: Int) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = stringResource(R.string.bubble_allowed_title), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + fontWeight = FontWeight.SemiBold, + modifier = Modifier.weight(1f) + ) + Surface( + color = MaterialTheme.colorScheme.secondaryContainer, + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg) + ) { + Text( + text = count.toString(), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSecondaryContainer, + modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp) + ) + } + } +} + +@Composable +private fun BlockedHeader() { + SectionHeader( + title = stringResource(R.string.bubble_activity_title), + modifier = Modifier.padding(horizontal = Dimensions.screenPaddingHorizontal) + ) +} + +@Composable +private fun LoadingCard() { + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + shape = RoundedCornerShape(Dimensions.cornerRadius4xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.3f)), + tonalElevation = 1.dp + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 24.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + CircularProgressIndicator(modifier = Modifier.size(36.dp)) + Spacer(modifier = Modifier.height(10.dp)) + Text( + text = stringResource(R.string.bubble_loading), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } +} + +@Composable +private fun EmptyState() { + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + shape = RoundedCornerShape(Dimensions.cornerRadius4xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.3f)), + tonalElevation = 1.dp + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 22.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusLg), + color = MaterialTheme.colorScheme.secondaryContainer + ) { + Image( + painter = painterResource(id = R.drawable.ic_firewall_shield), + contentDescription = null, + modifier = Modifier.padding(10.dp).size(28.dp) + ) + } + Spacer(modifier = Modifier.height(12.dp)) + Text( + text = stringResource(R.string.bubble_empty_state_title), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface, + textAlign = androidx.compose.ui.text.style.TextAlign.Center + ) + Spacer(modifier = Modifier.height(6.dp)) + Text( + text = stringResource(R.string.bubble_empty_state_desc), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + overflow = TextOverflow.Visible, + textAlign = androidx.compose.ui.text.style.TextAlign.Center + ) + } + } +} + +@Composable +fun AllowedAppRow(app: AllowedAppInfo, onRemove: () -> Unit) { + BubbleAppRow( + packageName = app.packageName, + appName = app.appName, + details = { + Spacer(modifier = Modifier.height(2.dp)) + Text( + text = allowedTimeRemaining(app), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + }, + trailing = { + TextButton(onClick = onRemove) { + Text( + text = stringResource(R.string.lbl_remove), + color = MaterialTheme.colorScheme.error, + fontWeight = FontWeight.SemiBold + ) + } + } + ) +} + +@Composable +private fun BubbleAppRow( + packageName: String, + appName: String, + details: @Composable () -> Unit, + trailing: @Composable () -> Unit +) { + BubbleListCard { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 14.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + AppIcon(packageName = packageName) + Spacer(modifier = Modifier.width(12.dp)) + Column(modifier = Modifier.weight(1f)) { + Text( + text = appName, + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + details() + } + trailing() + } + } +} + +@Composable +fun BlockedAppRow(app: BlockedAppInfo, onAllow: () -> Unit) { + val context = LocalContext.current + val bubbleTimeJustNow = stringResource(R.string.bubble_time_just_now) + val bubbleTimeMinutesAgoTemplate = stringResource(R.string.bubble_time_minutes_ago) + val bubbleTimeHoursAgoTemplate = stringResource(R.string.bubble_time_hours_ago) + + BubbleAppRow( + packageName = app.packageName, + appName = app.appName, + details = { + Spacer(modifier = Modifier.height(2.dp)) + Text( + text = app.packageName, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Spacer(modifier = Modifier.height(4.dp)) + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + text = stringResource(R.string.bubble_blocked_count, app.count), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.error + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = timeAgo( + timestamp = app.lastBlocked, + justNowText = bubbleTimeJustNow, + minutesAgoText = { + String.format(Locale.getDefault(), bubbleTimeMinutesAgoTemplate, it) + }, + hoursAgoText = { + String.format(Locale.getDefault(), bubbleTimeHoursAgoTemplate, it) + } + ), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + }, + trailing = { + Button( + onClick = onAllow, + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + contentPadding = PaddingValues(horizontal = 14.dp, vertical = 9.dp) + ) { + Text(text = stringResource(R.string.bubble_allow_btn)) + } + } + ) +} + +@Composable +private fun AppIcon(packageName: String) { + val context = LocalContext.current + val icon = remember(packageName) { loadAppIcon(context, packageName) } + Box( + modifier = Modifier + .size(46.dp) + .background( + MaterialTheme.colorScheme.secondaryContainer, + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg) + ), + contentAlignment = Alignment.Center + ) { + val painter = rememberDrawablePainter(icon) + painter?.let { + Image( + painter = it, + contentDescription = null, + modifier = Modifier.size(26.dp) + ) + } + } +} + +@Composable +private fun BubbleListCard(content: @Composable RowScope.() -> Unit) { + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + shape = RoundedCornerShape(Dimensions.cornerRadius4xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.28f)), + tonalElevation = 1.dp + ) { + Row(content = content) + } +} + +private fun loadAppIcon(context: android.content.Context, packageName: String): Drawable { + return try { + if (packageName != "Unknown") { + context.packageManager.getApplicationIcon(packageName) + } else { + ContextCompat.getDrawable(context, R.drawable.ic_launcher_foreground)!! + } + } catch (_: Exception) { + Napier.e("App icon not found for $packageName") + ContextCompat.getDrawable(context, R.drawable.ic_launcher_foreground)!! + } +} + +private fun allowedTimeRemaining(app: AllowedAppInfo): String { + val now = System.currentTimeMillis() + val expiresAt = app.allowedAt + (15 * 60 * 1000) + val remaining = (expiresAt - now) / 1000 / 60 + return if (remaining > 0) { + "$remaining min${if (remaining != 1L) "s" else ""} remaining" + } else { + "Expired" + } +} + +private fun timeAgo( + timestamp: Long, + justNowText: String, + minutesAgoText: (Long) -> String, + hoursAgoText: (Long) -> String +): String { + val now = System.currentTimeMillis() + val diff = now - timestamp + return when { + diff < TimeUnit.MINUTES.toMillis(1) -> justNowText + diff < TimeUnit.HOURS.toMillis(1) -> { + val minutes = TimeUnit.MILLISECONDS.toMinutes(diff) + minutesAgoText(minutes) + } + diff < TimeUnit.DAYS.toMillis(1) -> { + val hours = TimeUnit.MILLISECONDS.toHours(diff) + hoursAgoText(hours) + } + else -> { + val dateFormat = SimpleDateFormat("MMM dd, HH:mm", Locale.getDefault()) + dateFormat.format(Date(timestamp)) + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/configure/ConfigureScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/configure/ConfigureScreen.kt new file mode 100644 index 000000000..6d85a18e6 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/configure/ConfigureScreen.kt @@ -0,0 +1,867 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.configure + +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.rounded.ArrowBack +import androidx.compose.material.icons.rounded.Close +import androidx.compose.material.icons.rounded.Search +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.LargeTopAppBar +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.material3.TextFieldDefaults +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkGridTile +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.SectionHeaderWithSubtitle +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import kotlinx.coroutines.delay +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver +import androidx.lifecycle.compose.LocalLifecycleOwner +import com.celzero.bravedns.ui.compose.theme.RethinkAnimatedSection + +private data class ConfigureEntry( + val id: String, + val title: String, + val subtitle: String? = null, + val iconTint: Color, + val iconRes: Int, + val onClick: () -> Unit, + val keywords: List = emptyList(), +) + +private data class ConfigureSectionModel( + val title: String, + val subtitle: String? = null, + val accentColor: Color, + val layout: ConfigureSectionLayout, + val entries: List, +) + +private enum class ConfigureSectionLayout { + GridFour, + GridPairThenList, + List +} + +private val ConfigureTileGap = 2.dp + +private data class ConfigureSearchTarget( + val id: String, + val title: String, + val path: String, + val iconRes: Int, + val iconTint: Color, + val onClick: () -> Unit, + val keywords: List, +) + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ConfigureScreen( + isDebug: Boolean, + onAppsClick: () -> Unit, + onDnsClick: () -> Unit, + onFirewallClick: () -> Unit, + onProxyClick: () -> Unit, + onNetworkClick: () -> Unit, + onOthersClick: () -> Unit, + onLogsClick: () -> Unit, + onAntiCensorshipClick: () -> Unit, + onAdvancedClick: () -> Unit, + onSearchDestinationClick: ((SettingsSearchDestination) -> Unit)? = null +) { + var query by rememberSaveable { mutableStateOf("") } + var isSearchOpen by rememberSaveable { mutableStateOf(false) } + val searchFocusRequester = remember { FocusRequester() } + val keyboardController = LocalSoftwareKeyboardController.current + val lifecycleOwner = LocalLifecycleOwner.current + val largeTopBarScrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + val searchTopBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() + val activeTopBarScrollBehavior = + if (isSearchOpen) searchTopBarScrollBehavior else largeTopBarScrollBehavior + val closeSearch = { + isSearchOpen = false + query = "" + } + + LaunchedEffect(isSearchOpen) { + if (isSearchOpen) { + delay(120) + searchFocusRequester.requestFocus() + keyboardController?.show() + } else { + keyboardController?.hide() + } + } + + BackHandler(enabled = isSearchOpen) { + closeSearch() + } + + DisposableEffect(lifecycleOwner) { + val observer = LifecycleEventObserver { _, event -> + if (event == Lifecycle.Event.ON_STOP) { + isSearchOpen = false + query = "" + } + } + lifecycleOwner.lifecycle.addObserver(observer) + onDispose { lifecycleOwner.lifecycle.removeObserver(observer) } + } + + val protectionTitle = stringResource(R.string.lbl_protection) + val systemTitle = stringResource(R.string.lbl_system) + val advancedTitle = stringResource(R.string.lbl_advanced) + + val appsTitle = stringResource(R.string.lbl_apps) + val dnsTitle = stringResource(R.string.lbl_dns) + val firewallTitle = stringResource(R.string.lbl_firewall) + val proxyTitle = stringResource(R.string.lbl_proxy) + val networkTitle = stringResource(R.string.lbl_network) + val settingsTitle = stringResource(R.string.title_settings) + val logsTitle = stringResource(R.string.lbl_logs) + val antiCensorshipTitle = stringResource(R.string.anti_censorship_title) + val iconTints = rememberConfigureIconTints() + + val sections = buildList { + add( + ConfigureSectionModel( + title = protectionTitle, + accentColor = MaterialTheme.colorScheme.primary, + layout = ConfigureSectionLayout.GridFour, + entries = listOf( + ConfigureEntry( + id = "apps", + title = appsTitle, + iconTint = iconTints.apps, + iconRes = R.drawable.ic_app_info_accent, + onClick = onAppsClick, + keywords = listOf("apps", "application", "app list") + ), + ConfigureEntry( + id = "dns", + title = dnsTitle, + iconTint = iconTints.dns, + iconRes = R.drawable.dns_home_screen, + onClick = onDnsClick, + keywords = listOf("dns", "doh", "dot", "dnscrypt", "resolver", "blocklist") + ), + ConfigureEntry( + id = "firewall", + title = firewallTitle, + iconTint = iconTints.firewall, + iconRes = R.drawable.firewall_home_screen, + onClick = onFirewallClick, + keywords = listOf("firewall", "allow", "block", "rules", "wifi", "mobile") + ), + ConfigureEntry( + id = "proxy", + title = proxyTitle, + iconTint = iconTints.proxy, + iconRes = R.drawable.ic_proxy, + onClick = onProxyClick, + keywords = listOf("proxy", "socks5", "http proxy", "wireguard", "orbot", "tor") + ) + ) + ) + ) + + add( + ConfigureSectionModel( + title = systemTitle, + accentColor = MaterialTheme.colorScheme.secondary, + layout = ConfigureSectionLayout.GridPairThenList, + entries = listOf( + ConfigureEntry( + id = "network", + title = networkTitle, + iconTint = iconTints.network, + iconRes = R.drawable.ic_network_tunnel, + onClick = onNetworkClick, + keywords = listOf("network", "vpn", "tunnel", "metered") + ), + ConfigureEntry( + id = "settings", + title = settingsTitle, + iconTint = iconTints.settings, + iconRes = R.drawable.ic_other_settings, + onClick = onOthersClick, + keywords = listOf("settings", "general", "theme", "appearance", "backup", "restore") + ), + ConfigureEntry( + id = "logs", + title = logsTitle, + subtitle = stringResource(R.string.settings_enable_logs_desc), + iconTint = iconTints.logs, + iconRes = R.drawable.ic_logs_accent, + onClick = onLogsClick, + keywords = listOf("logs", "events", "network logs", "console logs") + ) + ) + ) + ) + + add( + ConfigureSectionModel( + title = advancedTitle, + accentColor = MaterialTheme.colorScheme.tertiary, + layout = ConfigureSectionLayout.List, + entries = buildList { + add( + ConfigureEntry( + id = "anti-censorship", + title = antiCensorshipTitle, + subtitle = stringResource(R.string.anti_censorship_desc), + iconTint = iconTints.antiCensorship, + iconRes = R.drawable.ic_anti_dpi, + onClick = onAntiCensorshipClick, + keywords = listOf("anti censorship", "dpi", "evasion") + ) + ) + if (isDebug) { + add( + ConfigureEntry( + id = "advanced", + title = advancedTitle, + subtitle = stringResource(R.string.adv_set_experimental_desc), + iconTint = iconTints.advanced, + iconRes = R.drawable.ic_advanced_settings, + onClick = onAdvancedClick, + keywords = listOf("advanced", "experimental", "debug") + ) + ) + } + } + ) + ) + } + + fun openDestination(destination: SettingsSearchDestination) { + if (onSearchDestinationClick != null) { + onSearchDestinationClick(destination) + return + } + + when (destination) { + SettingsSearchDestination.Apps -> onAppsClick() + is SettingsSearchDestination.Dns -> onDnsClick() + is SettingsSearchDestination.Firewall -> onFirewallClick() + is SettingsSearchDestination.Proxy -> onProxyClick() + is SettingsSearchDestination.Network -> onNetworkClick() + is SettingsSearchDestination.General -> onOthersClick() + SettingsSearchDestination.Logs -> onLogsClick() + SettingsSearchDestination.AntiCensorship -> onAntiCensorshipClick() + SettingsSearchDestination.Advanced -> onAdvancedClick() + } + } + + val deepSearchTargets = + buildSettingsSearchIndex(isDebug = isDebug).map { entry -> + ConfigureSearchTarget( + id = entry.id, + title = entry.title, + path = entry.path, + iconRes = entry.iconRes, + iconTint = iconTintForDestination(entry.destination, iconTints), + onClick = { openDestination(entry.destination) }, + keywords = buildList { + addAll(entry.keywords) + add(entry.title) + add(entry.subtitle) + add(entry.path) + } + ) + } + + val topLevelSearchTargets = sections.flatMap { section -> + section.entries.map { entry -> + ConfigureSearchTarget( + id = "top-level.${entry.id}", + title = entry.title, + path = "${section.title} > ${entry.title}", + iconRes = entry.iconRes, + iconTint = entry.iconTint, + onClick = entry.onClick, + keywords = buildList { + addAll(entry.keywords) + add(section.title) + add(entry.title) + entry.subtitle?.let { add(it) } + } + ) + } + } + + val normalizedQuery = if (isSearchOpen) query.normalizeSearchQuery() else "" + val searchTargets = (deepSearchTargets + topLevelSearchTargets).distinctBy { it.id } + + val searchResults = remember(normalizedQuery, searchTargets) { + if (normalizedQuery.isBlank()) { + emptyList() + } else { + searchTargets + .mapNotNull { target -> + val score = target.searchScore(normalizedQuery) + if (score > 0) target to score else null + } + .sortedWith( + compareByDescending> { it.second } + .thenBy { it.first.title } + ) + .map { it.first } + } + } + + Scaffold( + modifier = Modifier.nestedScroll(activeTopBarScrollBehavior.nestedScrollConnection), + containerColor = MaterialTheme.colorScheme.surface, + contentWindowInsets = WindowInsets(0, 0, 0, 0), + topBar = { + if (isSearchOpen) { + TopAppBar( + navigationIcon = { + IconButton( + onClick = { closeSearch() } + ) { + Icon( + imageVector = Icons.AutoMirrored.Rounded.ArrowBack, + contentDescription = stringResource(id = R.string.configure_search_close), + ) + } + }, + title = { + TextField( + value = query, + onValueChange = { query = it }, + modifier = Modifier + .fillMaxWidth() + .padding(vertical = Dimensions.spacingSm) + .focusRequester(searchFocusRequester), + singleLine = true, + placeholder = { + Text( + text = stringResource(id = R.string.configure_search_hint), + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.75f), + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + }, + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + colors = TextFieldDefaults.colors( + focusedContainerColor = MaterialTheme.colorScheme.surfaceContainerLow, + unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainerLow, + focusedIndicatorColor = Color.Transparent, + unfocusedIndicatorColor = Color.Transparent, + disabledIndicatorColor = Color.Transparent + ) + ) + }, + actions = { + if (query.isNotEmpty()) { + IconButton(onClick = { query = "" }) { + Icon( + imageVector = Icons.Rounded.Close, + contentDescription = stringResource(id = R.string.cd_clear_search) + ) + } + } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.surface, + scrolledContainerColor = MaterialTheme.colorScheme.surfaceContainer, + ), + scrollBehavior = searchTopBarScrollBehavior + ) + } else { + LargeTopAppBar( + title = { + Text( + text = stringResource(id = R.string.lbl_configure), + color = MaterialTheme.colorScheme.onSurface + ) + }, + actions = { + IconButton(onClick = { isSearchOpen = true }) { + Icon( + imageVector = Icons.Rounded.Search, + contentDescription = stringResource(id = R.string.configure_search_open) + ) + } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.surface, + scrolledContainerColor = MaterialTheme.colorScheme.surfaceContainer, + ), + scrollBehavior = largeTopBarScrollBehavior + ) + } + } + ) { paddingValues -> + LazyColumn( + state = rememberLazyListState(), + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingMd, + bottom = Dimensions.spacingLg + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + if (normalizedQuery.isBlank()) { + sections.forEachIndexed { index, section -> + item { + RethinkAnimatedSection(index = index) { + ConfigureSection(section) + } + } + } + item { + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + } + } else { + item { + if (searchResults.isEmpty()) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadiusXl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)) + ) { + Column( + modifier = Modifier.padding(horizontal = 16.dp, vertical = 14.dp), + verticalArrangement = Arrangement.spacedBy(4.dp) + ) { + Text( + text = stringResource(id = R.string.configure_search_empty_title), + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold + ) + Text( + text = stringResource(id = R.string.configure_search_empty_subtitle), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } else { + SearchResultsGroup( + results = searchResults, + query = normalizedQuery, + onResultClick = { target -> + target.onClick() + } + ) + } + } + } + } + } +} + +@Composable +private fun ConfigureSection(section: ConfigureSectionModel) { + Column { + SectionHeaderWithSubtitle( + title = section.title, + subtitle = section.subtitle, + color = section.accentColor + ) + + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + + when (section.layout) { + ConfigureSectionLayout.GridFour -> { + ConfigureGrid( + entries = section.entries + ) + } + + ConfigureSectionLayout.GridPairThenList -> { + when (section.entries.size) { + 3 -> { + ConfigureTriadGrid( + entries = section.entries + ) + } + + 2 -> { + ConfigurePairGrid( + first = section.entries[0], + second = section.entries[1] + ) + } + + in 4..Int.MAX_VALUE -> { + ConfigurePairGrid( + first = section.entries[0], + second = section.entries[1] + ) + Spacer(modifier = Modifier.height(Dimensions.spacingXs)) + ConfigureSectionList( + entries = section.entries.drop(2) + ) + } + + else -> { + ConfigureSectionList( + entries = section.entries + ) + } + } + } + + ConfigureSectionLayout.List -> { + ConfigureSectionList( + entries = section.entries + ) + } + } + } +} + +@Composable +private fun ConfigureGrid( + entries: List +) { + if (entries.size != 4) return + + Column(verticalArrangement = Arrangement.spacedBy(ConfigureTileGap)) { + ConfigureTopRowTiles( + first = entries[0], + second = entries[1] + ) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(ConfigureTileGap) + ) { + ConfigureGridTile( + entry = entries[2], + shape = RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp, bottomStart = 28.dp, bottomEnd = 12.dp), + modifier = Modifier.weight(1f) + ) + ConfigureGridTile( + entry = entries[3], + shape = RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp, bottomStart = 12.dp, bottomEnd = 28.dp), + modifier = Modifier.weight(1f) + ) + } + } +} + +@Composable +private fun ConfigurePairGrid( + first: ConfigureEntry, + second: ConfigureEntry +) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(ConfigureTileGap) + ) { + ConfigureGridTile( + entry = first, + shape = RoundedCornerShape(topStart = 28.dp, topEnd = 12.dp, bottomStart = 28.dp, bottomEnd = 12.dp), + modifier = Modifier.weight(1f) + ) + ConfigureGridTile( + entry = second, + shape = RoundedCornerShape(topStart = 12.dp, topEnd = 28.dp, bottomStart = 12.dp, bottomEnd = 28.dp), + modifier = Modifier.weight(1f) + ) + } +} + +@Composable +private fun ConfigureTriadGrid( + entries: List +) { + if (entries.size != 3) return + + Column(verticalArrangement = Arrangement.spacedBy(ConfigureTileGap)) { + ConfigureTopRowTiles( + first = entries[0], + second = entries[1] + ) + + ConfigureGridTile( + entry = entries[2], + shape = RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp, bottomStart = 28.dp, bottomEnd = 28.dp), + modifier = Modifier.fillMaxWidth() + ) + } +} + +@Composable +private fun ConfigureTopRowTiles( + first: ConfigureEntry, + second: ConfigureEntry, + itemGap: Dp = ConfigureTileGap +) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(itemGap) + ) { + ConfigureGridTile( + entry = first, + shape = RoundedCornerShape(topStart = 28.dp, topEnd = 12.dp, bottomStart = 12.dp, bottomEnd = 12.dp), + modifier = Modifier.weight(1f) + ) + ConfigureGridTile( + entry = second, + shape = RoundedCornerShape(topStart = 12.dp, topEnd = 28.dp, bottomStart = 12.dp, bottomEnd = 12.dp), + modifier = Modifier.weight(1f) + ) + } +} + +@Composable +private fun ConfigureSectionList( + entries: List +) { + val iconTint = MaterialTheme.colorScheme.onPrimaryFixed.copy(alpha = 0.8f) + + Column { + entries.forEachIndexed { index, entry -> + RethinkListItem( + headline = entry.title, + leadingIconPainter = painterResource(id = entry.iconRes), + leadingIconTint = iconTint, + leadingIconContainerColor = entry.iconTint, + position = cardPositionFor(index = index, lastIndex = entries.lastIndex), + highlightContainerColor = entry.iconTint.copy(alpha = 0.22f), + showTrailingChevron = false, + onClick = entry.onClick, + ) + } + } +} + +@Composable +private fun ConfigureGridTile( + entry: ConfigureEntry, + shape: RoundedCornerShape, + modifier: Modifier = Modifier +) { + val iconTint = MaterialTheme.colorScheme.onPrimaryFixed.copy(alpha = 0.8f) + + RethinkGridTile( + title = entry.title, + iconRes = entry.iconRes, + accentColor = entry.iconTint, + shape = shape, + modifier = modifier, + iconTint = iconTint, + iconContainerColor = entry.iconTint, + onClick = entry.onClick + ) +} + +private data class ConfigureIconTints( + val apps: Color, + val dns: Color, + val firewall: Color, + val proxy: Color, + val network: Color, + val settings: Color, + val logs: Color, + val antiCensorship: Color, + val advanced: Color, +) + +@Composable +private fun rememberConfigureIconTints(): ConfigureIconTints { + return ConfigureIconTints( + apps = Color(0xFF74C5FF), + dns = Color(0xFFC5ACFF), + firewall = Color(0xFFFF907F), + proxy = Color(0xFF46EBC8), + network = Color(0xFFA3BCFF), + settings = Color(0xFFFFD878), + logs = Color(0xFF7EED92), + antiCensorship = Color(0xFFFFA7E0), + advanced = Color(0xFFFFE182) + ) +} + +private fun iconTintForDestination( + destination: SettingsSearchDestination, + iconTints: ConfigureIconTints +): Color { + return when (destination) { + SettingsSearchDestination.Apps -> iconTints.apps + is SettingsSearchDestination.Dns -> iconTints.dns + is SettingsSearchDestination.Firewall -> iconTints.firewall + is SettingsSearchDestination.Proxy -> iconTints.proxy + is SettingsSearchDestination.Network -> iconTints.network + is SettingsSearchDestination.General -> iconTints.settings + SettingsSearchDestination.Logs -> iconTints.logs + SettingsSearchDestination.AntiCensorship -> iconTints.antiCensorship + SettingsSearchDestination.Advanced -> iconTints.advanced + } +} + +@Composable +private fun SearchResultsGroup( + results: List, + query: String, + onResultClick: (ConfigureSearchTarget) -> Unit +) { + val limitedResults = results.take(12) + val highlightColor = MaterialTheme.colorScheme.primary + val iconTint = MaterialTheme.colorScheme.onPrimaryFixed.copy(alpha = 0.8f) + + Column { + limitedResults.forEachIndexed { index, target -> + val highlightedTitle = remember(target.title, query, highlightColor) { + target.title.highlightMatches(query = query, highlightColor = highlightColor) + } + val highlightedPath = remember(target.path, query, highlightColor) { + target.path.highlightMatches(query = query, highlightColor = highlightColor) + } + RethinkListItem( + headline = target.title, + headlineAnnotated = highlightedTitle, + supporting = target.path, + supportingAnnotated = highlightedPath, + leadingIconPainter = painterResource(id = target.iconRes), + leadingIconTint = iconTint, + leadingIconContainerColor = target.iconTint, + position = cardPositionFor(index = index, lastIndex = limitedResults.lastIndex), + highlightContainerColor = target.iconTint.copy(alpha = 0.22f), + showTrailingChevron = false, + onClick = { onResultClick(target) } + ) + } + } +} + +private fun String.normalizeSearchQuery(): String { + return lowercase().trim().replace(Regex("\\s+"), " ") +} + +private fun ConfigureSearchTarget.searchScore(query: String): Int { + if (query.isBlank()) return 0 + + val titleNorm = title.normalizeSearchQuery() + val pathNorm = path.normalizeSearchQuery() + val keywordNorm = keywords.joinToString(" ").normalizeSearchQuery() + + var score = 0 + if (titleNorm.startsWith(query)) score += 10 + if (titleNorm.contains(query)) score += 7 + if (keywordNorm.contains(query)) score += 6 + if (pathNorm.contains(query)) score += 4 + + return score +} + +private fun String.highlightMatches(query: String, highlightColor: Color): AnnotatedString { + if (isBlank() || query.isBlank()) return AnnotatedString(this) + + val ranges = mutableListOf>() + val tokens = query.split(Regex("\\s+")).map { it.trim() }.filter { it.isNotBlank() }.distinct() + + tokens.forEach { token -> + var startIndex = 0 + while (startIndex < length) { + val index = indexOf(token, startIndex = startIndex, ignoreCase = true) + if (index < 0) break + ranges += index to (index + token.length) + startIndex = index + token.length + } + } + + if (ranges.isEmpty()) return AnnotatedString(this) + + val merged = ranges + .sortedBy { it.first } + .fold(mutableListOf>()) { acc, range -> + if (acc.isEmpty()) { + acc += range + return@fold acc + } + val last = acc.last() + if (range.first <= last.second) { + acc[acc.lastIndex] = last.first to maxOf(last.second, range.second) + } else { + acc += range + } + acc + } + + return buildAnnotatedString { + append(this@highlightMatches) + merged.forEach { (start, end) -> + addStyle( + style = SpanStyle(color = highlightColor, fontWeight = FontWeight.SemiBold), + start = start, + end = end + ) + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/configure/SettingsSearchIndex.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/configure/SettingsSearchIndex.kt new file mode 100644 index 000000000..075d4dc9f --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/configure/SettingsSearchIndex.kt @@ -0,0 +1,248 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.configure + +import androidx.compose.runtime.Composable +import androidx.compose.ui.res.stringResource +import com.celzero.bravedns.R + +sealed interface SettingsSearchDestination { + data object Apps : SettingsSearchDestination + data class Dns(val focusKey: String = "") : SettingsSearchDestination + data class Firewall(val focusKey: String = "") : SettingsSearchDestination + data class Proxy(val focusKey: String = "") : SettingsSearchDestination + data class Network(val focusKey: String = "") : SettingsSearchDestination + data class General(val focusKey: String = "") : SettingsSearchDestination + data object Logs : SettingsSearchDestination + data object AntiCensorship : SettingsSearchDestination + data object Advanced : SettingsSearchDestination +} + +data class SettingsSearchIndexEntry( + val id: String, + val title: String, + val subtitle: String, + val path: String, + val iconRes: Int, + val destination: SettingsSearchDestination, + val keywords: List = emptyList(), +) + +@Composable +fun buildSettingsSearchIndex(isDebug: Boolean): List { + val protection = stringResource(R.string.lbl_protection) + val system = stringResource(R.string.lbl_system) + val advanced = stringResource(R.string.lbl_advanced) + val dns = stringResource(R.string.lbl_dns) + val proxy = stringResource(R.string.lbl_proxy) + val network = stringResource(R.string.lbl_network) + val general = stringResource(R.string.settings_general_header) + val firewall = stringResource(R.string.lbl_firewall) + + val topLevel = + listOf( + SettingsSearchIndexEntry( + id = "top.apps", + title = stringResource(R.string.lbl_apps), + subtitle = stringResource(R.string.apps_info_title), + path = "$protection > ${stringResource(R.string.lbl_apps)}", + iconRes = R.drawable.ic_app_info_accent, + destination = SettingsSearchDestination.Apps, + keywords = listOf("apps", "application", "app list") + ), + SettingsSearchIndexEntry( + id = "top.dns", + title = dns, + subtitle = stringResource(R.string.dns_mode_info_title), + path = "$protection > $dns", + iconRes = R.drawable.dns_home_screen, + destination = SettingsSearchDestination.Dns(), + keywords = listOf("dns", "resolver", "blocklist") + ), + SettingsSearchIndexEntry( + id = "top.firewall", + title = firewall, + subtitle = stringResource(R.string.firewall_mode_info_title), + path = "$protection > $firewall", + iconRes = R.drawable.firewall_home_screen, + destination = SettingsSearchDestination.Firewall(), + keywords = listOf("firewall", "rules", "allow", "block") + ), + SettingsSearchIndexEntry( + id = "top.proxy", + title = proxy, + subtitle = stringResource(R.string.cd_custom_dns_proxy_name_default), + path = "$protection > $proxy", + iconRes = R.drawable.ic_proxy, + destination = SettingsSearchDestination.Proxy(), + keywords = listOf("proxy", "socks5", "http proxy", "orbot", "wireguard") + ), + SettingsSearchIndexEntry( + id = "top.network", + title = network, + subtitle = stringResource(R.string.firewall_act_network_monitor_tab), + path = "$system > $network", + iconRes = R.drawable.ic_network_tunnel, + destination = SettingsSearchDestination.Network(), + keywords = listOf("network", "vpn", "metered", "lan") + ), + SettingsSearchIndexEntry( + id = "top.general", + title = stringResource(R.string.title_settings), + subtitle = general, + path = "$system > ${stringResource(R.string.title_settings)}", + iconRes = R.drawable.ic_other_settings, + destination = SettingsSearchDestination.General(), + keywords = listOf("settings", "theme", "backup", "appearance") + ), + SettingsSearchIndexEntry( + id = "top.logs", + title = stringResource(R.string.lbl_logs), + subtitle = stringResource(R.string.settings_enable_logs_desc), + path = "$system > ${stringResource(R.string.lbl_logs)}", + iconRes = R.drawable.ic_logs_accent, + destination = SettingsSearchDestination.Logs, + keywords = listOf("logs", "events", "network logs") + ), + SettingsSearchIndexEntry( + id = "top.anti_censorship", + title = stringResource(R.string.anti_censorship_title), + subtitle = stringResource(R.string.anti_censorship_desc), + path = "$advanced > ${stringResource(R.string.anti_censorship_title)}", + iconRes = R.drawable.ic_anti_dpi, + destination = SettingsSearchDestination.AntiCensorship, + keywords = listOf("anti censorship", "dpi") + ) + ) + + val dnsEntries = + listOf( + searchEntry("dns.mode.system", R.string.network_dns, R.string.dc_other_dns_heading, "$protection > $dns > ${stringResource(R.string.dc_other_dns_heading)}", R.drawable.ic_network, SettingsSearchDestination.Dns("dns_mode_system"), listOf("system dns")), + searchEntry("dns.mode.custom", R.string.dc_custom_dns_radio, R.string.dc_other_dns_heading, "$protection > $dns > ${stringResource(R.string.dc_other_dns_heading)}", R.drawable.ic_filter, SettingsSearchDestination.Dns("dns_mode_custom"), listOf("custom dns")), + searchEntry("dns.mode.rethink", R.string.dc_rethink_dns_radio, R.string.dc_other_dns_heading, "$protection > $dns > ${stringResource(R.string.dc_other_dns_heading)}", R.drawable.ic_rethink_plus, SettingsSearchDestination.Dns("dns_mode_rethink"), listOf("rethink dns")), + searchEntry("dns.mode.smart", R.string.smart_dns, R.string.dc_other_dns_heading, "$protection > $dns > ${stringResource(R.string.dc_other_dns_heading)}", R.drawable.ic_dns_cache, SettingsSearchDestination.Dns("dns_mode_smart"), listOf("smart dns")), + searchEntry("dns.block.local", R.string.dc_local_block_heading, R.string.dc_block_heading, "$protection > $dns > ${stringResource(R.string.dc_block_heading)}", R.drawable.ic_local_blocklist, SettingsSearchDestination.Dns("dns_block_local"), listOf("local blocklist")), + searchEntry("dns.block.custom_downloader", R.string.settings_custom_downloader_heading, R.string.dc_block_heading, "$protection > $dns > ${stringResource(R.string.dc_block_heading)}", R.drawable.ic_update, SettingsSearchDestination.Dns("dns_block_custom_downloader")), + searchEntry("dns.block.periodic_updates", R.string.dc_check_update_heading, R.string.dc_block_heading, "$protection > $dns > ${stringResource(R.string.dc_block_heading)}", R.drawable.ic_blocklist_update_check, SettingsSearchDestination.Dns("dns_block_periodic_updates")), + searchEntry("dns.filter.alg", R.string.cd_dns_alg_heading, R.string.dc_filtering_heading, "$protection > $dns > ${stringResource(R.string.dc_filtering_heading)}", R.drawable.ic_adv_dns_filter, SettingsSearchDestination.Dns("dns_filter_alg")), + searchEntry("dns.filter.split", R.string.cd_split_dns_heading, R.string.dc_filtering_heading, "$protection > $dns > ${stringResource(R.string.dc_filtering_heading)}", R.drawable.ic_split_dns, SettingsSearchDestination.Dns("dns_filter_split")), + searchEntry("dns.filter.rules_as_firewall", R.string.cd_treat_dns_rules_firewall_heading, R.string.dc_filtering_heading, "$protection > $dns > ${stringResource(R.string.dc_filtering_heading)}", R.drawable.ic_dns_rules_as_firewall, SettingsSearchDestination.Dns("dns_filter_rules_as_firewall")), + searchEntry("dns.filter.record_types", R.string.cd_allowed_dns_record_types_heading, R.string.dc_filtering_heading, "$protection > $dns > ${stringResource(R.string.dc_filtering_heading)}", R.drawable.ic_allow_dns_records, SettingsSearchDestination.Dns("dns_filter_record_types"), listOf("record types")), + searchEntry("dns.advanced.favicon", R.string.dc_dns_website_heading, R.string.lbl_advanced, "$protection > $dns > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_fav_icon, SettingsSearchDestination.Dns("dns_advanced_favicon")), + searchEntry("dns.advanced.cache", R.string.dc_setting_dns_cache_heading, R.string.lbl_advanced, "$protection > $dns > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_auto_start, SettingsSearchDestination.Dns("dns_advanced_cache")), + searchEntry("dns.advanced.proxy_dns", R.string.dc_proxy_dns_heading, R.string.lbl_advanced, "$protection > $dns > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_proxy, SettingsSearchDestination.Dns("dns_advanced_proxy_dns")), + searchEntry("dns.advanced.undelegated", R.string.dc_use_sys_dns_undelegated_heading, R.string.lbl_advanced, "$protection > $dns > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_split_dns, SettingsSearchDestination.Dns("dns_advanced_undelegated")), + searchEntry("dns.advanced.fallback", R.string.use_fallback_dns_to_bypass, R.string.lbl_advanced, "$protection > $dns > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_use_fallback_bypass, SettingsSearchDestination.Dns("dns_advanced_fallback")), + searchEntry("dns.advanced.leaks", R.string.dc_dns_leaks_heading, R.string.lbl_advanced, "$protection > $dns > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_prevent_dns_leaks, SettingsSearchDestination.Dns("dns_advanced_leaks")) + ) + + val firewallEntries = + listOf( + searchEntry("firewall.universal", R.string.univ_firewall_heading, R.string.firewall_act_universal_tab, "$protection > $firewall > ${stringResource(R.string.firewall_act_universal_tab)}", R.drawable.universal_firewall, SettingsSearchDestination.Firewall("firewall_universal_main")), + searchEntry("firewall.universal.blocked", R.string.univ_view_blocked_ip, R.string.firewall_act_universal_tab, "$protection > $firewall > ${stringResource(R.string.firewall_act_universal_tab)}", R.drawable.universal_ip_rule, SettingsSearchDestination.Firewall("firewall_universal_blocked")), + searchEntry("firewall.apps.rules", R.string.app_ip_domain_rules, R.string.lbl_app_wise, "$protection > $firewall > ${stringResource(R.string.lbl_app_wise)}", R.drawable.ic_ip_address, SettingsSearchDestination.Firewall("firewall_apps_rules")) + ) + + val proxyEntries = + listOf( + searchEntry("proxy.wireguard", R.string.setup_wireguard, R.string.settings_proxy_header, "$protection > $proxy > ${stringResource(R.string.setup_wireguard)}", R.drawable.ic_wireguard_icon, SettingsSearchDestination.Proxy("proxy_wireguard"), listOf("wg", "wireguard")), + searchEntry("proxy.socks5", R.string.settings_socks5_heading, R.string.settings_proxy_header, "$protection > $proxy > ${stringResource(R.string.settings_socks5_heading)}", R.drawable.ic_socks5, SettingsSearchDestination.Proxy("proxy_socks")), + searchEntry("proxy.http", R.string.settings_https_heading, R.string.settings_proxy_header, "$protection > $proxy > ${stringResource(R.string.settings_https_heading)}", R.drawable.ic_http, SettingsSearchDestination.Proxy("proxy_http")), + searchEntry("proxy.orbot", R.string.orbot, R.string.settings_proxy_header, "$protection > $proxy > ${stringResource(R.string.orbot)}", R.drawable.ic_orbot, SettingsSearchDestination.Proxy("proxy_orbot"), listOf("tor")), + searchEntry("proxy.orbot.notification", R.string.settings_orbot_notification_action, R.string.orbot, "$protection > $proxy > ${stringResource(R.string.orbot)}", R.drawable.ic_right_arrow_small, SettingsSearchDestination.Proxy("proxy_orbot_open_app")) + ) + + val networkEntries = + listOf( + searchEntry("network.allow_bypass", R.string.settings_allow_bypass_heading, R.string.lbl_network, "$system > $network > ${stringResource(R.string.lbl_network)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_allow_bypass")), + searchEntry("network.fail_open", R.string.fail_open_network_title, R.string.lbl_network, "$system > $network > ${stringResource(R.string.lbl_network)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_fail_open")), + searchEntry("network.allow_lan", R.string.settings_allow_lan_heading, R.string.lbl_network, "$system > $network > ${stringResource(R.string.lbl_network)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_allow_lan")), + searchEntry("network.all_networks", R.string.settings_network_all_networks, R.string.lbl_network, "$system > $network > ${stringResource(R.string.lbl_network)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_all_networks")), + searchEntry("network.exclude_apps_proxy", R.string.settings_exclude_apps_in_proxy, R.string.lbl_network, "$system > $network > ${stringResource(R.string.lbl_network)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_exclude_apps_proxy")), + searchEntry("network.protocol_translation", R.string.settings_protocol_translation, R.string.lbl_network, "$system > $network > ${stringResource(R.string.lbl_network)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_protocol_translation")), + searchEntry("network.default_dns", R.string.settings_default_dns_heading, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_default_dns")), + searchEntry("network.vpn_policy", R.string.vpn_policy_title, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_vpn_policy")), + searchEntry("network.ip_protocol", R.string.settings_ip_dialog_title, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_ip_protocol")), + searchEntry("network.connectivity_checks", R.string.settings_connectivity_checks, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_connectivity_checks")), + searchEntry("network.ping_ips", R.string.settings_ping_ips, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_network, SettingsSearchDestination.Network("network_ping_ips")), + searchEntry("network.mobile_metered", R.string.settings_treat_mobile_metered, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_mobile_metered")), + searchEntry("network.wg_listen_port", R.string.settings_wg_listen_port, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_wg_listen_port")), + searchEntry("network.wg_lockdown", R.string.settings_wg_lockdown, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_wg_lockdown")), + searchEntry("network.endpoint_independence", R.string.settings_endpoint_independence, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_endpoint_independence")), + searchEntry("network.allow_incoming_wg", R.string.settings_allow_incoming_wg_packets, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_allow_incoming_wg")), + searchEntry("network.tcp_keep_alive", R.string.settings_tcp_keep_alive, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_tcp_keep_alive")), + searchEntry("network.jumbo_packets", R.string.settings_jumbo_packets, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_jumbo_packets")), + searchEntry("network.vpn_metered", R.string.settings_vpn_builder_metered, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_vpn_metered")), + searchEntry("network.custom_lan_ip", R.string.custom_lan_ip_title, R.string.lbl_advanced, "$system > $network > ${stringResource(R.string.lbl_advanced)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_custom_lan_ip")), + searchEntry("network.dial_timeout", R.string.settings_dial_timeout, R.string.lbl_network, "$system > $network > ${stringResource(R.string.settings_dial_timeout)}", R.drawable.ic_settings, SettingsSearchDestination.Network("network_dial_timeout"), listOf("timeout")) + ) + + val generalEntries = + listOf( + searchEntry("general.appearance", R.string.settings_theme_heading, R.string.settings_general_customize, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.settings_theme_heading)}", R.drawable.ic_appearance, SettingsSearchDestination.General("general_theme_mode"), listOf("theme", "light", "dark")), + searchEntry("general.color_style", R.string.settings_theme_color_heading, R.string.settings_theme_color_desc, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.settings_theme_heading)}", R.drawable.ic_appearance, SettingsSearchDestination.General("general_theme_color"), listOf("color", "palette", "dynamic color")), + searchEntry("general.backup", R.string.brbs_backup_title, R.string.settings_import_export_desc, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.brbs_title)}", R.drawable.ic_backup, SettingsSearchDestination.General("general_backup"), listOf("backup", "restore")), + searchEntry("general.logs", R.string.settings_enable_logs, R.string.settings_general_customize, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.settings_general_header)}", R.drawable.ic_logs_accent, SettingsSearchDestination.General("general_logs"), listOf("logs")), + searchEntry("general.autostart", R.string.settings_autostart_bootup_heading, R.string.settings_general_customize, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.settings_general_header)}", R.drawable.ic_auto_start, SettingsSearchDestination.General("general_autostart")), + searchEntry("general.tombstone", R.string.tombstone_app_title, R.string.settings_general_customize, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.settings_general_header)}", R.drawable.ic_tombstone, SettingsSearchDestination.General("general_tombstone"), listOf("remember uninstalled")), + searchEntry("general.firewall_bubble", R.string.firewall_bubble_title, R.string.settings_general_customize, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.settings_general_header)}", R.drawable.ic_firewall_bubble, SettingsSearchDestination.General("general_firewall_bubble")), + searchEntry("general.ip_info", R.string.download_ip_info_title, R.string.settings_general_customize, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.settings_general_header)}", R.drawable.ic_ip_info, SettingsSearchDestination.General("general_ip_info")), + searchEntry("general.app_updates", R.string.settings_check_update_heading, R.string.settings_general_customize, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.settings_general_header)}", R.drawable.ic_update, SettingsSearchDestination.General("general_app_updates"), listOf("updates")), + searchEntry("general.crash_reports", R.string.settings_firebase_error_reporting_heading, R.string.settings_general_customize, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.settings_general_header)}", R.drawable.ic_settings, SettingsSearchDestination.General("general_crash_reports"), listOf("firebase", "error reporting")), + searchEntry("general.custom_downloader", R.string.settings_custom_downloader_heading, R.string.settings_general_customize, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.settings_general_header)}", R.drawable.ic_settings, SettingsSearchDestination.General("general_custom_downloader")), + searchEntry("general.website", R.string.about_website, R.string.title_about, "$system > ${stringResource(R.string.title_settings)} > ${stringResource(R.string.title_about)}", R.drawable.ic_other_settings, SettingsSearchDestination.General("general_website"), listOf("website")) + ) + + val advancedEntries = + if (isDebug) { + listOf( + SettingsSearchIndexEntry( + id = "top.advanced", + title = stringResource(R.string.lbl_advanced), + subtitle = stringResource(R.string.adv_set_experimental_desc), + path = "$advanced > ${stringResource(R.string.lbl_advanced)}", + iconRes = R.drawable.ic_advanced_settings, + destination = SettingsSearchDestination.Advanced, + keywords = listOf("experimental", "debug") + ) + ) + } else { + emptyList() + } + + return topLevel + dnsEntries + firewallEntries + proxyEntries + networkEntries + generalEntries + advancedEntries +} + +@Composable +private fun searchEntry( + id: String, + titleRes: Int, + subtitleRes: Int, + path: String, + iconRes: Int, + destination: SettingsSearchDestination, + keywords: List = emptyList() +): SettingsSearchIndexEntry { + return SettingsSearchIndexEntry( + id = id, + title = stringResource(id = titleRes), + subtitle = stringResource(id = subtitleRes), + path = path, + iconRes = iconRes, + destination = destination, + keywords = keywords + ) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/database/DatabaseScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/database/DatabaseScreen.kt new file mode 100644 index 000000000..b0358032d --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/database/DatabaseScreen.kt @@ -0,0 +1,691 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.database + +import android.database.Cursor +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.asPaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.ContentCopy +import androidx.compose.material.icons.rounded.Refresh +import androidx.compose.material.icons.rounded.Storage +import androidx.compose.material3.ButtonGroupDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.ToggleButton +import androidx.compose.material3.ToggleButtonDefaults +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.database.AppDatabase +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkSearchField +import com.celzero.bravedns.ui.compose.theme.RethinkTopBar +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +private data class DatabaseTablePreview( + val table: String, + val rowCount: Int, + val columnCount: Int, + val dumpPreview: String, + val isTruncated: Boolean +) + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DatabaseScreen( + onBackClick: () -> Unit, + appDatabase: AppDatabase +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + + var query by remember { mutableStateOf("") } + var tables by remember { mutableStateOf>(emptyList()) } + var selectedTable by remember { mutableStateOf(null) } + var preview by remember { mutableStateOf(null) } + var loadingPreview by remember { mutableStateOf(false) } + var loadingCopy by remember { mutableStateOf(false) } + var errorText by remember { mutableStateOf(null) } + var isLoading by remember { mutableStateOf(true) } + + val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() + + val filteredTables = remember(tables, query) { + val q = query.trim() + if (q.isEmpty()) tables else tables.filter { it.contains(q, ignoreCase = true) } + } + + fun loadDatabaseTables() { + scope.launch(Dispatchers.IO) { + val db = appDatabase.openHelper.readableDatabase + val cursor = db.query("SELECT name FROM sqlite_master WHERE type='table'") + val tableList = mutableListOf() + while (cursor.moveToNext()) { + val tableName = cursor.getString(0) + if (tableName != "android_metadata" && tableName != "room_master_table") { + tableList.add(tableName) + } + } + cursor.close() + withContext(Dispatchers.Main) { + tables = tableList + if (selectedTable == null && tableList.isNotEmpty()) { + selectedTable = tableList.first() + } + isLoading = false + } + } + } + + fun refreshSelection() { + val table = selectedTable ?: return + loadingPreview = true + errorText = null + scope.launch(Dispatchers.IO) { + runCatching { loadTablePreview(appDatabase, table) } + .onSuccess { + withContext(Dispatchers.Main) { + preview = it + loadingPreview = false + } + } + .onFailure { + withContext(Dispatchers.Main) { + errorText = it.message ?: context.getString(R.string.blocklist_update_check_failure) + loadingPreview = false + } + } + } + } + + fun copySelectionToClipboard() { + val table = selectedTable ?: return + loadingCopy = true + scope.launch(Dispatchers.IO) { + val fullDump = buildTableDump(appDatabase, table) + withContext(Dispatchers.Main) { + copyToClipboard(context, "db_dump", fullDump) + loadingCopy = false + } + } + } + + LaunchedEffect(Unit) { + loadDatabaseTables() + } + + LaunchedEffect(selectedTable) { + val table = selectedTable ?: return@LaunchedEffect + if (preview?.table != table || preview?.rowCount == -1) { + refreshSelection() + } + } + + val navBarBottomPadding = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + containerColor = MaterialTheme.colorScheme.surface, + topBar = { + RethinkTopBar( + title = stringResource(id = R.string.title_database_dump), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior, + actions = { + IconButton( + enabled = selectedTable != null && preview != null && !loadingCopy, + onClick = { copySelectionToClipboard() } + ) { + if (loadingCopy) { + CircularProgressIndicator(modifier = Modifier.size(18.dp), strokeWidth = 2.dp) + } else { + Icon( + imageVector = Icons.Rounded.ContentCopy, + contentDescription = stringResource(id = R.string.database_inspector_copy_full) + ) + } + } + } + ) + } + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(horizontal = Dimensions.screenPaddingHorizontal) + .padding(bottom = navBarBottomPadding), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + BoxWithConstraints(modifier = Modifier.fillMaxWidth()) { + val isWide = maxWidth >= 860.dp + DatabaseControlsDeck { + RethinkSearchField( + query = query, + onQueryChange = { query = it }, + placeholder = stringResource(R.string.database_inspector_search_hint), + modifier = Modifier.fillMaxWidth(), + onClearQuery = { query = "" }, + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + containerColor = MaterialTheme.colorScheme.surfaceContainerLow + ) + if (!isWide) { + DatabaseInlineTableSelector( + tables = filteredTables, + selectedTable = selectedTable, + onSelect = { selectedTable = it } + ) + } + } + } + + if (isLoading) { + Box( + modifier = Modifier + .fillMaxWidth() + .weight(1f), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator() + } + } else { + BoxWithConstraints( + modifier = Modifier + .fillMaxWidth() + .weight(1f) + ) { + val isWide = maxWidth >= 860.dp + if (isWide) { + Row(horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingMd)) { + DatabaseTableListPane( + tables = filteredTables, + selectedTable = selectedTable, + totalCount = tables.size, + modifier = Modifier.widthIn(min = 300.dp, max = 380.dp), + onSelect = { selectedTable = it } + ) + DatabaseTableDetailPane( + preview = preview, + loadingPreview = loadingPreview, + loadingCopy = loadingCopy, + errorText = errorText, + selectedTable = selectedTable, + modifier = Modifier.weight(1f), + onRefresh = { refreshSelection() }, + onCopy = { copySelectionToClipboard() } + ) + } + } else { + DatabaseTableDetailPane( + preview = preview, + loadingPreview = loadingPreview, + loadingCopy = loadingCopy, + errorText = errorText, + selectedTable = selectedTable, + modifier = Modifier.fillMaxSize(), + onRefresh = { refreshSelection() }, + onCopy = { copySelectionToClipboard() } + ) + } + } + } + } + } +} + +@Composable +private fun DatabaseInlineTableSelector( + tables: List, + selectedTable: String?, + onSelect: (String) -> Unit +) { + if (tables.isEmpty()) { + return + } + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()) + .padding(vertical = Dimensions.spacingXs), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + tables.forEachIndexed { index, table -> + val isSelected = selectedTable == table + DatabaseTableToggle( + table = table, + index = index, + lastIndex = tables.lastIndex, + selected = isSelected, + onSelect = onSelect + ) + } + } +} + +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +private fun DatabaseTableToggle( + table: String, + index: Int, + lastIndex: Int, + selected: Boolean, + onSelect: (String) -> Unit +) { + ToggleButton( + checked = selected, + onCheckedChange = { checked -> + if (checked && !selected) onSelect(table) + }, + shapes = + when (index) { + 0 -> ButtonGroupDefaults.connectedLeadingButtonShapes() + lastIndex -> ButtonGroupDefaults.connectedTrailingButtonShapes() + else -> ButtonGroupDefaults.connectedMiddleButtonShapes() + }, + colors = ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.94f), + checkedContentColor = MaterialTheme.colorScheme.onSecondaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.82f), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + border = null, + modifier = Modifier + .widthIn(max = 220.dp) + .semantics { role = Role.RadioButton } + ) { + Text( + text = table, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + style = MaterialTheme.typography.labelMedium, + fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium + ) + } +} + +@Composable +private fun DatabaseControlsDeck( + content: @Composable () -> Unit +) { + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + content() + } +} + +@Composable +private fun DatabaseMetaChip( + text: String, + modifier: Modifier = Modifier +) { + Surface( + modifier = modifier, + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = MaterialTheme.colorScheme.surfaceContainerHighest.copy(alpha = 0.7f) + ) { + Text( + text = text, + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 7.dp) + ) + } +} + +@Composable +private fun DatabaseTableListPane( + tables: List, + selectedTable: String?, + totalCount: Int, + modifier: Modifier = Modifier, + onSelect: (String) -> Unit +) { + Surface( + modifier = modifier.fillMaxSize(), + shape = RoundedCornerShape(Dimensions.cornerRadius2xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)) + ) { + if (tables.isEmpty()) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text( + text = stringResource(R.string.database_inspector_no_tables), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } else { + Column(modifier = Modifier.fillMaxSize()) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.spacingMd, vertical = Dimensions.spacingSm), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Row( + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = Icons.Rounded.Storage, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(18.dp) + ) + Text( + text = stringResource(R.string.database_inspector_tables_title), + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold + ) + } + DatabaseMetaChip(text = "${tables.size}/$totalCount") + } + + HorizontalDivider(thickness = 1.dp, color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.22f)) + + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(horizontal = Dimensions.spacingSm, vertical = Dimensions.spacingXs), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingGridTile) + ) { + itemsIndexed(tables) { index, table -> + val isSelected = selectedTable == table + RethinkListItem( + headline = table, + leadingIconPainter = painterResource(id = R.drawable.ic_backup), + leadingIconTint = if (isSelected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant, + leadingIconContainerColor = + if (isSelected) MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.6f) + else MaterialTheme.colorScheme.surfaceContainerHighest, + position = cardPositionFor(index = index, lastIndex = tables.lastIndex), + highlighted = isSelected, + showTrailingChevron = false, + trailing = if (isSelected) { + { + Icon( + painter = painterResource(id = R.drawable.ic_tick), + contentDescription = null, + modifier = Modifier.size(18.dp), + tint = MaterialTheme.colorScheme.primary + ) + } + } else { + null + }, + onClick = { onSelect(table) } + ) + } + } + } + } + } +} + +@Composable +private fun DatabaseTableDetailPane( + preview: DatabaseTablePreview?, + loadingPreview: Boolean, + loadingCopy: Boolean, + errorText: String?, + selectedTable: String?, + modifier: Modifier = Modifier, + onRefresh: () -> Unit, + onCopy: () -> Unit +) { + Surface( + modifier = modifier.fillMaxSize(), + shape = RoundedCornerShape(Dimensions.cornerRadius2xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)) + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(Dimensions.spacingMd), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + if (preview == null && !loadingPreview) { + return@Column + } + + if (preview != null) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = preview.table, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f) + ) + Row( + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingXs), + verticalAlignment = Alignment.CenterVertically + ) { + IconButton(onClick = onRefresh, enabled = !loadingPreview) { + Icon( + imageVector = Icons.Rounded.Refresh, + contentDescription = stringResource(R.string.database_inspector_refresh) + ) + } + TextButton( + onClick = onCopy, + enabled = selectedTable != null && !loadingCopy + ) { + Text( + text = if (loadingCopy) { + stringResource(R.string.database_inspector_copying) + } else { + stringResource(R.string.database_inspector_copy_full) + } + ) + } + } + } + + Row(horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm)) { + DatabaseMetaChip(text = stringResource(R.string.database_inspector_rows, preview.rowCount.toString())) + DatabaseMetaChip(text = stringResource(R.string.database_inspector_columns, preview.columnCount.toString())) + } + + HorizontalDivider(thickness = 1.dp, color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f)) + } + + if (!errorText.isNullOrBlank()) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusMd), + color = MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.4f) + ) { + Text( + text = errorText, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onErrorContainer, + modifier = Modifier.padding(horizontal = Dimensions.spacingMd, vertical = Dimensions.spacingSm) + ) + } + } + + if (loadingPreview) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } else { + val text = preview?.dumpPreview.orEmpty() + SelectionContainer { + Column( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(Dimensions.spacingSm) + ) { + Text( + text = text, + style = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace) + ) + if (preview?.isTruncated == true) { + androidx.compose.foundation.layout.Spacer(modifier = Modifier.size(Dimensions.spacingSm)) + Text( + text = stringResource(R.string.database_inspector_preview_truncated), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } + } + } + } +} + +private fun loadTablePreview(appDatabase: AppDatabase, table: String, maxRows: Int = 140): DatabaseTablePreview { + val rowCount = getTableRowCount(appDatabase, table) + val columnCount = getTableColumnCount(appDatabase, table) + val preview = buildTableDump(appDatabase, table, maxRows = maxRows) + return DatabaseTablePreview( + table = table, + rowCount = rowCount, + columnCount = columnCount, + dumpPreview = preview, + isTruncated = rowCount > maxRows + ) +} + +private fun getTableRowCount(appDatabase: AppDatabase, table: String): Int { + val safeTable = table.replace("`", "``") + val db = appDatabase.openHelper.readableDatabase + val cursor = db.query("SELECT COUNT(*) FROM `$safeTable`") + val count = if (cursor.moveToFirst()) cursor.getInt(0) else 0 + cursor.close() + return count +} + +private fun getTableColumnCount(appDatabase: AppDatabase, table: String): Int { + val safeTable = table.replace("`", "``") + val db = appDatabase.openHelper.readableDatabase + val cursor = db.query("SELECT * FROM `$safeTable` LIMIT 1") + val count = cursor.columnCount + cursor.close() + return count +} + +private fun buildTableDump(appDatabase: AppDatabase, table: String, maxRows: Int? = null): String { + val safeTable = table.replace("`", "``") + val db = appDatabase.openHelper.readableDatabase + val cursor = db.query("SELECT * FROM `$safeTable`") + val columnNames = cursor.columnNames + val result = StringBuilder() + result.append("Table: $table\n") + result.append(columnNames.joinToString(separator = "\t")) + result.append("\n") + var rowCount = 0 + var isTruncated = false + while (cursor.moveToNext()) { + if (maxRows != null && rowCount >= maxRows) { + isTruncated = true + break + } + for (i in columnNames.indices) { + result.append(cursorValueAsText(cursor, i)).append("\t") + } + result.append("\n") + rowCount++ + } + cursor.close() + if (isTruncated) { + result.append("…\n") + } + return result.toString() +} + +private fun cursorValueAsText(cursor: Cursor, index: Int): String { + return when (cursor.getType(index)) { + Cursor.FIELD_TYPE_NULL -> "null" + Cursor.FIELD_TYPE_BLOB -> { + val size = cursor.getBlob(index)?.size ?: 0 + "[blob:$size]" + } + else -> cursor.getString(index).orEmpty() + } +} + +private fun copyToClipboard(context: android.content.Context, label: String, text: String) { + val clipboard = context.getSystemService(android.content.Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager + val clip = android.content.ClipData.newPlainText(label, text) + clipboard.setPrimaryClip(clip) + android.widget.Toast.makeText(context, context.getString(R.string.copied_clipboard), android.widget.Toast.LENGTH_SHORT).show() +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/dns/ConfigureOtherDnsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/dns/ConfigureOtherDnsScreen.kt new file mode 100644 index 000000000..c46404058 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/dns/ConfigureOtherDnsScreen.kt @@ -0,0 +1,1170 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.dns + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Add +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.Checkbox +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExtendedFloatingActionButton +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import androidx.lifecycle.asFlow +import androidx.paging.compose.LazyPagingItems +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.DnsCryptRow +import com.celzero.bravedns.adapter.DnsProxyEndpointRow +import com.celzero.bravedns.adapter.DoHEndpointRow +import com.celzero.bravedns.adapter.DoTEndpointRow +import com.celzero.bravedns.adapter.ODoHEndpointRow +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.database.DnsCryptEndpoint +import com.celzero.bravedns.database.DnsCryptRelayEndpoint +import com.celzero.bravedns.database.DnsProxyEndpoint +import com.celzero.bravedns.database.DoHEndpoint +import com.celzero.bravedns.database.DoTEndpoint +import com.celzero.bravedns.database.ODoHEndpoint +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.util.UIUtils +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.viewmodel.DnsCryptEndpointViewModel +import com.celzero.bravedns.viewmodel.DnsCryptRelayEndpointViewModel +import com.celzero.bravedns.viewmodel.DnsProxyEndpointViewModel +import com.celzero.bravedns.viewmodel.DoHEndpointViewModel +import com.celzero.bravedns.viewmodel.DoTEndpointViewModel +import com.celzero.bravedns.viewmodel.ODoHEndpointViewModel +import inet.ipaddr.IPAddressString +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.net.MalformedURLException +import java.net.URL + +enum class DnsScreenType(val index: Int) { + DOH(0), + DNS_PROXY(1), + DNS_CRYPT(2), + DOT(3), + ODOH(4); + + companion object { + fun fromIndex(index: Int): DnsScreenType { + return entries.find { it.index == index } ?: DOH + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ConfigureOtherDnsScreen( + dnsType: DnsScreenType, + appConfig: AppConfig, + persistentState: PersistentState, + dohViewModel: DoHEndpointViewModel, + dotViewModel: DoTEndpointViewModel, + dnsProxyViewModel: DnsProxyEndpointViewModel, + dnsCryptViewModel: DnsCryptEndpointViewModel, + dnsCryptRelayViewModel: DnsCryptRelayEndpointViewModel, + oDohViewModel: ODoHEndpointViewModel, + onBackClick: () -> Unit +) { + val scope = rememberCoroutineScope() + + Scaffold( + containerColor = MaterialTheme.colorScheme.background, + topBar = { + RethinkLargeTopBar( + title = getDnsTypeName(dnsType), + subtitle = getDnsTypeSubtitle(dnsType), + onBackClick = onBackClick, + ) + } + ) { padding -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(padding) + .padding(horizontal = Dimensions.screenPaddingHorizontal) + ) { + OtherDnsListContent( + dnsType = dnsType, + paddingValues = PaddingValues( + horizontal = 0.dp, + vertical = Dimensions.spacingXs + ), + appConfig = appConfig, + persistentState = persistentState, + dohViewModel = dohViewModel, + dotViewModel = dotViewModel, + dnsProxyViewModel = dnsProxyViewModel, + dnsCryptViewModel = dnsCryptViewModel, + dnsCryptRelayViewModel = dnsCryptRelayViewModel, + oDohViewModel = oDohViewModel, + scope = scope + ) + } + } +} + +@Composable +private fun getDnsTypeName(type: DnsScreenType): String { + return when (type) { + DnsScreenType.DOH -> stringResource(R.string.other_dns_list_tab1) + DnsScreenType.DNS_CRYPT -> stringResource(R.string.dc_dns_crypt) + DnsScreenType.DNS_PROXY -> stringResource(R.string.other_dns_list_tab3) + DnsScreenType.DOT -> stringResource(R.string.lbl_dot) + DnsScreenType.ODOH -> stringResource(R.string.lbl_odoh) + } +} + +@Composable +private fun getDnsTypeSubtitle(type: DnsScreenType): String { + return when (type) { + DnsScreenType.DOH -> + stringResource(R.string.cd_doh_dialog_resolver_url) + DnsScreenType.DNS_CRYPT -> + stringResource(R.string.cd_dns_crypt_dialog_stamp) + DnsScreenType.DNS_PROXY -> + stringResource(R.string.dns_proxy_ip_address) + DnsScreenType.DOT -> + stringResource(R.string.lbl_dot_abbr) + DnsScreenType.ODOH -> + stringResource(R.string.lbl_odoh_abbr) + } +} + +@Composable +private fun OtherDnsListContent( + dnsType: DnsScreenType, + paddingValues: PaddingValues, + appConfig: AppConfig, + persistentState: PersistentState, + dohViewModel: DoHEndpointViewModel, + dotViewModel: DoTEndpointViewModel, + dnsProxyViewModel: DnsProxyEndpointViewModel, + dnsCryptViewModel: DnsCryptEndpointViewModel, + dnsCryptRelayViewModel: DnsCryptRelayEndpointViewModel, + oDohViewModel: ODoHEndpointViewModel, + scope: CoroutineScope +) { + when (dnsType) { + DnsScreenType.DOH -> DohListContent(paddingValues, appConfig, dohViewModel, scope) + DnsScreenType.DNS_PROXY -> DnsProxyListContent( + paddingValues, + appConfig, + persistentState, + dnsProxyViewModel, + scope + ) + + DnsScreenType.DNS_CRYPT -> DnsCryptListContent( + paddingValues, + appConfig, + dnsCryptViewModel, + dnsCryptRelayViewModel, + scope + ) + + DnsScreenType.DOT -> DotListContent(paddingValues, appConfig, dotViewModel, scope) + DnsScreenType.ODOH -> OdohListContent(paddingValues, appConfig, oDohViewModel, scope) + } +} + +@Composable +private fun DnsEndpointListWithFab( + paddingValues: PaddingValues, + items: LazyPagingItems, + onFabClick: () -> Unit, + itemContent: @Composable (T) -> Unit +) { + Box(modifier = Modifier.fillMaxSize().padding(paddingValues)) { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(top = Dimensions.spacingXs, bottom = 84.dp), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + items(items.itemCount) { index -> + val item = items[index] ?: return@items + itemContent(item) + } + } + ExtendedFloatingActionButton( + onClick = onFabClick, + modifier = Modifier.align(Alignment.BottomEnd).padding(24.dp) + ) { + Icon( + imageVector = Icons.Rounded.Add, + contentDescription = stringResource(R.string.lbl_create) + ) + Spacer(modifier = Modifier.width(Dimensions.spacingSm)) + Text(text = stringResource(R.string.lbl_create)) + } + } +} + +@Composable +private fun DohListContent( + paddingValues: PaddingValues, + appConfig: AppConfig, + dohViewModel: DoHEndpointViewModel, + scope: CoroutineScope +) { + val context = LocalContext.current + val items = dohViewModel.dohEndpointList.asFlow().collectAsLazyPagingItems() + var showDialog by remember { mutableStateOf(false) } + val heading = stringResource(R.string.cd_doh_dialog_heading) + val nameLabel = stringResource(R.string.cd_doh_dialog_resolver_name) + val urlLabel = stringResource(R.string.cd_doh_dialog_resolver_url) + val defaultName = stringResource(R.string.cd_custom_doh_url_name_default) + val checkboxLabel = stringResource(R.string.cd_doh_dialog_checkbox_desc) + val invalidUrlMessage = stringResource(R.string.custom_url_error_invalid_url) + + DnsEndpointListWithFab( + paddingValues = paddingValues, + items = items, + onFabClick = { showDialog = true } + ) { endpoint -> + DoHEndpointRow(endpoint, appConfig) + } + + if (showDialog) { + FullWidthDialog(onDismiss = { showDialog = false }) { + val dohNameTemplate = stringResource(R.string.cd_custom_doh_url_name) + CustomDohDialogContent( + title = heading, + nameLabel = nameLabel, + urlLabel = urlLabel, + defaultName = defaultName, + initialUrl = "https://", + checkboxLabel = checkboxLabel, + loadNextIndex = { appConfig.getDohCount().plus(1) }, + nameForIndex = { index -> + String.format(dohNameTemplate, index.toString()) + }, + onSubmit = { name, url, isSecure -> + if (checkUrl(url)) { + scope.launch(Dispatchers.IO) { + insertDoHEndpoint(appConfig, name, url, isSecure) + } + showDialog = false + null + } else { + invalidUrlMessage + } + }, + invalidUrlMessage = invalidUrlMessage, + onDismiss = { showDialog = false } + ) + } + } +} + +private suspend fun insertDoHEndpoint(appConfig: AppConfig, name: String, url: String, isSecure: Boolean) { + var dohName = name + if (name.isBlank()) { + dohName = url + } + val doHEndpoint = DoHEndpoint( + id = 0, + dohName, + url, + dohExplanation = "", + isSelected = false, + isCustom = true, + isSecure = isSecure, + modifiedDataTime = 0, + latency = 0 + ) + appConfig.insertDohEndpoint(doHEndpoint) +} + +private fun checkUrl(url: String): Boolean { + return try { + val parsed = URL(url) + parsed.protocol == "https" && + parsed.host.isNotEmpty() && + parsed.path.isNotEmpty() && + parsed.query == null && + parsed.ref == null + } catch (e: MalformedURLException) { + false + } +} + +@Composable +private fun DotListContent( + paddingValues: PaddingValues, + appConfig: AppConfig, + dotViewModel: DoTEndpointViewModel, + scope: CoroutineScope +) { + val context = LocalContext.current + val items = dotViewModel.dohEndpointList.asFlow().collectAsLazyPagingItems() + var showDialog by remember { mutableStateOf(false) } + val heading = stringResource( + R.string.two_argument_space, + stringResource(R.string.lbl_add).replaceFirstChar(Char::titlecase), + stringResource(R.string.lbl_dot) + ) + val nameLabel = stringResource(R.string.cd_doh_dialog_resolver_name) + val urlLabel = stringResource(R.string.cd_doh_dialog_resolver_url) + val dotName = stringResource(R.string.lbl_dot) + val checkboxLabel = stringResource(R.string.cd_doh_dialog_checkbox_desc) + + DnsEndpointListWithFab( + paddingValues = paddingValues, + items = items, + onFabClick = { showDialog = true } + ) { endpoint -> + DoTEndpointRow(endpoint, appConfig) + } + + if (showDialog) { + val title = heading + FullWidthDialog(onDismiss = { showDialog = false }) { + CustomDohDialogContent( + title = title, + nameLabel = nameLabel, + urlLabel = urlLabel, + defaultName = dotName, + initialUrl = "", + checkboxLabel = checkboxLabel, + loadNextIndex = { appConfig.getDoTCount().plus(1) }, + nameForIndex = { index -> dotName + index.toString() }, + onSubmit = { name, url, isSecure -> + scope.launch(Dispatchers.IO) { + insertDotEndpoint(appConfig, name, url, isSecure) + } + showDialog = false + null + }, + invalidUrlMessage = "", + onDismiss = { showDialog = false } + ) + } + } +} + +private suspend fun insertDotEndpoint(appConfig: AppConfig, name: String, url: String, isSecure: Boolean) { + var dotName = name + if (name.isBlank()) { + dotName = url + } + val endpoint = DoTEndpoint( + id = 0, + dotName, + url, + desc = "", + isSelected = false, + isCustom = true, + isSecure = isSecure, + modifiedDataTime = 0, + latency = 0 + ) + appConfig.insertDoTEndpoint(endpoint) +} + +@Composable +private fun DnsProxyListContent( + paddingValues: PaddingValues, + appConfig: AppConfig, + persistentState: PersistentState, + dnsProxyViewModel: DnsProxyEndpointViewModel, + scope: CoroutineScope +) { + val context = LocalContext.current + val items = dnsProxyViewModel.dnsProxyEndpointList.asFlow().collectAsLazyPagingItems() + var showDialog by remember { mutableStateOf(false) } + var appNames by remember { mutableStateOf>(emptyList()) } + var nextIndex by remember { mutableStateOf(0) } + val defaultAppName = stringResource(R.string.settings_app_list_default_app) + + DnsEndpointListWithFab( + paddingValues = paddingValues, + items = items, + onFabClick = { + scope.launch { + val names = withContext(Dispatchers.IO) { + val list: MutableList = ArrayList() + list.add(defaultAppName) + list.addAll(FirewallManager.getAllAppNamesSortedByVpnPermission(context)) + list + } + appNames = names + nextIndex = appConfig.getDnsProxyCount().plus(1) + showDialog = true + } + } + ) { endpoint -> + DnsProxyEndpointRow(endpoint, appConfig) + } + + if (showDialog && appNames.isNotEmpty()) { + FullWidthDialog(onDismiss = { showDialog = false }) { + DnsProxyDialogContent( + appNames = appNames, + nextIndex = nextIndex, + appConfig = appConfig, + persistentState = persistentState, + scope = scope, + onDismiss = { showDialog = false } + ) + } + } +} + +@Composable +private fun DnsProxyDialogContent( + appNames: List, + nextIndex: Int, + appConfig: AppConfig, + persistentState: PersistentState, + scope: CoroutineScope, + onDismiss: () -> Unit +) { + val context = LocalContext.current + var selectedAppIndex by remember { mutableStateOf(0) } + var appMenuExpanded by remember { mutableStateOf(false) } + val dnsProxyDefaultTemplate = stringResource(R.string.cd_custom_dns_proxy_name) + val dnsProxyDefaultIp = stringResource(R.string.cd_custom_dns_proxy_default_ip) + val modeInternal = stringResource(R.string.cd_dns_proxy_mode_internal) + var proxyName by remember { + mutableStateOf(String.format(dnsProxyDefaultTemplate, nextIndex.toString())) + } + var ipAddress by remember { mutableStateOf(dnsProxyDefaultIp) } + var portText by remember { mutableStateOf("") } + var errorText by remember { mutableStateOf("") } + var excludeAppsChecked by remember { mutableStateOf(!persistentState.excludeAppsInProxy) } + val headerText = stringResource(R.string.dns_proxy_dialog_header_dns) + val lockdownModeText = stringResource(R.string.settings_lock_down_mode_desc) + val appText = stringResource(R.string.settings_dns_proxy_dialog_app) + val dnsProxyNameLabel = stringResource(R.string.dns_proxy_name) + val dnsProxyIpAddressLabel = stringResource(R.string.dns_proxy_ip_address) + val dnsProxyPortLabel = stringResource(R.string.dns_proxy_port) + val excludeHeading = stringResource(R.string.settings_exclude_proxy_apps_heading) + val cancelText = stringResource(R.string.lbl_cancel) + val addText = stringResource(R.string.lbl_add) + val modeExternal = stringResource(R.string.cd_dns_proxy_mode_external) + val errorText1 = stringResource(R.string.cd_dns_proxy_error_text_1) + val errorText2 = stringResource(R.string.cd_dns_proxy_error_text_2) + val errorText3 = stringResource(R.string.cd_dns_proxy_error_text_3) + + val lockdown = VpnController.isVpnLockdown() + + Column( + modifier = Modifier.fillMaxWidth().padding(16.dp).verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + Text( + text = headerText, + style = MaterialTheme.typography.titleMedium + ) + + if (lockdown) { + TextButton(onClick = { onDismiss(); UIUtils.openVpnProfile(context) }) { + Text(text = lockdownModeText) + } + } + + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + text = appText, + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.weight(0.3f) + ) + Spacer(modifier = Modifier.width(8.dp)) + Column(modifier = Modifier.weight(0.7f)) { + TextButton(onClick = { appMenuExpanded = true }) { + Text(text = appNames.getOrNull(selectedAppIndex) ?: "") + } + DropdownMenu(expanded = appMenuExpanded, onDismissRequest = { appMenuExpanded = false }) { + appNames.forEachIndexed { index, name -> + DropdownMenuItem( + text = { Text(text = name) }, + onClick = { + selectedAppIndex = index + appMenuExpanded = false + } + ) + } + } + } + } + + OutlinedTextField( + value = proxyName, + onValueChange = { proxyName = it }, + label = { Text(text = dnsProxyNameLabel) }, + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = ipAddress, + onValueChange = { ipAddress = it }, + label = { Text(text = dnsProxyIpAddressLabel) }, + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = portText, + onValueChange = { portText = it }, + label = { Text(text = dnsProxyPortLabel) }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth() + ) + + if (errorText.isNotBlank()) { + Text(text = errorText, color = MaterialTheme.colorScheme.error) + } + + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text(text = excludeHeading) + Checkbox( + checked = excludeAppsChecked, + onCheckedChange = { if (!lockdown) excludeAppsChecked = it }, + enabled = !lockdown + ) + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.End + ) { + TextButton(onClick = onDismiss) { + Text(text = cancelText) + } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { + val mode = modeExternal + val appName = appNames.getOrNull(selectedAppIndex).orEmpty() + val ipAddresses = ipAddress.split(",").map { it.trim() }.filter { it.isNotEmpty() } + if (ipAddresses.isEmpty()) { + errorText = errorText1 + return@Button + } + + val invalidIps = mutableListOf() + val validIps = mutableListOf() + for (ip in ipAddresses) { + if (IPAddressString(ip).isIPAddress) { + validIps.add(ip) + } else { + invalidIps.add(ip) + } + } + + if (invalidIps.isNotEmpty()) { + errorText = errorText1 + + ": ${invalidIps.joinToString(", ")}" + return@Button + } + + val port = portText.toIntOrNull() + if (port == null) { + errorText = errorText3 + return@Button + } + + var isPortValid = true + for (ip in validIps) { + if (Utilities.isLanIpv4(ip) && !Utilities.isValidLocalPort(port)) { + isPortValid = false + break + } + } + + if (!isPortValid) { + errorText = errorText2 + return@Button + } + + val ipString = validIps.joinToString(",") + val isModeInternal = mode == modeInternal + scope.launch(Dispatchers.IO) { + insertDNSProxyEndpointDB( + context, + appConfig, + mode, + proxyName, + appName, + ipString, + port, + defaultApp = appNames.firstOrNull().orEmpty(), + isInternalMode = isModeInternal + ) + } + persistentState.excludeAppsInProxy = !excludeAppsChecked + onDismiss() + } + ) { + Text(text = addText) + } + } + } +} + +private suspend fun insertDNSProxyEndpointDB( + context: android.content.Context, + appConfig: AppConfig, + mode: String, + name: String, + appName: String?, + ip: String, + port: Int, + defaultApp: String, + isInternalMode: Boolean +) { + if (appName == null) return + + val packageName = if (appName == defaultApp) { + "" + } else { + FirewallManager.getPackageNameByAppName(appName) ?: "" + } + var proxyName = name + if (proxyName.isBlank()) { + proxyName = if (isInternalMode) { + appName + } else ip + } + val endpoint = DnsProxyEndpoint( + id = 0, + proxyName, + mode, + packageName, + ip, + port, + isSelected = false, + isCustom = true, + modifiedDataTime = 0L, + latency = 0 + ) + appConfig.insertDnsproxyEndpoint(endpoint) +} + +@Composable +private fun DnsCryptListContent( + paddingValues: PaddingValues, + appConfig: AppConfig, + dnsCryptViewModel: DnsCryptEndpointViewModel, + dnsCryptRelayViewModel: DnsCryptRelayEndpointViewModel, + scope: CoroutineScope +) { + val items = dnsCryptViewModel.dnsCryptEndpointList.asFlow().collectAsLazyPagingItems() + var showDialog by remember { mutableStateOf(false) } + var showRelaysDialog by remember { mutableStateOf(false) } + + Column( + modifier = Modifier.fillMaxSize().padding(paddingValues), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Text( + text = stringResource(R.string.cd_dns_crypt_title), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(horizontal = 4.dp) + ) + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusXl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + onClick = { showRelaysDialog = true } + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = 14.dp, vertical = 10.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = stringResource(R.string.cd_dnscrypt_relay_heading), + style = MaterialTheme.typography.bodyLarge + ) + Text( + text = stringResource(R.string.lbl_configure), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.primary + ) + } + } + DnsEndpointListWithFab( + paddingValues = PaddingValues(0.dp), + items = items, + onFabClick = { showDialog = true } + ) { endpoint -> + DnsCryptRow(endpoint, appConfig) + } + } + + if (showDialog) { + FullWidthDialog(onDismiss = { showDialog = false }) { + DnsCryptDialogContent( + appConfig = appConfig, + scope = scope, + onDismiss = { showDialog = false } + ) + } + } + + if (showRelaysDialog) { + com.celzero.bravedns.ui.dialog.DnsCryptRelaysDialog( + appConfig = appConfig, + relays = dnsCryptRelayViewModel.dnsCryptRelayEndpointList, + onDismiss = { showRelaysDialog = false } + ) + } +} + +@Composable +private fun DnsCryptDialogContent( + appConfig: AppConfig, + scope: CoroutineScope, + onDismiss: () -> Unit +) { + var isServer by remember { mutableStateOf(true) } + var dnscryptNextIndex by remember { mutableStateOf(0) } + var relayNextIndex by remember { mutableStateOf(0) } + val dnsCryptServerNameTemplate = stringResource(R.string.cd_dns_crypt_name) + val dnsCryptRelayNameTemplate = stringResource(R.string.cd_dns_crypt_relay_name) + val dnsCryptNameDefault = stringResource(R.string.cd_dns_crypt_name_default) + var name by remember { mutableStateOf(dnsCryptNameDefault) } + var url by remember { mutableStateOf("") } + var desc by remember { mutableStateOf("") } + var errorText by remember { mutableStateOf("") } + + LaunchedEffect(Unit) { + dnscryptNextIndex = appConfig.getDnscryptCount().plus(1) + relayNextIndex = appConfig.getDnscryptRelayCount().plus(1) + } + + LaunchedEffect(isServer, dnscryptNextIndex, relayNextIndex) { + name = if (isServer) { + String.format(dnsCryptServerNameTemplate, dnscryptNextIndex.toString()) + } else { + String.format(dnsCryptRelayNameTemplate, relayNextIndex.toString()) + } + } + val dialogHeading = stringResource(R.string.cd_dns_crypt_dialog_heading) + val resolverHeading = stringResource(R.string.cd_dns_crypt_resolver_heading) + val relayHeading = stringResource(R.string.cd_dns_crypt_relay_heading) + val dialogNameLabel = stringResource(R.string.cd_dns_crypt_dialog_name) + val dialogStampLabel = stringResource(R.string.cd_dns_crypt_dialog_stamp) + val dialogDescLabel = stringResource(R.string.cd_dns_crypt_dialog_desc) + val cancelText = stringResource(R.string.lbl_cancel) + val addText = stringResource(R.string.lbl_add) + val invalidUrlError = stringResource(R.string.custom_url_error_invalid_url) + + Column( + modifier = Modifier.fillMaxWidth().padding(20.dp).verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + Text( + text = dialogHeading, + style = MaterialTheme.typography.titleMedium + ) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically + ) { + TextButton(onClick = { isServer = true }) { + Text(text = resolverHeading) + } + Spacer(modifier = Modifier.width(10.dp)) + TextButton(onClick = { isServer = false }) { + Text(text = relayHeading) + } + } + + OutlinedTextField( + value = name, + onValueChange = { name = it }, + label = { Text(text = dialogNameLabel) }, + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = url, + onValueChange = { url = it }, + label = { Text(text = dialogStampLabel) }, + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = desc, + onValueChange = { desc = it }, + label = { Text(text = dialogDescLabel) }, + modifier = Modifier.fillMaxWidth() + ) + + if (errorText.isNotBlank()) { + Text(text = errorText, color = MaterialTheme.colorScheme.error) + } + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.End + ) { + TextButton(onClick = onDismiss) { + Text(text = cancelText) + } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { + if (name.isBlank() || url.isBlank()) { + errorText = invalidUrlError + return@Button + } + + if (isServer) { + scope.launch(Dispatchers.IO) { + insertDnsCrypt(appConfig, name, url, desc) + } + } else { + scope.launch(Dispatchers.IO) { + insertDnsCryptRelay(appConfig, name, url, desc) + } + } + onDismiss() + } + ) { + Text(text = addText) + } + } + } +} + +private suspend fun insertDnsCrypt(appConfig: AppConfig, name: String, url: String, desc: String) { + var dnscryptName = name + if (name.isBlank()) { + dnscryptName = url + } + val endpoint = DnsCryptEndpoint( + id = 0, + dnscryptName, + url, + desc, + isSelected = false, + isCustom = true, + modifiedDataTime = 0, + latency = 0 + ) + appConfig.insertDnscryptEndpoint(endpoint) +} + +private suspend fun insertDnsCryptRelay(appConfig: AppConfig, name: String, url: String, desc: String) { + var relayName = name + if (name.isBlank()) { + relayName = url + } + val endpoint = DnsCryptRelayEndpoint( + id = 0, + relayName, + url, + desc, + isSelected = false, + isCustom = true, + modifiedDataTime = 0, + latency = 0 + ) + appConfig.insertDnscryptRelayEndpoint(endpoint) +} + +@Composable +private fun OdohListContent( + paddingValues: PaddingValues, + appConfig: AppConfig, + oDohViewModel: ODoHEndpointViewModel, + scope: CoroutineScope +) { + val context = LocalContext.current + val items = oDohViewModel.dohEndpointList.asFlow().collectAsLazyPagingItems() + var showDialog by remember { mutableStateOf(false) } + val title = stringResource( + R.string.two_argument_space, + stringResource(R.string.lbl_add).replaceFirstChar(Char::uppercase), + stringResource(R.string.lbl_odoh) + ) + val nameLabel = stringResource(R.string.cd_doh_dialog_resolver_name) + val proxyLabel = stringResource(R.string.settings_proxy_header) + stringResource(R.string.lbl_optional) + val resolverLabel = stringResource(R.string.cd_doh_dialog_resolver_url) + val defaultName = stringResource(R.string.lbl_odoh) + val invalidUrlMessage = stringResource(R.string.custom_url_error_invalid_url) + + DnsEndpointListWithFab( + paddingValues = paddingValues, + items = items, + onFabClick = { showDialog = true } + ) { endpoint -> + ODoHEndpointRow(endpoint, appConfig) + } + + if (showDialog) { + FullWidthDialog(onDismiss = { showDialog = false }) { + CustomOdohDialogContent( + title = title, + nameLabel = nameLabel, + proxyLabel = proxyLabel, + resolverLabel = resolverLabel, + defaultName = defaultName, + initialResolver = "https://", + loadNextIndex = { appConfig.getODoHCount().plus(1) }, + invalidUrlMessage = invalidUrlMessage, + onSubmit = { name, proxy, resolver -> + if (checkUrl(resolver)) { + scope.launch(Dispatchers.IO) { + insertOdoh(appConfig, name, proxy, resolver) + } + showDialog = false + null + } else { + invalidUrlMessage + } + }, + onDismiss = { showDialog = false } + ) + } + } +} + +@Composable +private fun FullWidthDialog( + onDismiss: () -> Unit, + content: @Composable () -> Unit +) { + Dialog(onDismissRequest = onDismiss) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = MaterialTheme.shapes.medium, + tonalElevation = 6.dp + ) { + content() + } + } +} + +@Composable +private fun CustomDohDialogContent( + title: String, + nameLabel: String, + urlLabel: String, + defaultName: String, + initialUrl: String, + checkboxLabel: String, + loadNextIndex: suspend () -> Int, + nameForIndex: (Int) -> String, + onSubmit: (String, String, Boolean) -> String?, + invalidUrlMessage: String, + onDismiss: () -> Unit + ) { + var name by remember { mutableStateOf(defaultName) } + var url by remember { mutableStateOf(initialUrl) } + var insecureChecked by remember { mutableStateOf(false) } + var errorText by remember { mutableStateOf("") } + val cancelText = stringResource(R.string.lbl_cancel) + val addText = stringResource(R.string.lbl_add) + + LaunchedEffect(Unit) { + val nextIndex = withContext(Dispatchers.IO) { loadNextIndex() } + name = nameForIndex(nextIndex) + } + + Column( + modifier = Modifier.fillMaxWidth().padding(16.dp).verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + Text(text = title, style = MaterialTheme.typography.titleMedium) + OutlinedTextField( + value = name, + onValueChange = { name = it }, + label = { Text(text = nameLabel) }, + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = url, + onValueChange = { url = it }, + label = { Text(text = urlLabel) }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri), + modifier = Modifier.fillMaxWidth() + ) + Row(verticalAlignment = Alignment.CenterVertically) { + Checkbox(checked = insecureChecked, onCheckedChange = { insecureChecked = it }) + Spacer(modifier = Modifier.width(6.dp)) + Text(text = checkboxLabel) + } + if (errorText.isNotBlank()) { + Text(text = errorText, color = MaterialTheme.colorScheme.error) + } + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) { + TextButton(onClick = onDismiss) { + Text(text = cancelText) + } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { + val isSecure = !insecureChecked + val error = onSubmit(name, url, isSecure) + if (error != null) { + errorText = error.ifBlank { invalidUrlMessage } + } + } + ) { + Text(text = addText) + } + } + } +} + +@Composable +private fun CustomOdohDialogContent( + title: String, + nameLabel: String, + proxyLabel: String, + resolverLabel: String, + defaultName: String, + initialResolver: String, + loadNextIndex: suspend () -> Int, + invalidUrlMessage: String, + onSubmit: (String, String, String) -> String?, + onDismiss: () -> Unit +) { + var name by remember { mutableStateOf(defaultName) } + var proxy by remember { mutableStateOf("") } + var resolver by remember { mutableStateOf(initialResolver) } + var errorText by remember { mutableStateOf("") } + val cancelText = stringResource(R.string.lbl_cancel) + val addText = stringResource(R.string.lbl_add) + + LaunchedEffect(Unit) { + val nextIndex = withContext(Dispatchers.IO) { loadNextIndex() } + name = defaultName + nextIndex.toString() + } + + Column( + modifier = Modifier.fillMaxWidth().padding(16.dp).verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + Text(text = title, style = MaterialTheme.typography.titleMedium) + OutlinedTextField( + value = name, + onValueChange = { name = it }, + label = { Text(text = nameLabel) }, + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = proxy, + onValueChange = { proxy = it }, + label = { Text(text = proxyLabel) }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri), + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = resolver, + onValueChange = { resolver = it }, + label = { Text(text = resolverLabel) }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri), + modifier = Modifier.fillMaxWidth() + ) + if (errorText.isNotBlank()) { + Text(text = errorText, color = MaterialTheme.colorScheme.error) + } + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) { + TextButton(onClick = onDismiss) { + Text(text = cancelText) + } + Spacer(modifier = Modifier.width(8.dp)) + Button( + onClick = { + val error = onSubmit(name, proxy, resolver) + if (error != null) { + errorText = error.ifBlank { invalidUrlMessage } + } + } + ) { + Text(text = addText) + } + } + } +} + +private suspend fun insertOdoh(appConfig: AppConfig, name: String, proxy: String, resolver: String) { + var odohName = name + if (name.isBlank()) { + odohName = resolver + } + val endpoint = ODoHEndpoint( + id = 0, + odohName, + proxy, + resolver, + proxyIps = "", + desc = "", + isSelected = false, + isCustom = true, + modifiedDataTime = 0, + latency = 0 + ) + appConfig.insertODoHEndpoint(endpoint) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/dns/ConfigureRethinkBasicScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/dns/ConfigureRethinkBasicScreen.kt new file mode 100644 index 000000000..289952143 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/dns/ConfigureRethinkBasicScreen.kt @@ -0,0 +1,1315 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.dns + +import android.content.Context +import android.widget.Toast +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.background +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.FilterList +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FilledTonalButton +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.unit.dp +import androidx.core.text.HtmlCompat +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.asFlow +import androidx.paging.compose.collectAsLazyPagingItems +import androidx.work.WorkInfo +import androidx.work.WorkManager +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.LocalAdvancedBlocklistRow +import com.celzero.bravedns.adapter.LocalSimpleBlocklistRow +import com.celzero.bravedns.adapter.RemoteAdvancedBlocklistRow +import com.celzero.bravedns.adapter.RemoteSimpleBlocklistRow +import com.celzero.bravedns.adapter.RethinkEndpointRow +import com.celzero.bravedns.customdownloader.LocalBlocklistCoordinator.Companion.CUSTOM_DOWNLOAD +import com.celzero.bravedns.customdownloader.RemoteBlocklistCoordinator +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.data.FileTag +import com.celzero.bravedns.database.LocalBlocklistPacksMap +import com.celzero.bravedns.database.RemoteBlocklistPacksMap +import com.celzero.bravedns.database.RethinkLocalFileTag +import com.celzero.bravedns.database.RethinkRemoteFileTag +import com.celzero.bravedns.download.AppDownloadManager +import com.celzero.bravedns.download.DownloadConstants.Companion.DOWNLOAD_TAG +import com.celzero.bravedns.download.DownloadConstants.Companion.FILE_TAG +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.service.RethinkBlocklistManager +import com.celzero.bravedns.service.RethinkBlocklistManager.getStamp +import com.celzero.bravedns.service.RethinkBlocklistManager.getTagsFromStamp +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetActionRow +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetCard +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkFilterChip +import com.celzero.bravedns.ui.compose.theme.RethinkMultiActionDialog +import com.celzero.bravedns.ui.compose.theme.RethinkSecondaryActionStyle +import com.celzero.bravedns.ui.compose.theme.RethinkTwoOptionSegmentedRow +import com.celzero.bravedns.ui.rethink.RethinkBlocklistState +import com.celzero.bravedns.util.Constants +import com.celzero.bravedns.util.Constants.Companion.DEAD_PACK +import com.celzero.bravedns.util.Constants.Companion.DEFAULT_RDNS_REMOTE_DNS_NAMES +import com.celzero.bravedns.util.Constants.Companion.MAX_ENDPOINT +import com.celzero.bravedns.util.Constants.Companion.RETHINK_STAMP_VERSION +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.getRemoteBlocklistStamp +import com.celzero.bravedns.util.Utilities.hasLocalBlocklists +import com.celzero.bravedns.util.Utilities.hasRemoteBlocklists +import com.celzero.bravedns.util.Utilities.showToastUiCentered +import com.celzero.bravedns.viewmodel.LocalBlocklistPacksMapViewModel +import com.celzero.bravedns.viewmodel.RemoteBlocklistPacksMapViewModel +import com.celzero.bravedns.viewmodel.RethinkEndpointViewModel +import com.celzero.bravedns.viewmodel.RethinkLocalFileTagViewModel +import com.celzero.bravedns.viewmodel.RethinkRemoteFileTagViewModel +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkModalBottomSheet +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import io.github.aakira.napier.Napier +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.util.regex.Pattern + +enum class ConfigureRethinkScreenType { + REMOTE, + LOCAL, + DB_LIST +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ConfigureRethinkBasicScreen( + screenType: ConfigureRethinkScreenType, + remoteName: String = "", + remoteUrl: String = "", + uid: Int = Constants.MISSING_UID, + persistentState: PersistentState, + appConfig: AppConfig, + appDownloadManager: AppDownloadManager, + rethinkEndpointViewModel: RethinkEndpointViewModel, + remoteFileTagViewModel: RethinkRemoteFileTagViewModel, + localFileTagViewModel: RethinkLocalFileTagViewModel, + remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, + localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val localBlocklistVersionTemplate = stringResource(R.string.settings_local_blocklist_version) + val downloadSuccessMessage = stringResource(R.string.download_update_dialog_message_success) + val downloadFailureMessage = stringResource(R.string.download_update_dialog_failure_message) + val filterDescriptionTemplate = stringResource(R.string.rt_filter_desc) + val filterDescriptionSubgroupsTemplate = stringResource(R.string.rt_filter_desc_subgroups) + + val blocklistType = remember { + if (screenType == ConfigureRethinkScreenType.LOCAL) { + RethinkBlocklistManager.RethinkBlocklistType.LOCAL + } else { + RethinkBlocklistManager.RethinkBlocklistType.REMOTE + } + } + + val filters = remember { MutableLiveData(RethinkBlocklistState.Filters()) } + + var showDownload by remember { mutableStateOf(false) } + var showConfigure by remember { mutableStateOf(false) } + var isDownloading by remember { mutableStateOf(false) } + var showRemoteProgress by remember { mutableStateOf(false) } + var activeView by remember { mutableStateOf(RethinkBlocklistState.BlocklistView.PACKS) } + var updateAvailable by remember { mutableStateOf(false) } + var checkUpdateVisible by remember { mutableStateOf(false) } + var redownloadVisible by remember { mutableStateOf(false) } + var checkUpdateInProgress by remember { mutableStateOf(false) } + var updateInProgress by remember { mutableStateOf(false) } + var isMax by remember { mutableStateOf(false) } + var filterLabelText by remember { mutableStateOf("") } + var showPlusFilterSheet by remember { mutableStateOf(false) } + var showLockdownDialog by remember { mutableStateOf(false) } + var lockdownDialogType by remember { mutableStateOf(null) } + var showApplyChangesDialog by remember { mutableStateOf(false) } + var plusFilterTags by remember { mutableStateOf>(emptyList()) } + var modifiedStamp by remember { mutableStateOf("") } + + fun getStampValue(): String { + return if (blocklistType.isLocal()) { + persistentState.localBlocklistStamp + } else { + getRemoteBlocklistStamp(remoteUrl) + } + } + + fun getRemoteUrl(stamp: String): String { + return if (remoteUrl.contains(MAX_ENDPOINT)) { + Constants.RETHINK_BASE_URL_MAX + stamp + } else { + Constants.RETHINK_BASE_URL_SKY + stamp + } + } + + fun isStampChanged(): Boolean { + if (DEFAULT_RDNS_REMOTE_DNS_NAMES.contains(remoteName)) { + return false + } + return getStampValue() != modifiedStamp + } + + fun hasBlocklists(): Boolean { + return if (blocklistType.isLocal()) { + hasLocalBlocklists(context, persistentState.localBlocklistTimestamp) + } else { + hasRemoteBlocklists(context, persistentState.remoteBlocklistTimestamp) + } + } + + fun setStamp(stamp: String?) { + Napier.i("set stamp for blocklist type: ${blocklistType.name} with $stamp") + if (stamp == null) { + Napier.i("stamp is null") + return + } + + scope.launch(Dispatchers.IO) { + val blocklistCount = getTagsFromStamp(stamp, blocklistType).size + if (blocklistType.isLocal()) { + persistentState.localBlocklistStamp = stamp + persistentState.numberOfLocalBlocklists = blocklistCount + persistentState.blocklistEnabled = true + } else { + appConfig.updateRethinkEndpoint( + Constants.RETHINK_DNS_PLUS, + getRemoteUrl(stamp), + blocklistCount + ) + appConfig.enableRethinkDnsPlus() + } + } + } + + suspend fun processSelectedFileTags(stamp: String) { + val list = RethinkBlocklistManager.getTagsFromStamp(stamp, blocklistType) + updateSelectedFileTags(list.toMutableSet(), blocklistType) + } + + fun onDownloadStart() { + isDownloading = true + showDownload = true + showConfigure = false + } + + fun onDownloadFail() { + isDownloading = false + showDownload = true + showConfigure = false + showRemoteProgress = false + } + + fun onDownloadSuccess() { + isDownloading = false + showDownload = false + showConfigure = true + showRemoteProgress = false + showToastUiCentered( + context, + downloadSuccessMessage, + Toast.LENGTH_SHORT + ) + } + + fun handleDownloadStatus(status: AppDownloadManager.DownloadManagerStatus) { + when (status) { + AppDownloadManager.DownloadManagerStatus.IN_PROGRESS -> {} + AppDownloadManager.DownloadManagerStatus.STARTED -> onDownloadStart() + AppDownloadManager.DownloadManagerStatus.FAILURE -> onDownloadFail() + AppDownloadManager.DownloadManagerStatus.NOT_AVAILABLE -> { + showToastUiCentered( + context, + "Download latest version to update the blocklists", + Toast.LENGTH_SHORT + ) + } + + else -> {} + } + } + + fun proceedWithBlocklistDownload(type: RethinkBlocklistManager.RethinkBlocklistType) { + scope.launch { + if (type.isLocal()) { + val status = withContext(Dispatchers.IO) { + appDownloadManager.downloadLocalBlocklist( + persistentState.localBlocklistTimestamp, + isRedownload = false + ) + } + handleDownloadStatus(status) + } else { + withContext(Dispatchers.IO) { + appDownloadManager.downloadRemoteBlocklist( + persistentState.remoteBlocklistTimestamp, + isRedownload = true + ) + } + showRemoteProgress = false + // Refresh blocklist availability + val blocklistsExist = withContext(Dispatchers.IO) { hasBlocklists() } + if (blocklistsExist) { + showConfigure = true + showDownload = false + } else { + showConfigure = false + showDownload = true + } + } + } + } + + fun downloadBlocklist(type: RethinkBlocklistManager.RethinkBlocklistType) { + if (VpnController.isVpnLockdown() && !persistentState.useCustomDownloadManager) { + lockdownDialogType = type + showLockdownDialog = true + return + } + proceedWithBlocklistDownload(type) + } + + fun cancelDownload() { + appDownloadManager.cancelDownload(type = RethinkBlocklistManager.DownloadType.LOCAL) + } + + fun refreshBlocklistAvailability() { + scope.launch { + val blocklistsExist = withContext(Dispatchers.IO) { hasBlocklists() } + if (blocklistsExist) { + showConfigure = true + showDownload = false + return@launch + } + + showConfigure = false + showDownload = true + if (!blocklistType.isLocal()) { + showRemoteProgress = true + downloadBlocklist(blocklistType) + } + } + } + + fun updateMaxSwitchUi() { + scope.launch { + var endpointUrl: String? = null + withContext(Dispatchers.IO) { endpointUrl = appConfig.getRethinkPlusEndpoint()?.url } + isMax = endpointUrl?.contains(Constants.MAX_ENDPOINT) == true + } + } + + fun isBlocklistUpdateAvailable(): Boolean { + Napier.d( + "Update available? newest: ${persistentState.newestRemoteBlocklistTimestamp}, available: ${persistentState.remoteBlocklistTimestamp}" + ) + return (persistentState.newestRemoteBlocklistTimestamp != Constants.INIT_TIME_MS && + persistentState.newestRemoteBlocklistTimestamp > persistentState.remoteBlocklistTimestamp) + } + + fun refreshUpdateUi() { + if (persistentState.remoteBlocklistTimestamp == Constants.INIT_TIME_MS) { + updateAvailable = false + checkUpdateVisible = false + redownloadVisible = false + return + } + + if (isBlocklistUpdateAvailable()) { + updateAvailable = true + checkUpdateVisible = false + redownloadVisible = false + return + } + + updateAvailable = false + checkUpdateVisible = true + redownloadVisible = false + } + + fun checkBlocklistUpdate() { + scope.launch(Dispatchers.IO) { + appDownloadManager.isDownloadRequired(RethinkBlocklistManager.DownloadType.REMOTE) + } + } + + fun download(timestamp: Long, isRedownload: Boolean) { + scope.launch(Dispatchers.IO) { + val initiated = appDownloadManager.downloadRemoteBlocklist(timestamp, isRedownload) + if (!initiated) { + withContext(Dispatchers.Main) { + showToastUiCentered( + context, + downloadFailureMessage, + Toast.LENGTH_SHORT + ) + } + } + } + } + + fun applyChangesAndFinish() { + setStamp(modifiedStamp) + onBackClick?.invoke() + } + + fun revertChangesAndFinish() { + scope.launch { + val stamp = getStampValue() + val list = RethinkBlocklistManager.getTagsFromStamp(stamp, blocklistType) + updateSelectedFileTags(list.toMutableSet(), blocklistType) + setStamp(stamp) + onBackClick?.invoke() + } + } + + // Back handler for unsaved changes + if (screenType != ConfigureRethinkScreenType.DB_LIST) { + BackHandler { + if (!isStampChanged()) { + onBackClick?.invoke() + return@BackHandler + } + showApplyChangesDialog = true + } + } + + // Dialogs + if (showLockdownDialog && lockdownDialogType != null) { + val type = lockdownDialogType ?: return + RethinkConfirmDialog( + onDismissRequest = { showLockdownDialog = false }, + title = stringResource(R.string.lockdown_download_enable_inapp), + message = stringResource(R.string.lockdown_download_message), + confirmText = stringResource(R.string.lockdown_download_enable_inapp), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + showLockdownDialog = false + persistentState.useCustomDownloadManager = true + downloadBlocklist(type) + }, + onDismiss = { + showLockdownDialog = false + proceedWithBlocklistDownload(type) + } + ) + } + + if (showApplyChangesDialog) { + RethinkMultiActionDialog( + onDismissRequest = { showApplyChangesDialog = false }, + title = stringResource(R.string.rt_dialog_title), + message = stringResource(R.string.rt_dialog_message), + primaryText = stringResource(R.string.lbl_apply), + onPrimary = { + showApplyChangesDialog = false + setStamp(modifiedStamp) + onBackClick?.invoke() + }, + secondaryText = stringResource(R.string.rt_dialog_neutral), + onSecondary = { showApplyChangesDialog = false }, + tertiaryText = stringResource(R.string.notif_dialog_pause_dialog_negative), + onTertiary = { + showApplyChangesDialog = false + onBackClick?.invoke() + } + ) + } + + val title = when (screenType) { + ConfigureRethinkScreenType.DB_LIST -> stringResource(R.string.dc_rethink_dns_radio) + ConfigureRethinkScreenType.LOCAL -> stringResource(R.string.dc_local_block_heading) + ConfigureRethinkScreenType.REMOTE -> stringResource(R.string.dc_rethink_dns_radio) + } + val subtitle = when (screenType) { + ConfigureRethinkScreenType.LOCAL, + ConfigureRethinkScreenType.REMOTE -> stringResource(R.string.dns_desc) + else -> null + } + + Scaffold( + containerColor = MaterialTheme.colorScheme.surface, + topBar = { + RethinkLargeTopBar( + title = title, + subtitle = subtitle, + onBackClick = if (onBackClick == null) null else { + { + if (screenType != ConfigureRethinkScreenType.DB_LIST && isStampChanged()) { + showApplyChangesDialog = true + } else { + onBackClick() + } + } + } + ) + } + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + when (screenType) { + ConfigureRethinkScreenType.DB_LIST -> { + RethinkListContent( + modifier = Modifier.weight(1f), + context = context, + persistentState = persistentState, + appConfig = appConfig, + appDownloadManager = appDownloadManager, + rethinkEndpointViewModel = rethinkEndpointViewModel, + uid = uid, + isMax = isMax, + updateAvailable = updateAvailable, + checkUpdateVisible = checkUpdateVisible, + redownloadVisible = redownloadVisible, + checkUpdateInProgress = checkUpdateInProgress, + updateInProgress = updateInProgress, + onMaxChanged = { isMax = it }, + onUpdateMaxSwitchUi = { updateMaxSwitchUi() }, + onRefreshUpdateUi = { refreshUpdateUi() }, + onCheckUpdateInProgressChanged = { checkUpdateInProgress = it }, + onUpdateInProgressChanged = { updateInProgress = it }, + onCheckBlocklistUpdate = { checkBlocklistUpdate() }, + onDownload = { timestamp, isRedownload -> download(timestamp, isRedownload) }, + localBlocklistVersionTemplate = localBlocklistVersionTemplate, + downloadFailureMessage = downloadFailureMessage + ) + } + + else -> { + RethinkBlocklistContent( + modifier = Modifier.weight(1f), + context = context, + blocklistType = blocklistType, + filters = filters, + remoteFileTagViewModel = remoteFileTagViewModel, + localFileTagViewModel = localFileTagViewModel, + remoteBlocklistPacksMapViewModel = remoteBlocklistPacksMapViewModel, + localBlocklistPacksMapViewModel = localBlocklistPacksMapViewModel, + showDownload = showDownload, + showConfigure = showConfigure, + isDownloading = isDownloading, + showRemoteProgress = showRemoteProgress, + activeView = activeView, + filterLabelText = filterLabelText, + showPlusFilterSheet = showPlusFilterSheet, + plusFilterTags = plusFilterTags, + onActiveViewChanged = { activeView = it }, + onFilterLabelTextChanged = { filterLabelText = it }, + onShowPlusFilterSheetChanged = { showPlusFilterSheet = it }, + onPlusFilterTagsChanged = { plusFilterTags = it }, + onDownloadBlocklist = { downloadBlocklist(blocklistType) }, + onCancelDownload = { cancelDownload(); onBackClick?.invoke() }, + onApplyChanges = { applyChangesAndFinish() }, + onRevertChanges = { revertChangesAndFinish() }, + onRefreshBlocklistAvailability = { refreshBlocklistAvailability() }, + filterDescriptionTemplate = filterDescriptionTemplate, + filterDescriptionSubgroupsTemplate = filterDescriptionSubgroupsTemplate, + onProcessSelectedFileTags = { stamp -> + scope.launch { processSelectedFileTags(stamp) } + }, + onModifiedStampChanged = { modifiedStamp = it }, + getStampValue = { getStampValue() }, + onDownloadStart = { onDownloadStart() }, + onDownloadFail = { onDownloadFail() }, + onDownloadSuccess = { onDownloadSuccess() } + ) + } + } + } + } + + if (showPlusFilterSheet) { + RethinkPlusFilterSheet( + fileTags = plusFilterTags, + filters = filters, + onDismiss = { showPlusFilterSheet = false } + ) + } +} + +@Composable +private fun RethinkListContent( + modifier: Modifier = Modifier, + context: Context, + persistentState: PersistentState, + appConfig: AppConfig, + appDownloadManager: AppDownloadManager, + rethinkEndpointViewModel: RethinkEndpointViewModel, + uid: Int, + isMax: Boolean, + updateAvailable: Boolean, + checkUpdateVisible: Boolean, + redownloadVisible: Boolean, + checkUpdateInProgress: Boolean, + updateInProgress: Boolean, + onMaxChanged: (Boolean) -> Unit, + onUpdateMaxSwitchUi: () -> Unit, + onRefreshUpdateUi: () -> Unit, + onCheckUpdateInProgressChanged: (Boolean) -> Unit, + onUpdateInProgressChanged: (Boolean) -> Unit, + onCheckBlocklistUpdate: () -> Unit, + onDownload: (Long, Boolean) -> Unit, + localBlocklistVersionTemplate: String, + downloadFailureMessage: String +) { + val scope = rememberCoroutineScope() + val pagingItems = rethinkEndpointViewModel.rethinkEndpointList.asFlow().collectAsLazyPagingItems() + val workInfos by WorkManager.getInstance(context) + .getWorkInfosByTagLiveData(RemoteBlocklistCoordinator.REMOTE_DOWNLOAD_WORKER) + .asFlow() + .collectAsState(initial = emptyList()) + + LaunchedEffect(Unit) { + rethinkEndpointViewModel.setFilter(uid) + onUpdateMaxSwitchUi() + onRefreshUpdateUi() + } + + LaunchedEffect(workInfos) { + val workInfo = workInfos.getOrNull(0) ?: return@LaunchedEffect + Napier.i("Remote blocklist worker state: ${workInfo.state}") + when (workInfo.state) { + WorkInfo.State.SUCCEEDED -> { + onCheckUpdateInProgressChanged(false) + onUpdateInProgressChanged(false) + onRefreshUpdateUi() + } + + WorkInfo.State.CANCELLED, + WorkInfo.State.FAILED -> { + onCheckUpdateInProgressChanged(false) + onUpdateInProgressChanged(false) + onRefreshUpdateUi() + Utilities.showToastUiCentered( + context, + downloadFailureMessage, + Toast.LENGTH_SHORT + ) + } + + else -> {} + } + } + + Column( + modifier = modifier + .fillMaxSize() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + val actionText = + when { + updateAvailable -> stringResource(id = R.string.rt_chip_update_available) + checkUpdateVisible -> stringResource(id = R.string.rt_chip_check_update) + redownloadVisible -> stringResource(id = R.string.rt_re_download) + else -> null + } + val actionInProgress = + when { + updateAvailable || redownloadVisible -> updateInProgress + checkUpdateVisible -> checkUpdateInProgress + else -> false + } + + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadius3xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.22f)), + tonalElevation = 0.dp + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 14.dp, vertical = 12.dp), + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + if (persistentState.remoteBlocklistTimestamp != Constants.INIT_TIME_MS || actionText != null) { + Text( + text = localBlocklistVersionTemplate.format( + Utilities.convertLongToTime( + persistentState.remoteBlocklistTimestamp, + Constants.TIME_FORMAT_2 + ) + ), + style = MaterialTheme.typography.bodyMedium + ) + } + + if (actionText != null) { + FilledTonalButton( + onClick = { + when { + updateAvailable -> { + onUpdateInProgressChanged(true) + onDownload(persistentState.remoteBlocklistTimestamp, false) + } + checkUpdateVisible -> { + onCheckUpdateInProgressChanged(true) + onCheckBlocklistUpdate() + } + redownloadVisible -> { + onUpdateInProgressChanged(true) + onDownload(persistentState.remoteBlocklistTimestamp, true) + } + } + }, + enabled = !actionInProgress + ) { + if (actionInProgress) { + CircularProgressIndicator( + modifier = Modifier.height(16.dp).width(16.dp), + strokeWidth = 2.dp + ) + Spacer(modifier = Modifier.width(6.dp)) + } + Text(text = actionText) + } + } + } + } + + RethinkTwoOptionSegmentedRow( + leftLabel = stringResource(id = R.string.radio_sky_btn), + rightLabel = stringResource(id = R.string.radio_max_btn), + leftSelected = !isMax, + onLeftClick = { + scope.launch(Dispatchers.IO) { appConfig.switchRethinkDnsToSky() } + onMaxChanged(false) + }, + onRightClick = { + scope.launch(Dispatchers.IO) { appConfig.switchRethinkDnsToMax() } + onMaxChanged(true) + } + ) + + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadiusXl), + color = MaterialTheme.colorScheme.surfaceContainerLow + ) { + Text( + text = if (isMax) { + stringResource(id = R.string.rethink_max_desc) + } else { + stringResource(id = R.string.rethink_sky_desc) + }, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp) + ) + } + + Text( + text = stringResource(R.string.dc_rethink_dns_radio), + style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.padding(start = 2.dp) + ) + + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = androidx.compose.foundation.layout.PaddingValues(bottom = Dimensions.spacing2xl), + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + items(count = pagingItems.itemCount) { index -> + val item = pagingItems[index] ?: return@items + RethinkEndpointRow(endpoint = item, appConfig = appConfig) + } + } + } +} + +@Composable +private fun RethinkBlocklistContent( + modifier: Modifier = Modifier, + context: Context, + blocklistType: RethinkBlocklistManager.RethinkBlocklistType, + filters: MutableLiveData, + remoteFileTagViewModel: RethinkRemoteFileTagViewModel, + localFileTagViewModel: RethinkLocalFileTagViewModel, + remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, + localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, + showDownload: Boolean, + showConfigure: Boolean, + isDownloading: Boolean, + showRemoteProgress: Boolean, + activeView: RethinkBlocklistState.BlocklistView, + filterLabelText: String, + showPlusFilterSheet: Boolean, + plusFilterTags: List, + onActiveViewChanged: (RethinkBlocklistState.BlocklistView) -> Unit, + onFilterLabelTextChanged: (String) -> Unit, + onShowPlusFilterSheetChanged: (Boolean) -> Unit, + onPlusFilterTagsChanged: (List) -> Unit, + onDownloadBlocklist: () -> Unit, + onCancelDownload: () -> Unit, + onApplyChanges: () -> Unit, + onRevertChanges: () -> Unit, + onRefreshBlocklistAvailability: () -> Unit, + onProcessSelectedFileTags: (String) -> Unit, + onModifiedStampChanged: (String) -> Unit, + getStampValue: () -> String, + onDownloadStart: () -> Unit, + onDownloadFail: () -> Unit, + onDownloadSuccess: () -> Unit, + filterDescriptionTemplate: String, + filterDescriptionSubgroupsTemplate: String +) { + val scope = rememberCoroutineScope() + val filterState by filters.asFlow().collectAsState(initial = filters.value) + val selectedTags by RethinkBlocklistState.selectedFileTags.asFlow() + .collectAsState(initial = RethinkBlocklistState.selectedFileTags.value) + + // Observe blocklist download state + val workManager = WorkManager.getInstance(context) + val customDownload by workManager.getWorkInfosByTagLiveData(CUSTOM_DOWNLOAD).asFlow() + .collectAsState(initial = emptyList()) + val downloadTag by workManager.getWorkInfosByTagLiveData(DOWNLOAD_TAG).asFlow() + .collectAsState(initial = emptyList()) + val fileTag by workManager.getWorkInfosByTagLiveData(FILE_TAG).asFlow() + .collectAsState(initial = emptyList()) + + LaunchedEffect(Unit) { + val stamp = getStampValue() + onModifiedStampChanged(stamp) + onProcessSelectedFileTags(stamp) + onRefreshBlocklistAvailability() + } + + LaunchedEffect(filterState) { + val filter = filterState ?: return@LaunchedEffect + if (blocklistType.isRemote()) { + remoteFileTagViewModel.setFilter(filter) + } else { + localFileTagViewModel.setFilter(filter) + } + onFilterLabelTextChanged( + buildFilterDescription( + filter, + filterDescriptionTemplate, + filterDescriptionSubgroupsTemplate + ) + ) + } + + LaunchedEffect(selectedTags) { + val tags = selectedTags ?: emptySet() + val stamp = getStamp(tags, blocklistType) + onModifiedStampChanged(stamp) + } + + LaunchedEffect(customDownload) { + val workInfo = customDownload.getOrNull(0) ?: return@LaunchedEffect + when (workInfo.state) { + WorkInfo.State.ENQUEUED, + WorkInfo.State.RUNNING -> onDownloadStart() + + WorkInfo.State.SUCCEEDED -> onDownloadSuccess() + WorkInfo.State.CANCELLED, + WorkInfo.State.FAILED -> onDownloadFail() + + else -> Unit + } + } + + LaunchedEffect(downloadTag) { + val workInfo = downloadTag.getOrNull(0) ?: return@LaunchedEffect + when (workInfo.state) { + WorkInfo.State.ENQUEUED, + WorkInfo.State.RUNNING -> onDownloadStart() + + WorkInfo.State.CANCELLED, + WorkInfo.State.FAILED -> onDownloadFail() + + else -> Unit + } + } + + LaunchedEffect(fileTag) { + val workInfo = fileTag.getOrNull(0) ?: return@LaunchedEffect + when (workInfo.state) { + WorkInfo.State.SUCCEEDED -> onDownloadSuccess() + WorkInfo.State.CANCELLED, + WorkInfo.State.FAILED -> onDownloadFail() + + else -> Unit + } + } + + fun isRethinkStampSearch(t: String): Boolean { + if (!t.contains(Constants.RETHINKDNS_DOMAIN)) return false + + val split = t.split("/") + split.forEach { + if (it.contains("$RETHINK_STAMP_VERSION:") && isBase64(it)) { + scope.launch(Dispatchers.IO) { onProcessSelectedFileTags(it) } + showToastUiCentered(context, "Blocklists restored", Toast.LENGTH_SHORT) + return true + } + } + return false + } + + fun addQueryToFilters(query: String) { + val current = filters.value + if (current == null) { + val temp = RethinkBlocklistState.Filters() + temp.query = formatQuery(query) + filters.postValue(temp) + return + } + current.query = formatQuery(query) + filters.postValue(current) + } + + fun applyFilter(tag: Any) { + val a = filters.value ?: RethinkBlocklistState.Filters() + when (tag) { + RethinkBlocklistState.BlocklistSelectionFilter.ALL.id -> { + a.filterSelected = RethinkBlocklistState.BlocklistSelectionFilter.ALL + } + + RethinkBlocklistState.BlocklistSelectionFilter.SELECTED.id -> { + a.filterSelected = RethinkBlocklistState.BlocklistSelectionFilter.SELECTED + } + } + filters.postValue(a) + } + + fun openFilterBottomSheet() { + scope.launch { + val tags = withContext(Dispatchers.IO) { + if (blocklistType.isLocal()) { + localFileTagViewModel.allFileTags() + } else { + remoteFileTagViewModel.allFileTags() + } + } + onPlusFilterTagsChanged(tags) + onShowPlusFilterSheetChanged(true) + } + } + + fun toggleRemoteFiletag(filetag: RethinkRemoteFileTag, selected: Boolean) { + scope.launch(Dispatchers.IO) { + filetag.isSelected = selected + RethinkBlocklistManager.updateFiletagRemote(filetag) + val list = RethinkBlocklistManager.getSelectedFileTagsRemote().toSet() + RethinkBlocklistState.updateFileTagList(list) + } + } + + fun toggleLocalFiletag(filetag: RethinkLocalFileTag, selected: Boolean) { + scope.launch(Dispatchers.IO) { + filetag.isSelected = selected + RethinkBlocklistManager.updateFiletagLocal(filetag) + val list = RethinkBlocklistManager.getSelectedFileTagsLocal().toSet() + RethinkBlocklistState.updateFileTagList(list) + } + } + + fun toggleLocalSimplePack(map: LocalBlocklistPacksMap, selected: Boolean) { + scope.launch(Dispatchers.IO) { + RethinkBlocklistManager.updateFiletagsLocal(map.blocklistIds.toSet(), if (selected) 1 else 0) + val list = RethinkBlocklistManager.getSelectedFileTagsLocal().toSet() + RethinkBlocklistState.updateFileTagList(list) + } + } + + fun toggleRemoteSimplePack(map: RemoteBlocklistPacksMap, selected: Boolean) { + scope.launch(Dispatchers.IO) { + RethinkBlocklistManager.updateFiletagsRemote(map.blocklistIds.toSet(), if (selected) 1 else 0) + val list = RethinkBlocklistManager.getSelectedFileTagsRemote().toSet() + RethinkBlocklistState.updateFileTagList(list) + } + } + + Column( + modifier = modifier + .fillMaxSize() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + if (showDownload) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadius3xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)) + ) { + Column( + modifier = Modifier.padding(horizontal = 14.dp, vertical = 12.dp), + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + Text( + text = stringResource(id = R.string.rt_download_desc), + style = MaterialTheme.typography.bodyMedium + ) + if (showRemoteProgress || isDownloading) { + CircularProgressIndicator( + modifier = Modifier.size(20.dp), + strokeWidth = 2.dp + ) + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { + FilledTonalButton( + onClick = onDownloadBlocklist, + enabled = !isDownloading + ) { + Text(text = stringResource(id = R.string.rt_download)) + } + TextButton(onClick = onCancelDownload) { + Text(text = stringResource(id = R.string.lbl_cancel)) + } + } + } + } + } + + if (showConfigure) { + RethinkTwoOptionSegmentedRow( + leftLabel = stringResource(id = R.string.rt_list_simple_btn_txt), + rightLabel = stringResource(id = R.string.lbl_advanced), + leftSelected = activeView == RethinkBlocklistState.BlocklistView.PACKS, + onLeftClick = { onActiveViewChanged(RethinkBlocklistState.BlocklistView.PACKS) }, + onRightClick = { onActiveViewChanged(RethinkBlocklistState.BlocklistView.ADVANCED) } + ) + + if (activeView == RethinkBlocklistState.BlocklistView.ADVANCED) { + OutlinedTextField( + value = filterState?.query?.replace("%", "") ?: "", + onValueChange = { query -> + if (!isRethinkStampSearch(query)) { + addQueryToFilters(query) + } + }, + label = { Text(text = stringResource(id = R.string.lbl_search)) }, + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search), + modifier = Modifier.fillMaxWidth(), + singleLine = true + ) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + RethinkFilterChip( + label = stringResource(id = R.string.lbl_all), + selected = filterState?.filterSelected == RethinkBlocklistState.BlocklistSelectionFilter.ALL, + onClick = { applyFilter(RethinkBlocklistState.BlocklistSelectionFilter.ALL.id) } + ) + RethinkFilterChip( + label = stringResource(id = R.string.rt_filter_parent_selected), + selected = filterState?.filterSelected == RethinkBlocklistState.BlocklistSelectionFilter.SELECTED, + onClick = { applyFilter(RethinkBlocklistState.BlocklistSelectionFilter.SELECTED.id) } + ) + Spacer(modifier = Modifier.weight(1f)) + IconButton(onClick = { openFilterBottomSheet() }) { + Icon( + imageVector = Icons.Filled.FilterList, + contentDescription = stringResource(id = R.string.cd_filter) + ) + } + } + Text( + text = filterLabelText.ifEmpty { stringResource(id = R.string.rt_filter_hint) }, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + + if (blocklistType.isLocal()) { + val advancedItems = localFileTagViewModel.localFiletags.asFlow().collectAsLazyPagingItems() + LazyColumn( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(6.dp), + contentPadding = androidx.compose.foundation.layout.PaddingValues(bottom = 6.dp) + ) { + items(count = advancedItems.itemCount) { index -> + val item = advancedItems[index] ?: return@items + val previous = if (index > 0) advancedItems.peek(index - 1) else null + val showHeader = previous?.group != item.group + LocalAdvancedBlocklistRow( + filetag = item, + showHeader = showHeader + ) { isSelected -> + toggleLocalFiletag(item, isSelected) + } + } + } + } else { + val advancedItems = remoteFileTagViewModel.remoteFileTags.asFlow().collectAsLazyPagingItems() + LazyColumn( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(6.dp), + contentPadding = androidx.compose.foundation.layout.PaddingValues(bottom = 6.dp) + ) { + items(count = advancedItems.itemCount) { index -> + val item = advancedItems[index] ?: return@items + val previous = if (index > 0) advancedItems.peek(index - 1) else null + val showHeader = previous?.group != item.group + RemoteAdvancedBlocklistRow( + filetag = item, + showHeader = showHeader + ) { isSelected -> + toggleRemoteFiletag(item, isSelected) + } + } + } + } + } else { + if (blocklistType.isLocal()) { + val simpleItems = localBlocklistPacksMapViewModel.simpleTags.asFlow().collectAsLazyPagingItems() + LazyColumn( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(6.dp), + contentPadding = androidx.compose.foundation.layout.PaddingValues(bottom = 6.dp) + ) { + items(count = simpleItems.itemCount) { index -> + val item = simpleItems[index] ?: return@items + val previous = if (index > 0) simpleItems.peek(index - 1) else null + val showHeader = previous?.group != item.group + val valid = !item.pack.contains(DEAD_PACK) && item.pack.isNotEmpty() + if (!valid) return@items + LocalSimpleBlocklistRow( + map = item, + showHeader = showHeader + ) { isSelected -> + toggleLocalSimplePack(item, isSelected) + } + } + } + } else { + val simpleItems = remoteBlocklistPacksMapViewModel.simpleTags.asFlow().collectAsLazyPagingItems() + LazyColumn( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(6.dp), + contentPadding = androidx.compose.foundation.layout.PaddingValues(bottom = 6.dp) + ) { + items(count = simpleItems.itemCount) { index -> + val item = simpleItems[index] ?: return@items + val previous = if (index > 0) simpleItems.peek(index - 1) else null + val showHeader = previous?.group != item.group + val valid = !item.pack.contains(DEAD_PACK) && item.pack.isNotEmpty() + if (!valid) return@items + RemoteSimpleBlocklistRow( + map = item, + showHeader = showHeader + ) { isSelected -> + toggleRemoteSimplePack(item, isSelected) + } + } + } + } + } + + RethinkBottomSheetActionRow( + secondaryText = stringResource(id = R.string.notif_dialog_pause_dialog_negative), + primaryText = stringResource(id = R.string.lbl_apply), + onSecondaryClick = onRevertChanges, + onPrimaryClick = onApplyChanges, + secondaryStyle = RethinkSecondaryActionStyle.TEXT + ) + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun RethinkPlusFilterSheet( + fileTags: List, + filters: MutableLiveData, + onDismiss: () -> Unit +) { + val subGroups = remember(fileTags) { + fileTags + .map { it.subg.trim() } + .filter { it.isNotBlank() } + .distinct() + .sorted() + } + val initialFilters = filters.value + var selectedSubgroups by remember { mutableStateOf(initialFilters?.subGroups?.toSet() ?: emptySet()) } + val selectedCount = selectedSubgroups.size + + RethinkModalBottomSheet(onDismissRequest = onDismiss, includeBottomSpacer = true) { + RethinkBottomSheetCard(contentPadding = PaddingValues(Dimensions.cardPadding)) { + Text( + text = stringResource(R.string.bsrf_sub_group_heading), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurface + ) + Text( + text = "${stringResource(R.string.rt_filter_parent_selected)}: $selectedCount", + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + FlowRow( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + subGroups.forEach { label -> + val selected = selectedSubgroups.contains(label) + RethinkFilterChip( + label = label, + selected = selected, + onClick = { + selectedSubgroups = toggleSelection(selectedSubgroups, label) + } + ) + } + } + } + + RethinkBottomSheetActionRow( + secondaryText = stringResource(R.string.bsrf_clear_filter), + primaryText = stringResource(R.string.lbl_apply), + onSecondaryClick = { + filters.postValue(RethinkBlocklistState.Filters()) + onDismiss() + }, + onPrimaryClick = { + val updated = initialFilters ?: RethinkBlocklistState.Filters() + updated.subGroups.clear() + updated.subGroups.addAll(selectedSubgroups) + filters.postValue(updated) + onDismiss() + }, + primaryEnabled = true, + secondaryStyle = RethinkSecondaryActionStyle.TEXT + ) + } +} + +private fun toggleSelection(current: Set, value: String): Set { + return if (current.contains(value)) { + current - value + } else { + current + value + } +} + +private suspend fun updateSelectedFileTags( + selectedTags: MutableSet, + blocklistType: RethinkBlocklistManager.RethinkBlocklistType +) { + if (selectedTags.isEmpty()) { + if (blocklistType.isLocal()) { + RethinkBlocklistManager.clearTagsSelectionLocal() + } else { + RethinkBlocklistManager.clearTagsSelectionRemote() + } + return + } + + if (blocklistType.isLocal()) { + RethinkBlocklistManager.clearTagsSelectionLocal() + RethinkBlocklistManager.updateFiletagsLocal(selectedTags, 1) + val list = RethinkBlocklistManager.getSelectedFileTagsLocal().toSet() + RethinkBlocklistState.updateFileTagList(list) + } else { + RethinkBlocklistManager.clearTagsSelectionRemote() + RethinkBlocklistManager.updateFiletagsRemote(selectedTags, 1) + val list = RethinkBlocklistManager.getSelectedFileTagsRemote().toSet() + RethinkBlocklistState.updateFileTagList(list) + } +} + +private fun formatQuery(q: String): String { + return "%$q%" +} + +private fun isBase64(stamp: String): Boolean { + val whitespaceRegex = "\\s" + val pattern = Pattern.compile( + "^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$" + ) + + val versionSplit = stamp.split(":").getOrNull(1) ?: return false + if (versionSplit.isEmpty()) return false + + val result = versionSplit.replace(whitespaceRegex, "") + return pattern.matcher(result).matches() +} + +private fun buildFilterDescription( + filter: RethinkBlocklistState.Filters, + filterDescriptionTemplate: String, + filterDescriptionSubgroupsTemplate: String +): String { + val text = if (filter.subGroups.isEmpty()) { + filterDescriptionTemplate.format(filter.filterSelected.name.lowercase()) + } else { + filterDescriptionSubgroupsTemplate.format( + filter.filterSelected.name.lowercase(), + "", + filter.subGroups + ) + } + return HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY).toString() +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/dns/DnsListScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/dns/DnsListScreen.kt new file mode 100644 index 000000000..79185b750 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/dns/DnsListScreen.kt @@ -0,0 +1,323 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.dns + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.net.doh.Transaction +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.firestack.backend.Backend +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private enum class DnsCapabilityDot { + Fast, + Private, + Secure, + Anonymous +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DnsListScreen( + appConfig: AppConfig, + onConfigureOtherDns: (Int) -> Unit, + onConfigureRethinkBasic: (Int) -> Unit, + onBackClick: (() -> Unit)? = null +) { + var selectedType by remember { mutableStateOf(null) } + var selectedWorking by remember { mutableStateOf(false) } + + LaunchedEffect(Unit) { + val (dnsType, isWorking) = withContext(Dispatchers.IO) { + val id = if (appConfig.isSmartDnsEnabled()) Backend.Plus else Backend.Preferred + val state = VpnController.getDnsStatus(id) + val working = if (state == null) false else when (Transaction.Status.fromId(state)) { + Transaction.Status.COMPLETE, Transaction.Status.START -> true + else -> false + } + appConfig.getDnsType() to working + } + selectedType = dnsType + selectedWorking = isWorking + } + + Scaffold( + containerColor = MaterialTheme.colorScheme.background, + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.lbl_dns_servers), + subtitle = stringResource(R.string.dns_desc), + onBackClick = onBackClick, + ) + } + ) { paddingValues -> + LazyColumn( + state = rememberLazyListState(), + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingMd, + bottom = Dimensions.spacingLg + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + // DNS protocol cards grid + item { + SectionHeader(title = stringResource(R.string.lbl_configure)) + Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + DnsCard( + label = stringResource(R.string.dc_doh), + title = stringResource(R.string.cd_custom_doh_url_name_default), + dots = listOf(DnsCapabilityDot.Private, DnsCapabilityDot.Secure), + type = AppConfig.DnsType.DOH, + selectedType = selectedType, + selectedWorking = selectedWorking, + modifier = Modifier.weight(1f), + onClick = { onConfigureOtherDns(DnsScreenType.DOH.index) } + ) + DnsCard( + label = stringResource(R.string.lbl_dot_abbr), + title = stringResource(R.string.lbl_dot), + dots = listOf(DnsCapabilityDot.Private, DnsCapabilityDot.Secure), + type = AppConfig.DnsType.DOT, + selectedType = selectedType, + selectedWorking = selectedWorking, + modifier = Modifier.weight(1f), + onClick = { onConfigureOtherDns(DnsScreenType.DOT.index) } + ) + } + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + DnsCard( + label = stringResource(R.string.dc_dns_crypt), + title = stringResource(R.string.cd_dns_crypt_name_default), + dots = listOf(DnsCapabilityDot.Private, DnsCapabilityDot.Secure, DnsCapabilityDot.Anonymous), + type = AppConfig.DnsType.DNSCRYPT, + selectedType = selectedType, + selectedWorking = selectedWorking, + modifier = Modifier.weight(1f), + onClick = { onConfigureOtherDns(DnsScreenType.DNS_CRYPT.index) } + ) + DnsCard( + label = stringResource(R.string.lbl_dp_abbr), + title = stringResource(R.string.lbl_dp), + dots = listOf(DnsCapabilityDot.Fast), + type = AppConfig.DnsType.DNS_PROXY, + selectedType = selectedType, + selectedWorking = selectedWorking, + modifier = Modifier.weight(1f), + onClick = { onConfigureOtherDns(DnsScreenType.DNS_PROXY.index) } + ) + } + Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) { + DnsCard( + label = stringResource(R.string.lbl_odoh_abbr), + title = stringResource(R.string.lbl_odoh), + dots = listOf(DnsCapabilityDot.Private, DnsCapabilityDot.Secure, DnsCapabilityDot.Anonymous), + type = AppConfig.DnsType.ODOH, + selectedType = selectedType, + selectedWorking = selectedWorking, + modifier = Modifier.weight(1f), + onClick = { onConfigureOtherDns(DnsScreenType.ODOH.index) } + ) + DnsCard( + label = stringResource(R.string.dc_rethink_dns_radio), + title = stringResource(R.string.lbl_rdns), + dots = listOf(DnsCapabilityDot.Fast, DnsCapabilityDot.Private, DnsCapabilityDot.Secure), + type = AppConfig.DnsType.RETHINK_REMOTE, + selectedType = selectedType, + selectedWorking = selectedWorking, + modifier = Modifier.weight(1f), + onClick = { onConfigureRethinkBasic(0) } + ) + } + } + } + + // Legend + item { LegendRow() } + } + } +} + +// ─── DNS Card ───────────────────────────────────────────────────────────────── + +@Composable +private fun DnsCard( + label: String, + title: String, + dots: List, + type: AppConfig.DnsType, + selectedType: AppConfig.DnsType?, + selectedWorking: Boolean, + modifier: Modifier = Modifier, + onClick: () -> Unit +) { + val isSelected = selectedType == type + val containerColor = when { + isSelected && selectedWorking -> MaterialTheme.colorScheme.primaryContainer + isSelected && !selectedWorking -> MaterialTheme.colorScheme.errorContainer + else -> MaterialTheme.colorScheme.surfaceContainerLow + } + val labelColor = when { + isSelected && selectedWorking -> MaterialTheme.colorScheme.onPrimaryContainer + isSelected && !selectedWorking -> MaterialTheme.colorScheme.onErrorContainer + else -> MaterialTheme.colorScheme.onSurfaceVariant + } + val titleColor = when { + isSelected && selectedWorking -> MaterialTheme.colorScheme.primary + isSelected && !selectedWorking -> MaterialTheme.colorScheme.error + else -> MaterialTheme.colorScheme.onSurface + } + + Surface( + modifier = modifier.aspectRatio(1.24f), + shape = RoundedCornerShape(Dimensions.cornerRadius2xl), + color = containerColor, + tonalElevation = 0.dp, + onClick = onClick + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(14.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.SpaceEvenly + ) { + // Protocol name — small label + Text( + text = title, + style = MaterialTheme.typography.labelMedium, + fontWeight = FontWeight.Medium, + color = labelColor, + textAlign = TextAlign.Center + ) + + // Abbreviation — large and prominent + Text( + text = label, + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.ExtraBold, + color = titleColor, + textAlign = TextAlign.Center + ) + + // Capability dots + Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) { + dots.forEach { dot -> + DotIndicator(dot = dot) + } + } + } + } +} + +// ─── Legend Row ─────────────────────────────────────────────────────────────── + +@Composable +private fun LegendRow() { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusLg), + color = MaterialTheme.colorScheme.surfaceContainerLow + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.spacingLg, vertical = Dimensions.spacingMd) + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(20.dp), + verticalAlignment = Alignment.CenterVertically + ) { + LegendItem(DnsCapabilityDot.Fast, stringResource(R.string.lbl_fast)) + LegendItem(DnsCapabilityDot.Private, stringResource(R.string.lbl_private)) + LegendItem(DnsCapabilityDot.Secure, stringResource(R.string.lbl_secure)) + LegendItem(DnsCapabilityDot.Anonymous, stringResource(R.string.lbl_anonymous)) + } + } +} + +@Composable +private fun LegendItem(dot: DnsCapabilityDot, label: String) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + DotIndicator(dot = dot) + Text( + text = label, + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } +} + +@Composable +private fun DotIndicator(dot: DnsCapabilityDot, modifier: Modifier = Modifier) { + val color = + when (dot) { + DnsCapabilityDot.Fast -> MaterialTheme.colorScheme.error + DnsCapabilityDot.Private -> MaterialTheme.colorScheme.tertiary + DnsCapabilityDot.Secure -> MaterialTheme.colorScheme.primary + DnsCapabilityDot.Anonymous -> MaterialTheme.colorScheme.secondary + } + + Box( + modifier = + modifier + .size(10.dp) + .background(color = color, shape = CircleShape) + ) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/dns/DnsSettingsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/dns/DnsSettingsScreen.kt new file mode 100644 index 000000000..c3b7ab72a --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/dns/DnsSettingsScreen.kt @@ -0,0 +1,702 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.dns + +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.tween +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.rotate +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkActionListItem +import com.celzero.bravedns.ui.compose.theme.RethinkRadioListItem +import com.celzero.bravedns.ui.compose.theme.RethinkToggleListItem +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.ui.compose.theme.rememberReducedMotion +import kotlinx.coroutines.delay +import java.net.URI +import kotlin.math.roundToInt + +private fun dnsFocusSectionIndex(focusKey: String): Int? { + return when (focusKey) { + "dns_mode", + "dns_mode_system", + "dns_mode_custom", + "dns_mode_rethink", + "dns_mode_smart" -> 0 + "dns_blocklist", + "dns_block_local", + "dns_block_custom_downloader", + "dns_block_periodic_updates" -> 1 + "dns_filtering", + "dns_filter_alg", + "dns_filter_split", + "dns_filter_rules_as_firewall", + "dns_filter_record_types" -> 2 + "dns_advanced", + "dns_advanced_favicon", + "dns_advanced_cache", + "dns_advanced_proxy_dns", + "dns_advanced_undelegated", + "dns_advanced_fallback", + "dns_advanced_leaks" -> 3 + else -> null + } +} + +private fun dnsFocusTarget( + focusKey: String, + isShowSplitDns: Boolean, + isShowBypassDnsBlock: Boolean +): Pair? { + val rowHeight = 82 + val groupStart = 62 + + fun groupOffset(row: Int): Int = groupStart + (rowHeight * row) + + val modeRow = + when (focusKey) { + "dns_mode_system" -> 0 + "dns_mode_custom" -> 1 + "dns_mode_rethink" -> 2 + "dns_mode_smart" -> 3 + else -> null + } + if (modeRow != null) return 0 to groupOffset(modeRow) + + val blockRow = + when (focusKey) { + "dns_block_local" -> 0 + "dns_block_custom_downloader" -> 1 + "dns_block_periodic_updates" -> 2 + else -> null + } + if (blockRow != null) return 1 to groupOffset(blockRow) + + val filteringRow = + when (focusKey) { + "dns_filter_alg" -> 0 + "dns_filter_split" -> if (isShowSplitDns) 1 else null + "dns_filter_rules_as_firewall" -> + when { + isShowSplitDns && isShowBypassDnsBlock -> 2 + !isShowSplitDns && isShowBypassDnsBlock -> 1 + else -> null + } + "dns_filter_record_types" -> + when { + isShowSplitDns && isShowBypassDnsBlock -> 3 + isShowSplitDns || isShowBypassDnsBlock -> 2 + else -> 1 + } + else -> null + } + if (filteringRow != null) return 2 to groupOffset(filteringRow) + + val advancedRow = + when (focusKey) { + "dns_advanced_favicon" -> 0 + "dns_advanced_cache" -> 1 + "dns_advanced_proxy_dns" -> 2 + "dns_advanced_undelegated" -> 3 + "dns_advanced_fallback" -> 4 + "dns_advanced_leaks" -> 5 + else -> null + } + if (advancedRow != null) return 3 to groupOffset(advancedRow) + + return null +} + +private fun connectedDnsDisplayName(raw: String): String { + val name = raw.substringBefore(",").trim() + return if (name.isBlank()) "--" else name +} + +private fun connectedDnsEndpoint(raw: String): String { + return raw.substringAfter(",", "").trim() +} + +private fun endpointHost(value: String): String { + if (value.isBlank()) return "" + return runCatching { URI(value).host.orEmpty() }.getOrDefault("") +} + +private fun connectedProtocolLabel(dnsType: AppConfig.DnsType, endpoint: String): String { + return when (dnsType) { + AppConfig.DnsType.DOH, + AppConfig.DnsType.RETHINK_REMOTE, + AppConfig.DnsType.SMART_DNS -> { + if (endpoint.startsWith("https://", true)) "HTTPS" + else if (endpoint.startsWith("http://", true)) "HTTP" + else "DNS" + } + AppConfig.DnsType.DOT -> "DoT" + AppConfig.DnsType.ODOH -> "ODoH" + AppConfig.DnsType.DNSCRYPT -> "DNSCrypt" + AppConfig.DnsType.DNS_PROXY -> "DNS Proxy" + AppConfig.DnsType.SYSTEM_DNS -> "System DNS" + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DnsSettingsScreen( + uiState: DnsSettingsUiState, + initialFocusKey: String? = null, + onRefreshClick: () -> Unit, + onSystemDnsClick: () -> Unit, + onSystemDnsInfoClick: () -> Unit, + onCustomDnsClick: () -> Unit, + onRethinkPlusDnsClick: () -> Unit, + onSmartDnsClick: () -> Unit, + onSmartDnsInfoClick: () -> Unit, + onLocalBlocklistClick: () -> Unit, + onCustomDownloaderChange: (Boolean) -> Unit, + onPeriodicUpdateChange: (Boolean) -> Unit, + onDnsAlgChange: (Boolean) -> Unit, + onSplitDnsChange: (Boolean) -> Unit, + onBypassDnsBlockChange: (Boolean) -> Unit, + onAllowedRecordTypesClick: () -> Unit, + onFavIconChange: (Boolean) -> Unit, + onDnsCacheChange: (Boolean) -> Unit, + onProxyDnsChange: (Boolean) -> Unit, + onUndelegatedDomainsChange: (Boolean) -> Unit, + onFallbackChange: (Boolean) -> Unit, + onPreventLeaksChange: (Boolean) -> Unit +) { + val listState = rememberLazyListState() + val density = LocalDensity.current + val initialFocus = initialFocusKey?.trim().orEmpty() + var pendingFocusKey by rememberSaveable(initialFocus) { mutableStateOf(initialFocus) } + var activeFocusKey by rememberSaveable(initialFocus) { + mutableStateOf(initialFocus.ifBlank { null }) + } + val reducedMotion = rememberReducedMotion() + val refreshRotation by animateFloatAsState( + targetValue = if (uiState.isRefreshing && !reducedMotion) 360f else 0f, + animationSpec = if (uiState.isRefreshing && !reducedMotion) { + infiniteRepeatable( + animation = tween(durationMillis = 1000, easing = LinearEasing), + repeatMode = RepeatMode.Restart + ) + } else { + tween(durationMillis = 0) + }, + label = "dnsRefreshRotation" + ) + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + LaunchedEffect(pendingFocusKey, uiState.isShowSplitDns, uiState.isShowBypassDnsBlock) { + val key = pendingFocusKey.trim() + if (key.isBlank()) return@LaunchedEffect + activeFocusKey = key + val target = + dnsFocusTarget( + focusKey = key, + isShowSplitDns = uiState.isShowSplitDns, + isShowBypassDnsBlock = uiState.isShowBypassDnsBlock + ) + if (target != null) { + val (index, offsetDp) = target + val offsetPx = with(density) { offsetDp.dp.toPx().roundToInt() } + listState.animateScrollToItem(index, offsetPx) + delay(900) + if (activeFocusKey == key) { + activeFocusKey = null + } + pendingFocusKey = "" + return@LaunchedEffect + } + + val index = dnsFocusSectionIndex(key) + if (index != null) { + listState.animateScrollToItem(index) + delay(750) + if (activeFocusKey == key) { + activeFocusKey = null + } + } + pendingFocusKey = "" + } + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + containerColor = MaterialTheme.colorScheme.background, + topBar = { + RethinkLargeTopBar( + title = stringResource(id = R.string.lbl_dns), + scrollBehavior = scrollBehavior, + actions = { + IconButton(onClick = onRefreshClick) { + Icon( + imageVector = ImageVector.vectorResource(id = R.drawable.ic_refresh_white), + contentDescription = stringResource(id = R.string.rules_load_failure_reload), + modifier = Modifier.rotate(refreshRotation) + ) + } + } + ) + } + ) { paddingValues -> + LazyColumn( + state = listState, + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingMd, + bottom = Dimensions.spacing2xl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + item { + SectionHeader(title = stringResource(id = R.string.dc_other_dns_heading)) + RethinkListGroup { + val dnsModeItemCount = 4 + + DnsRadioButtonItem( + title = stringResource(id = R.string.network_dns), + description = stringResource(id = R.string.dns_mode_system_desc), + selected = uiState.isSystemDnsEnabled, + onClick = onSystemDnsClick, + onInfoClick = onSystemDnsInfoClick, + iconId = R.drawable.ic_network, + highlighted = activeFocusKey == "dns_mode_system", + position = cardPositionFor(0, dnsModeItemCount - 1) + ) + DnsRadioButtonItem( + title = stringResource(id = R.string.dc_custom_dns_radio), + description = stringResource(id = R.string.dns_mode_other_desc), + selected = !uiState.isSystemDnsEnabled && !uiState.isRethinkDnsConnected && !uiState.isSmartDnsEnabled, + onClick = onCustomDnsClick, + iconId = R.drawable.ic_filter, + highlighted = activeFocusKey == "dns_mode_custom", + position = cardPositionFor(1, dnsModeItemCount - 1) + ) + DnsRadioButtonItem( + title = stringResource(id = R.string.dc_rethink_dns_radio), + description = stringResource(id = R.string.dns_mode_rethink_desc), + selected = uiState.isRethinkDnsConnected, + onClick = onRethinkPlusDnsClick, + iconId = R.drawable.ic_rethink_plus, + highlighted = activeFocusKey == "dns_mode_rethink", + position = cardPositionFor(2, dnsModeItemCount - 1) + ) + DnsRadioButtonItem( + title = stringResource(id = R.string.smart_dns), + description = stringResource(id = R.string.dns_mode_smart_desc), + selected = uiState.isSmartDnsEnabled, + onClick = onSmartDnsClick, + onInfoClick = onSmartDnsInfoClick, + iconId = R.drawable.ic_dns_cache, + highlighted = activeFocusKey == "dns_mode_smart", + position = cardPositionFor(3, dnsModeItemCount - 1) + ) + } + } + + if (uiState.isRethinkDnsConnected) { + item { + RethinkDnsStatusCard( + connectedDnsRaw = uiState.connectedDnsName, + dnsType = uiState.dnsType, + latency = uiState.dnsLatency, + highlighted = activeFocusKey == "dns_mode_rethink" + ) + } + } + + item { + SectionHeader(title = stringResource(id = R.string.dc_block_heading)) + RethinkListGroup { + RethinkListItem( + headline = stringResource(id = R.string.dc_local_block_heading), + supporting = if (uiState.blocklistEnabled) { + stringResource( + id = R.string.settings_local_blocklist_in_use, + uiState.numberOfLocalBlocklists + ) + } else { + stringResource(id = R.string.dc_local_block_desc_1) + }, + leadingIconPainter = painterResource(id = R.drawable.ic_local_blocklist), + position = CardPosition.First, + highlighted = activeFocusKey == "dns_block_local", + onClick = onLocalBlocklistClick, + trailing = { + Text( + text = if (uiState.blocklistEnabled) { + stringResource(id = R.string.dc_local_block_enabled) + } else { + stringResource(id = R.string.lbl_disabled) + }, + style = MaterialTheme.typography.labelMedium, + color = if (uiState.blocklistEnabled) { + MaterialTheme.colorScheme.primary + } else { + MaterialTheme.colorScheme.error + }, + fontWeight = FontWeight.Bold + ) + } + ) + ToggleListItem( + title = stringResource(id = R.string.settings_custom_downloader_heading), + description = stringResource(id = R.string.settings_custom_downloader_desc), + iconId = R.drawable.ic_update, + checked = uiState.useCustomDownloadManager, + position = CardPosition.Middle, + highlighted = activeFocusKey == "dns_block_custom_downloader", + onCheckedChange = onCustomDownloaderChange + ) + ToggleListItem( + title = stringResource(id = R.string.dc_check_update_heading), + description = stringResource(id = R.string.dc_check_update_desc_compact), + iconId = R.drawable.ic_blocklist_update_check, + checked = uiState.periodicallyCheckBlocklistUpdate, + position = CardPosition.Last, + highlighted = activeFocusKey == "dns_block_periodic_updates", + onCheckedChange = onPeriodicUpdateChange + ) + } + } + + item { + SectionHeader(title = stringResource(id = R.string.dc_filtering_heading)) + RethinkListGroup { + ToggleListItem( + title = stringResource(id = R.string.cd_dns_alg_heading), + description = stringResource(id = R.string.cd_dns_alg_desc), + iconId = R.drawable.ic_adv_dns_filter, + checked = uiState.enableDnsAlg, + position = CardPosition.First, + highlighted = activeFocusKey == "dns_filter_alg", + onCheckedChange = onDnsAlgChange + ) + if (uiState.isShowSplitDns) { + ToggleListItem( + title = stringResource(id = R.string.cd_split_dns_heading), + description = stringResource(id = R.string.cd_split_dns_desc), + iconId = R.drawable.ic_split_dns, + checked = uiState.splitDns, + position = CardPosition.Middle, + highlighted = activeFocusKey == "dns_filter_split", + onCheckedChange = onSplitDnsChange + ) + } + if (uiState.isShowBypassDnsBlock) { + ToggleListItem( + title = stringResource(id = R.string.cd_treat_dns_rules_firewall_heading), + description = stringResource(id = R.string.cd_treat_dns_rules_firewall_desc), + iconId = R.drawable.ic_dns_rules_as_firewall, + checked = uiState.bypassBlockInDns, + position = CardPosition.Middle, + highlighted = activeFocusKey == "dns_filter_rules_as_firewall", + onCheckedChange = onBypassDnsBlockChange + ) + } + RethinkActionListItem( + title = stringResource(id = R.string.cd_allowed_dns_record_types_heading), + description = stringResource(id = R.string.cd_allowed_dns_record_types_desc), + iconPainter = painterResource(id = R.drawable.ic_allow_dns_records), + position = CardPosition.Last, + highlighted = activeFocusKey == "dns_filter_record_types", + onClick = onAllowedRecordTypesClick, + trailing = { + Text( + text = if (uiState.dnsRecordTypesAutoMode) { + stringResource(id = R.string.dns_record_types_auto_mode_status) + } else { + uiState.allowedDnsRecordTypesSize.toString() + }, + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.primary, + fontWeight = FontWeight.Bold + ) + } + ) + } + } + + item { + SectionHeader(title = stringResource(id = R.string.lbl_advanced)) + RethinkListGroup { + ToggleListItem( + title = stringResource(id = R.string.dc_dns_website_heading), + description = stringResource(id = R.string.dc_dns_website_desc), + iconId = R.drawable.ic_fav_icon, + checked = uiState.fetchFavIcon, + position = CardPosition.First, + highlighted = activeFocusKey == "dns_advanced_favicon", + onCheckedChange = onFavIconChange + ) + ToggleListItem( + title = stringResource(id = R.string.dc_setting_dns_cache_heading), + description = stringResource(id = R.string.dc_setting_dns_cache_desc), + iconId = R.drawable.ic_auto_start, + checked = uiState.enableDnsCache, + position = CardPosition.Middle, + highlighted = activeFocusKey == "dns_advanced_cache", + onCheckedChange = onDnsCacheChange + ) + ToggleListItem( + title = stringResource(id = R.string.dc_proxy_dns_heading), + description = stringResource(id = R.string.dc_proxy_dns_desc), + iconId = R.drawable.ic_proxy, + checked = !uiState.proxyDns, + position = CardPosition.Middle, + highlighted = activeFocusKey == "dns_advanced_proxy_dns", + onCheckedChange = { onProxyDnsChange(!it) } + ) + ToggleListItem( + title = stringResource(id = R.string.dc_use_sys_dns_undelegated_heading), + description = stringResource(id = R.string.dc_use_sys_dns_undelegated_desc), + iconId = R.drawable.ic_split_dns, + checked = uiState.useSystemDnsForUndelegatedDomains, + position = CardPosition.Middle, + highlighted = activeFocusKey == "dns_advanced_undelegated", + onCheckedChange = onUndelegatedDomainsChange + ) + ToggleListItem( + title = stringResource(id = R.string.use_fallback_dns_to_bypass), + description = stringResource(id = R.string.use_fallback_dns_to_bypass_desc), + iconId = R.drawable.ic_use_fallback_bypass, + checked = uiState.useFallbackDnsToBypass, + position = CardPosition.Middle, + highlighted = activeFocusKey == "dns_advanced_fallback", + onCheckedChange = onFallbackChange + ) + ToggleListItem( + title = stringResource(id = R.string.dc_dns_leaks_heading), + description = stringResource(id = R.string.dc_dns_leaks_desc), + iconId = R.drawable.ic_prevent_dns_leaks, + checked = uiState.preventDnsLeaks, + position = CardPosition.Last, + highlighted = activeFocusKey == "dns_advanced_leaks", + onCheckedChange = onPreventLeaksChange + ) + } + } + } + } +} + +@Composable +private fun RethinkDnsStatusCard( + connectedDnsRaw: String, + dnsType: AppConfig.DnsType, + latency: String, + highlighted: Boolean +) { + val endpoint = connectedDnsEndpoint(connectedDnsRaw) + val host = endpointHost(endpoint) + val protocol = connectedProtocolLabel(dnsType, endpoint) + val latencyText = latency.removePrefix("(").removeSuffix(")") + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.spacingSm, vertical = Dimensions.spacingXs), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + Surface( + shape = RoundedCornerShape(Dimensions.iconContainerRadius), + color = MaterialTheme.colorScheme.primaryContainer + ) { + Icon( + painter = painterResource(id = R.drawable.ic_rethink_plus), + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimaryContainer, + modifier = Modifier.padding(8.dp) + ) + } + + Column(modifier = Modifier.weight(1f)) { + Text( + text = stringResource(id = R.string.dc_rethink_dns_radio), + style = MaterialTheme.typography.labelMedium, + color = if (highlighted) { + MaterialTheme.colorScheme.primary + } else { + MaterialTheme.colorScheme.onSurfaceVariant + } + ) + Text( + text = connectedDnsDisplayName(connectedDnsRaw), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + + if (latencyText.isNotBlank()) { + DnsStatusPill( + text = latencyText, + containerColor = MaterialTheme.colorScheme.tertiaryContainer, + contentColor = MaterialTheme.colorScheme.onTertiaryContainer + ) + } + } + + Text( + text = stringResource(id = R.string.rethink_sky_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 2, + overflow = TextOverflow.Ellipsis + ) + + Row( + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically + ) { + DnsStatusPill( + text = protocol, + containerColor = MaterialTheme.colorScheme.secondaryContainer, + contentColor = MaterialTheme.colorScheme.onSecondaryContainer + ) + if (host.isNotBlank()) { + DnsStatusPill( + text = host, + containerColor = MaterialTheme.colorScheme.surfaceContainerHighest, + contentColor = MaterialTheme.colorScheme.onSurface + ) + } + } + } +} + +@Composable +private fun DnsStatusPill( + text: String, + containerColor: androidx.compose.ui.graphics.Color, + contentColor: androidx.compose.ui.graphics.Color +) { + Surface( + shape = RoundedCornerShape(999.dp), + color = containerColor + ) { + Text( + text = text, + style = MaterialTheme.typography.labelMedium, + color = contentColor, + modifier = Modifier.padding(horizontal = 10.dp, vertical = 5.dp), + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } +} + +@Composable +fun DnsRadioButtonItem( + title: String, + description: String? = null, + selected: Boolean, + onClick: () -> Unit, + iconId: Int, + highlighted: Boolean = false, + onInfoClick: (() -> Unit)? = null, + position: CardPosition = CardPosition.Middle +) { + RethinkRadioListItem( + title = title, + description = description, + selected = selected, + onSelect = onClick, + iconRes = iconId, + position = position, + highlighted = highlighted, + onInfoClick = onInfoClick + ) +} + +@Composable +fun ToggleListItem( + title: String, + description: String, + iconId: Int, + checked: Boolean, + highlighted: Boolean = false, + position: CardPosition = CardPosition.Middle, + onCheckedChange: (Boolean) -> Unit +) { + RethinkToggleListItem( + title = title, + description = description, + checked = checked, + onCheckedChange = onCheckedChange, + iconRes = iconId, + position = position, + highlighted = highlighted + ) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/dns/DnsSettingsViewModel.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/dns/DnsSettingsViewModel.kt new file mode 100644 index 000000000..e7ea0c886 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/dns/DnsSettingsViewModel.kt @@ -0,0 +1,194 @@ +package com.celzero.bravedns.ui.compose.dns + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.scheduler.WorkScheduler +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.util.Utilities.isAtleastR +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class DnsSettingsUiState( + val connectedDnsName: String = "--", + val connectedDnsType: String = "--", + val dnsLatency: String = "", + val dnsType: AppConfig.DnsType = AppConfig.DnsType.DOH, + val isSmartDnsEnabled: Boolean = false, + val isSystemDnsEnabled: Boolean = false, + val isRethinkDnsConnected: Boolean = false, + val fetchFavIcon: Boolean = false, + val preventDnsLeaks: Boolean = false, + val enableDnsAlg: Boolean = false, + val periodicallyCheckBlocklistUpdate: Boolean = false, + val useCustomDownloadManager: Boolean = false, + val enableDnsCache: Boolean = false, + val proxyDns: Boolean = false, + val useSystemDnsForUndelegatedDomains: Boolean = false, + val useFallbackDnsToBypass: Boolean = false, + val blocklistEnabled: Boolean = false, + val numberOfLocalBlocklists: Int = 0, + val bypassBlockInDns: Boolean = false, + val splitDns: Boolean = false, + val dnsRecordTypesAutoMode: Boolean = false, + val allowedDnsRecordTypesSize: Int = 0, + val isShowSplitDns: Boolean = false, + val isShowBypassDnsBlock: Boolean = false, + val isRefreshing: Boolean = false +) + +class DnsSettingsViewModel( + private val persistentState: PersistentState, + private val appConfig: AppConfig, + private val workScheduler: WorkScheduler +) : ViewModel() { + + private val _uiState = MutableStateFlow(DnsSettingsUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + updateUiState() + // We might want to observe appConfig.getConnectedDnsObservable() + // but for now we'll just pull it. + } + + fun updateUiState() { + viewModelScope.launch { + val type = appConfig.getDnsType() + val isSmart = appConfig.isSmartDnsEnabled() + val isSystem = appConfig.isSystemDns() + val isRethink = appConfig.isRethinkDnsConnected() + val connectedName = persistentState.connectedDnsName + + _uiState.update { + it.copy( + dnsType = type, + isSmartDnsEnabled = isSmart, + isSystemDnsEnabled = isSystem, + isRethinkDnsConnected = isRethink, + connectedDnsName = connectedName, + fetchFavIcon = persistentState.fetchFavIcon, + preventDnsLeaks = persistentState.preventDnsLeaks, + enableDnsAlg = persistentState.enableDnsAlg, + periodicallyCheckBlocklistUpdate = persistentState.periodicallyCheckBlocklistUpdate, + useCustomDownloadManager = persistentState.useCustomDownloadManager, + enableDnsCache = persistentState.enableDnsCache, + proxyDns = persistentState.proxyDns, + useSystemDnsForUndelegatedDomains = persistentState.useSystemDnsForUndelegatedDomains, + useFallbackDnsToBypass = persistentState.useFallbackDnsToBypass, + blocklistEnabled = persistentState.blocklistEnabled, + numberOfLocalBlocklists = persistentState.numberOfLocalBlocklists, + bypassBlockInDns = persistentState.bypassBlockInDns, + splitDns = persistentState.splitDns, + dnsRecordTypesAutoMode = persistentState.dnsRecordTypesAutoMode, + allowedDnsRecordTypesSize = persistentState.getAllowedDnsRecordTypes().size, + isShowSplitDns = isAtleastR() || persistentState.enableDnsAlg, + isShowBypassDnsBlock = persistentState.enableDnsAlg + ) + } + updateLatency() + } + } + + private fun updateLatency() { + viewModelScope.launch(Dispatchers.IO) { + val p50 = VpnController.p50("preferred") // simplified + if (p50 > 0) { + _uiState.update { it.copy(dnsLatency = "($p50 ms)") } + } else { + _uiState.update { it.copy(dnsLatency = "") } + } + } + } + + fun refreshDns() { + viewModelScope.launch { + _uiState.update { it.copy(isRefreshing = true) } + VpnController.refresh() + delay(2000) + _uiState.update { it.copy(isRefreshing = false) } + updateUiState() + } + } + + fun setFavIconEnabled(enabled: Boolean) { + persistentState.fetchFavIcon = enabled + updateUiState() + } + + fun setPreventDnsLeaksEnabled(enabled: Boolean) { + persistentState.preventDnsLeaks = enabled + updateUiState() + } + + fun setDnsAlgEnabled(enabled: Boolean) { + persistentState.enableDnsAlg = enabled + updateUiState() + } + + fun setPeriodicallyCheckBlocklistUpdate(enabled: Boolean) { + persistentState.periodicallyCheckBlocklistUpdate = enabled + if (enabled) { + workScheduler.scheduleBlocklistUpdateCheckJob() + } else { + workScheduler.cancelBlocklistUpdateCheckJob() + } + updateUiState() + } + + fun setUseCustomDownloadManager(enabled: Boolean) { + persistentState.useCustomDownloadManager = enabled + updateUiState() + } + + fun setEnableDnsCache(enabled: Boolean) { + persistentState.enableDnsCache = enabled + updateUiState() + } + + fun setProxyDns(enabled: Boolean) { + persistentState.proxyDns = enabled + updateUiState() + } + + fun setUseSystemDnsForUndelegatedDomains(enabled: Boolean) { + persistentState.useSystemDnsForUndelegatedDomains = enabled + updateUiState() + } + + fun setUseFallbackDnsToBypass(enabled: Boolean) { + persistentState.useFallbackDnsToBypass = enabled + updateUiState() + } + + fun setBypassBlockInDns(enabled: Boolean) { + persistentState.bypassBlockInDns = enabled + updateUiState() + } + + fun setSplitDns(enabled: Boolean) { + persistentState.splitDns = enabled + updateUiState() + } + + fun enableSystemDns() { + viewModelScope.launch(Dispatchers.IO) { + appConfig.enableSystemDns() + withContext(Dispatchers.Main) { updateUiState() } + } + } + + fun enableSmartDns() { + viewModelScope.launch(Dispatchers.IO) { + appConfig.enableSmartDns() + withContext(Dispatchers.Main) { updateUiState() } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/events/EventsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/events/EventsScreen.kt new file mode 100644 index 000000000..b9e80035f --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/events/EventsScreen.kt @@ -0,0 +1,420 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.events + +import androidx.compose.foundation.Image +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Delete +import androidx.compose.material.icons.rounded.Refresh +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.paging.LoadState +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.EventCard +import com.celzero.bravedns.adapter.EventCardPosition +import com.celzero.bravedns.adapter.copyEventToClipboard +import com.celzero.bravedns.database.Event +import com.celzero.bravedns.database.EventDao +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkFilterChip +import com.celzero.bravedns.ui.compose.theme.RethinkSearchField +import com.celzero.bravedns.ui.compose.theme.RethinkTopBar +import com.celzero.bravedns.viewmodel.EventsViewModel +import com.celzero.bravedns.viewmodel.EventsViewModel.TopLevelFilter +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.launch + +@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class) +@Composable +fun EventsScreen( + viewModel: EventsViewModel, + eventDao: EventDao, + onBackClick: () -> Unit +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + + var query by remember { mutableStateOf(viewModel.getCurrentQuery()) } + var filterSources by remember { mutableStateOf(viewModel.getCurrentSources()) } + var filterSeverity by remember { mutableStateOf(viewModel.getCurrentSeverity()) } + var filterType by remember { mutableStateOf(viewModel.getFilterType()) } + var showDeleteDialog by remember { mutableStateOf(false) } + + val items = viewModel.eventsFlow.collectAsLazyPagingItems() + val isLoading = items.loadState.refresh is LoadState.Loading && items.itemCount == 0 + val showEmpty = items.itemCount == 0 && items.loadState.refresh is LoadState.NotLoading + + fun applyFilter( + sources: Set = filterSources, + severity: Severity? = filterSeverity, + type: TopLevelFilter = filterType + ) { + filterSources = sources + filterSeverity = severity + filterType = type + viewModel.setFilterType(type) + viewModel.setFilter(query, sources, severity) + } + + LaunchedEffect(Unit) { + snapshotFlow { query } + .debounce(QUERY_TEXT_DELAY) + .distinctUntilChanged() + .collect { value -> + viewModel.setFilter(value, filterSources, filterSeverity) + } + } + + Scaffold( + containerColor = MaterialTheme.colorScheme.surface, + topBar = { + RethinkTopBar( + title = stringResource(id = R.string.event_logs_title), + onBackClick = onBackClick, + actions = { + IconButton(onClick = { items.refresh() }) { + Icon( + imageVector = Icons.Rounded.Refresh, + contentDescription = stringResource(id = R.string.cd_refresh) + ) + } + IconButton(onClick = { showDeleteDialog = true }) { + Icon( + imageVector = Icons.Rounded.Delete, + contentDescription = stringResource(id = R.string.lbl_delete) + ) + } + } + ) + } + ) { paddingValues -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { + Column(modifier = Modifier.fillMaxSize()) { + EventControlsCard( + query = query, + onQueryChange = { query = it }, + filterType = filterType, + filterSeverity = filterSeverity, + filterSources = filterSources, + onClearQuery = { query = "" }, + onAllClick = { applyFilter(emptySet(), null, TopLevelFilter.ALL) }, + onSeverityModeClick = { applyFilter(emptySet(), filterSeverity, TopLevelFilter.SEVERITY) }, + onSourceModeClick = { applyFilter(filterSources, null, TopLevelFilter.SOURCE) }, + onSeverityClick = { applyFilter(emptySet(), it, TopLevelFilter.SEVERITY) }, + onSourceToggle = { source -> + val updated = + if (filterSources.contains(source)) { + filterSources - source + } else { + filterSources + source + } + applyFilter(updated, null, TopLevelFilter.SOURCE) + } + ) + + EventsList( + modifier = Modifier.weight(1f), + items = items, + query = query, + onCopy = { copyEventToClipboard(context, it) } + ) + } + + when { + isLoading -> LoadingState() + showEmpty -> EmptyState() + } + } + } + + if (showDeleteDialog) { + RethinkConfirmDialog( + onDismissRequest = { showDeleteDialog = false }, + title = stringResource(id = R.string.ada_delete_logs_dialog_title), + message = stringResource(id = R.string.ada_delete_logs_dialog_desc), + confirmText = stringResource(id = R.string.lbl_delete), + dismissText = stringResource(id = R.string.lbl_cancel), + onConfirm = { + showDeleteDialog = false + scope.launch(Dispatchers.IO) { eventDao.deleteAll() } + items.refresh() + }, + onDismiss = { showDeleteDialog = false }, + isConfirmDestructive = true + ) + } +} + +@Composable +private fun EventControlsCard( + query: String, + onQueryChange: (String) -> Unit, + filterType: TopLevelFilter, + filterSeverity: Severity?, + filterSources: Set, + onClearQuery: () -> Unit, + onAllClick: () -> Unit, + onSeverityModeClick: () -> Unit, + onSourceModeClick: () -> Unit, + onSeverityClick: (Severity) -> Unit, + onSourceToggle: (EventSource) -> Unit +) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm + ) + ) { + RethinkSearchField( + query = query, + onQueryChange = onQueryChange, + modifier = Modifier.fillMaxWidth(), + placeholder = stringResource(id = R.string.search_event_logs), + onClearQuery = onClearQuery, + clearQueryContentDescription = stringResource(id = R.string.cd_clear_search), + shape = RoundedCornerShape(Dimensions.cornerRadiusLg), + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh + ) + + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + EventFilterChip( + label = stringResource(id = R.string.lbl_all), + selected = filterType == TopLevelFilter.ALL, + onClick = onAllClick + ) + EventFilterChip( + label = "Severity", + selected = filterType == TopLevelFilter.SEVERITY, + onClick = onSeverityModeClick + ) + EventFilterChip( + label = stringResource(id = R.string.events_filter_source), + selected = filterType == TopLevelFilter.SOURCE, + onClick = onSourceModeClick + ) + } + + when (filterType) { + TopLevelFilter.SEVERITY -> { + Spacer(modifier = Modifier.height(8.dp)) + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + EventFilterChip( + label = stringResource(id = R.string.events_severity_low), + selected = filterSeverity == Severity.LOW, + onClick = { onSeverityClick(Severity.LOW) } + ) + EventFilterChip( + label = stringResource(id = R.string.events_severity_medium), + selected = filterSeverity == Severity.MEDIUM, + onClick = { onSeverityClick(Severity.MEDIUM) } + ) + EventFilterChip( + label = stringResource(id = R.string.events_severity_high), + selected = filterSeverity == Severity.HIGH, + onClick = { onSeverityClick(Severity.HIGH) } + ) + EventFilterChip( + label = stringResource(id = R.string.events_severity_critical), + selected = filterSeverity == Severity.CRITICAL, + onClick = { onSeverityClick(Severity.CRITICAL) } + ) + } + } + + TopLevelFilter.SOURCE -> { + Spacer(modifier = Modifier.height(8.dp)) + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + EventSource.entries.forEach { source -> + EventFilterChip( + label = source.name.lowercase().replace('_', ' ').replaceFirstChar { it.titlecase() }, + selected = filterSources.contains(source), + onClick = { onSourceToggle(source) } + ) + } + } + } + + TopLevelFilter.ALL -> Unit + } + } +} + +@Composable +private fun EventFilterChip( + label: String, + selected: Boolean, + onClick: () -> Unit +) { + RethinkFilterChip( + label = label, + selected = selected, + onClick = onClick, + selectedLabelWeight = FontWeight.Medium, + defaultLabelWeight = FontWeight.Medium + ) +} + +@Composable +private fun EventsList( + modifier: Modifier = Modifier, + items: androidx.paging.compose.LazyPagingItems, + query: String, + onCopy: (String) -> Unit +) { + LazyColumn( + modifier = modifier.fillMaxSize(), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = Dimensions.spacing3xl + ), + verticalArrangement = Arrangement.spacedBy(4.dp) + ) { + items(count = items.itemCount, key = { index -> items[index]?.id ?: index }) { index -> + val item = items[index] ?: return@items + val position = when { + items.itemCount == 1 -> EventCardPosition.Single + index == 0 -> EventCardPosition.First + index == items.itemCount - 1 -> EventCardPosition.Last + else -> EventCardPosition.Middle + } + EventCard(event = item, onCopy = onCopy, query = query, position = position) + } + } +} + +@Composable +private fun LoadingState() { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator( + color = MaterialTheme.colorScheme.primary, + strokeWidth = 3.dp + ) + } +} + +@Composable +private fun EmptyState() { + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 32.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadius4xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + modifier = Modifier.size(96.dp) + ) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) { + Image( + painter = painterResource(id = R.drawable.ic_event_note), + contentDescription = null, + modifier = Modifier.size(52.dp) + ) + } + } + Spacer(modifier = Modifier.height(16.dp)) + Text( + text = stringResource(id = R.string.no_events_recorded), + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.SemiBold, + textAlign = TextAlign.Center + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = stringResource(id = R.string.no_events_desc), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center + ) + } +} + +private const val QUERY_TEXT_DELAY: Long = 350 diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/AppListModels.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/AppListModels.kt new file mode 100644 index 000000000..9b8db2636 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/AppListModels.kt @@ -0,0 +1,136 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.firewall + +import androidx.compose.runtime.Composable +import androidx.compose.ui.res.stringResource +import com.celzero.bravedns.R +import com.celzero.bravedns.service.FirewallManager.ConnectionStatus +import com.celzero.bravedns.service.FirewallManager.FirewallStatus + +enum class BlockType { + UNMETER, + METER, + BYPASS, + LOCKDOWN, + EXCLUDE, + BYPASS_DNS_FIREWALL +} + +enum class TopLevelFilter(val id: Int) { + ALL(0), + INSTALLED(1), + SYSTEM(2); + + @Composable + fun getLabel(): String { + return when (this) { + ALL -> "" + INSTALLED -> stringResource(id = R.string.fapps_filter_parent_installed) + SYSTEM -> stringResource(id = R.string.fapps_filter_parent_system) + } + } +} + +@Suppress("MagicNumber") +enum class FirewallFilter(val id: Int) { + ALL(0), + ALLOWED(1), + BLOCKED(2), + BLOCKED_WIFI(3), + BLOCKED_MOBILE_DATA(4), + BYPASS(5), + EXCLUDED(6), + LOCKDOWN(7); + + fun getFilter(): Set { + return when (this) { + ALL -> FirewallStatus.values().map { it.id }.toSet() + setOf(0, 1) + ALLOWED -> setOf(FirewallStatus.NONE.id) + BLOCKED_WIFI -> setOf(FirewallStatus.NONE.id) + BLOCKED_MOBILE_DATA -> setOf(FirewallStatus.NONE.id) + BLOCKED -> setOf(FirewallStatus.NONE.id) + BYPASS -> setOf(FirewallStatus.BYPASS_UNIVERSAL.id, FirewallStatus.BYPASS_DNS_FIREWALL.id) + EXCLUDED -> setOf(FirewallStatus.EXCLUDE.id) + LOCKDOWN -> setOf(FirewallStatus.ISOLATE.id) + } + } + + fun getConnectionStatusFilter(): Set { + return when (this) { + ALL -> ConnectionStatus.values().map { it.id }.toSet() + ALLOWED -> setOf(ConnectionStatus.ALLOW.id) + BLOCKED_WIFI -> setOf(ConnectionStatus.UNMETERED.id) + BLOCKED_MOBILE_DATA -> setOf(ConnectionStatus.METERED.id) + BLOCKED -> + setOf( + ConnectionStatus.UNMETERED.id, + ConnectionStatus.METERED.id, + ConnectionStatus.BOTH.id + ) + BYPASS -> ConnectionStatus.values().map { it.id }.toSet() + EXCLUDED -> ConnectionStatus.values().map { it.id }.toSet() + LOCKDOWN -> ConnectionStatus.values().map { it.id }.toSet() + } + } + + @Composable + fun getLabel(): String { + return when (this) { + ALL -> stringResource(id = R.string.lbl_all) + ALLOWED -> stringResource(id = R.string.lbl_allowed) + BLOCKED_WIFI -> + stringResource( + R.string.two_argument_colon, + stringResource(id = R.string.lbl_blocked), + stringResource(id = R.string.firewall_rule_block_unmetered) + ) + BLOCKED_MOBILE_DATA -> + stringResource( + R.string.two_argument_colon, + stringResource(id = R.string.lbl_blocked), + stringResource(id = R.string.firewall_rule_block_metered) + ) + BLOCKED -> stringResource(id = R.string.lbl_blocked) + BYPASS -> stringResource(id = R.string.fapps_firewall_filter_bypass_universal) + EXCLUDED -> stringResource(id = R.string.fapps_firewall_filter_excluded) + LOCKDOWN -> stringResource(id = R.string.fapps_firewall_filter_isolate) + } + } + + companion object { + fun filter(id: Int): FirewallFilter { + return when (id) { + ALL.id -> ALL + ALLOWED.id -> ALLOWED + BLOCKED_WIFI.id -> BLOCKED_WIFI + BLOCKED_MOBILE_DATA.id -> BLOCKED_MOBILE_DATA + BLOCKED.id -> BLOCKED + BYPASS.id -> BYPASS + EXCLUDED.id -> EXCLUDED + LOCKDOWN.id -> LOCKDOWN + else -> ALL + } + } + } +} + +data class Filters( + val categoryFilters: Set = emptySet(), + val topLevelFilter: TopLevelFilter = TopLevelFilter.INSTALLED, + val firewallFilter: FirewallFilter = FirewallFilter.ALL, + val searchString: String = "" +) diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/AppListScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/AppListScreen.kt new file mode 100644 index 000000000..70bd1a66a --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/AppListScreen.kt @@ -0,0 +1,1295 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.firewall +import androidx.activity.compose.BackHandler +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.sizeIn +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.FilterList +import androidx.compose.material.icons.outlined.CheckCircle +import androidx.compose.material.icons.rounded.CheckCircle +import androidx.compose.material.icons.rounded.Refresh +import androidx.compose.material.icons.rounded.Block +import androidx.compose.material.icons.rounded.Close +import androidx.compose.material.icons.rounded.Tune +import androidx.compose.material3.ButtonGroupDefaults +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.ToggleButton +import androidx.compose.material3.ToggleButtonDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.rotate +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.hapticfeedback.HapticFeedback +import androidx.compose.ui.hapticfeedback.HapticFeedbackType +import androidx.compose.ui.platform.LocalHapticFeedback +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.FirewallAppRow +import com.celzero.bravedns.adapter.FirewallRowPosition +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.RethinkActionListItem +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkModalBottomSheet +import com.celzero.bravedns.ui.compose.theme.RethinkSearchField +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import com.celzero.bravedns.viewmodel.AppInfoViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import java.util.Locale +import androidx.compose.foundation.ExperimentalFoundationApi +import com.celzero.bravedns.database.AppInfo + +private const val ANIMATION_DURATION = 750 +private val FAST_SCROLLER_LIST_END_PADDING = 32.dp + +private fun performSelectionHaptic(hapticFeedback: HapticFeedback) { + hapticFeedback.performHapticFeedback(HapticFeedbackType.TextHandleMove) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AppListScreen( + viewModel: AppInfoViewModel, + eventLogger: EventLogger, + queryText: String, + selectedFirewallFilter: FirewallFilter, + isRefreshing: Boolean, + bulkWifi: Boolean, + bulkMobile: Boolean, + bulkBypass: Boolean, + bulkBypassDns: Boolean, + bulkExclude: Boolean, + bulkLockdown: Boolean, + showBulkUpdateDialog: Boolean, + bulkDialogTitle: String, + bulkDialogMessage: String, + bulkDialogType: BlockType?, + showInfoDialog: Boolean, + currentFilters: Filters?, + onQueryChange: (String) -> Unit, + onRefreshClick: () -> Unit, + onFilterApply: (Filters) -> Unit, + onFilterClear: (Filters) -> Unit, + onFirewallFilterClick: (FirewallFilter) -> Unit, + onBulkDialogConfirm: (BlockType) -> Unit, + onBulkDialogDismiss: () -> Unit, + onInfoDialogDismiss: () -> Unit, + onShowInfoDialog: () -> Unit, + onShowBulkDialog: (BlockType) -> Unit, + onBypassDnsTooltip: () -> Unit, + showBypassToolTip: Boolean, + onAppClick: ((Int) -> Unit)? = null, + onBackClick: (() -> Unit)? = null +) { + val items by viewModel.appInfo.collectAsState() + val refreshRotation = rememberInfiniteTransition(label = "refresh").animateFloat( + initialValue = 0f, + targetValue = if (isRefreshing) 360f else 0f, + animationSpec = infiniteRepeatable( + animation = tween(durationMillis = ANIMATION_DURATION, easing = LinearEasing), + repeatMode = RepeatMode.Restart + ), + label = "refreshRotation" + ) + + var showFilterSheet by remember { mutableStateOf(false) } + var showRulesSheet by remember { mutableStateOf(false) } + val effectiveFilters = currentFilters ?: Filters(topLevelFilter = TopLevelFilter.INSTALLED) + val hasActiveFilters = + effectiveFilters.topLevelFilter != TopLevelFilter.INSTALLED || + effectiveFilters.categoryFilters.isNotEmpty() || + selectedFirewallFilter != FirewallFilter.ALL + val shouldConsumeBackForSearch = + queryText.isNotBlank() && + !showFilterSheet && + !showRulesSheet && + !showBulkUpdateDialog && + !showInfoDialog + + BackHandler(enabled = shouldConsumeBackForSearch) { + onQueryChange("") + } + + if (showFilterSheet) { + FirewallAppFilterSheet( + initialFilters = currentFilters, + firewallFilter = selectedFirewallFilter, + onDismiss = { showFilterSheet = false }, + onApply = onFilterApply, + onClear = onFilterClear + ) + } + + if (showRulesSheet) { + FirewallBulkActionsSheet( + appliedAppsCount = items.size, + bulkWifi = bulkWifi, + bulkMobile = bulkMobile, + bulkBypass = bulkBypass, + bulkBypassDns = bulkBypassDns, + bulkExclude = bulkExclude, + bulkLockdown = bulkLockdown, + showBypassToolTip = showBypassToolTip, + onDismiss = { showRulesSheet = false }, + onBypassDnsTooltip = onBypassDnsTooltip, + onAction = { action -> + showRulesSheet = false + onShowBulkDialog(action) + } + ) + } + + if (showBulkUpdateDialog && bulkDialogType != null) { + RethinkConfirmDialog( + onDismissRequest = onBulkDialogDismiss, + title = bulkDialogTitle, + message = bulkDialogMessage, + confirmText = stringResource(R.string.lbl_apply), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { onBulkDialogConfirm(bulkDialogType) }, + onDismiss = onBulkDialogDismiss + ) + } + + if (showInfoDialog) { + RethinkConfirmDialog( + onDismissRequest = onInfoDialogDismiss, + text = { FirewallInfoDialogContent() }, + confirmText = stringResource(R.string.fapps_info_dialog_positive_btn), + onConfirm = onInfoDialogDismiss + ) + } + + Scaffold( + containerColor = MaterialTheme.colorScheme.surface, + contentWindowInsets = WindowInsets(0, 0, 0, 0), + topBar = { + RethinkTopBar( + title = stringResource(R.string.apps_info_title), + onBackClick = onBackClick, + actions = { + IconButton( + onClick = onRefreshClick, + enabled = !isRefreshing + ) { + Icon( + imageVector = Icons.Rounded.Refresh, + contentDescription = stringResource(R.string.cd_refresh), + modifier = Modifier.rotate(if (isRefreshing) refreshRotation.value else 0f) + ) + } + IconButton(onClick = { showFilterSheet = true }) { + Box { + Icon( + imageVector = Icons.Default.FilterList, + contentDescription = stringResource(R.string.cd_filter) + ) + if (hasActiveFilters) { + Box( + modifier = Modifier + .size(8.dp) + .align(Alignment.TopEnd) + .clip(CircleShape) + .background(MaterialTheme.colorScheme.primary) + ) + } + } + } + IconButton(onClick = { showRulesSheet = true }) { + Icon( + imageVector = Icons.Rounded.Tune, + contentDescription = stringResource(R.string.lbl_rules) + ) + } + } + ) + } + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + ) { + AppListControlDeck( + queryText = queryText, + displayedAppsCount = items.size, + selectedFirewallFilter = selectedFirewallFilter, + onQueryChange = onQueryChange, + onFirewallFilterClick = onFirewallFilterClick + ) + + AppListRecycler( + modifier = Modifier.weight(1f), + items = items, + eventLogger = eventLogger, + searchQuery = queryText, + onAppClick = onAppClick + ) + } + } +} + +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +private fun AppListControlDeck( + queryText: String, + displayedAppsCount: Int, + selectedFirewallFilter: FirewallFilter, + onQueryChange: (String) -> Unit, + onFirewallFilterClick: (FirewallFilter) -> Unit +) { + val hapticFeedback = LocalHapticFeedback.current + val quickFilters = listOf( + FirewallFilter.ALL, + FirewallFilter.ALLOWED, + FirewallFilter.BLOCKED, + FirewallFilter.BYPASS, + FirewallFilter.EXCLUDED, + FirewallFilter.LOCKDOWN + ) + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal) + .padding(bottom = Dimensions.spacingXs), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + RethinkSearchField( + query = queryText, + onQueryChange = onQueryChange, + modifier = Modifier.fillMaxWidth(), + placeholder = stringResource(R.string.search_apps_count_placeholder, displayedAppsCount), + onClearQuery = { onQueryChange("") }, + clearQueryContentDescription = stringResource(R.string.cd_clear_search), + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + containerColor = MaterialTheme.colorScheme.surfaceContainerLow, + textStyle = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium), + iconSize = 20.dp, + trailingIconSize = 16.dp, + trailingIconButtonSize = 32.dp + ) + + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(ButtonGroupDefaults.ConnectedSpaceBetween) + ) { + quickFilters.forEachIndexed { index, filter -> + val selected = selectedFirewallFilter == filter + ToggleButton( + checked = selected, + onCheckedChange = { checked -> + if (checked && !selected) { + performSelectionHaptic(hapticFeedback) + onFirewallFilterClick(filter) + } + }, + shapes = + when (index) { + 0 -> ButtonGroupDefaults.connectedLeadingButtonShapes() + quickFilters.lastIndex -> ButtonGroupDefaults.connectedTrailingButtonShapes() + else -> ButtonGroupDefaults.connectedMiddleButtonShapes() + }, + colors = ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.94f), + checkedContentColor = MaterialTheme.colorScheme.onSecondaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.82f), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + border = null, + modifier = Modifier.semantics { role = Role.RadioButton } + ) { + FirewallFilterIcon(filter = filter, selected = selected, modifier = Modifier.size(14.dp)) + Spacer(modifier = Modifier.size(ToggleButtonDefaults.IconSpacing)) + Text( + text = filter.getLabel(), + maxLines = 1, + overflow = TextOverflow.Ellipsis, + fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium + ) + } + } + } + } +} + +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +private fun ConnectedToggleButtonRow( + options: List, + selectedOption: T, + onOptionSelected: (T) -> Unit, + modifier: Modifier = Modifier, + icon: (@Composable (option: T, selected: Boolean) -> Unit)? = null, + label: @Composable (option: T, selected: Boolean) -> Unit +) { + val hapticFeedback = LocalHapticFeedback.current + Row( + modifier = modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(ButtonGroupDefaults.ConnectedSpaceBetween) + ) { + options.forEachIndexed { index, option -> + val isSelected = option == selectedOption + ToggleButton( + checked = isSelected, + onCheckedChange = { checked -> + if (checked && !isSelected) { + performSelectionHaptic(hapticFeedback) + onOptionSelected(option) + } + }, + shapes = + when (index) { + 0 -> ButtonGroupDefaults.connectedLeadingButtonShapes() + options.lastIndex -> ButtonGroupDefaults.connectedTrailingButtonShapes() + else -> ButtonGroupDefaults.connectedMiddleButtonShapes() + }, + colors = ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.94f), + checkedContentColor = MaterialTheme.colorScheme.onSecondaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.82f), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + border = null, + modifier = Modifier + .weight(1f) + .semantics { role = Role.RadioButton } + ) { + icon?.invoke(option, isSelected) + if (icon != null) { + Spacer(modifier = Modifier.size(ToggleButtonDefaults.IconSpacing)) + } + label(option, isSelected) + } + } + } +} + +@Composable +private fun SheetSectionCard( + modifier: Modifier = Modifier, + shape: RoundedCornerShape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + containerColor: Color = MaterialTheme.colorScheme.surfaceContainerLow.copy(alpha = 0.92f), + content: @Composable () -> Unit +) { + Surface( + modifier = modifier.fillMaxWidth(), + shape = shape, + color = containerColor, + tonalElevation = 0.dp + ) { + Column( + modifier = Modifier.padding(horizontal = 14.dp, vertical = 12.dp), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + content() + } + } +} + +@Composable +private fun SheetSectionTitle( + title: String, + count: Int = 0 +) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(start = 2.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold + ) + if (count > 0) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.84f) + ) { + Text( + text = count.toString(), + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSecondaryContainer, + modifier = Modifier.padding(horizontal = 8.dp, vertical = 2.dp) + ) + } + } + } +} + +@OptIn(ExperimentalLayoutApi::class, ExperimentalMaterial3Api::class) +@Composable +private fun FirewallBulkActionsSheet( + appliedAppsCount: Int, + bulkWifi: Boolean, + bulkMobile: Boolean, + bulkBypass: Boolean, + bulkBypassDns: Boolean, + bulkExclude: Boolean, + bulkLockdown: Boolean, + showBypassToolTip: Boolean, + onDismiss: () -> Unit, + onBypassDnsTooltip: () -> Unit, + onAction: (BlockType) -> Unit +) { + val ruleItems = listOf( + RuleActionItem( + type = BlockType.UNMETER, + titleRes = R.string.ada_app_unmetered, + descriptionRes = R.string.fapps_info_unmetered_msg, + iconRes = if (bulkWifi) R.drawable.ic_firewall_wifi_off else R.drawable.ic_firewall_wifi_on_grey, + selected = bulkWifi + ), + RuleActionItem( + type = BlockType.METER, + titleRes = R.string.lbl_mobile_data, + descriptionRes = R.string.fapps_info_metered_msg, + iconRes = if (bulkMobile) R.drawable.ic_firewall_data_off else R.drawable.ic_firewall_data_on_grey, + selected = bulkMobile + ), + RuleActionItem( + type = BlockType.BYPASS, + titleRes = R.string.fapps_firewall_filter_bypass_universal, + descriptionRes = R.string.fapps_info_bypass_msg, + iconRes = if (bulkBypass) R.drawable.ic_firewall_bypass_on else R.drawable.ic_firewall_bypass_off, + selected = bulkBypass + ), + RuleActionItem( + type = BlockType.BYPASS_DNS_FIREWALL, + titleRes = R.string.bypass_dns_firewall, + descriptionRes = R.string.fapps_info_bypass_dns_firewall_msg, + iconRes = if (bulkBypassDns) R.drawable.ic_bypass_dns_firewall_on else R.drawable.ic_bypass_dns_firewall_off, + selected = bulkBypassDns + ), + RuleActionItem( + type = BlockType.EXCLUDE, + titleRes = R.string.fapps_firewall_filter_excluded, + descriptionRes = R.string.fapps_info_exclude_msg, + iconRes = if (bulkExclude) R.drawable.ic_firewall_exclude_on else R.drawable.ic_firewall_exclude_off, + selected = bulkExclude + ), + RuleActionItem( + type = BlockType.LOCKDOWN, + titleRes = R.string.fapps_firewall_filter_isolate, + descriptionRes = R.string.fapps_info_isolate_msg, + iconRes = if (bulkLockdown) R.drawable.ic_firewall_lockdown_on else R.drawable.ic_firewall_lockdown_off, + selected = bulkLockdown + ) + ) + + RethinkModalBottomSheet( + onDismissRequest = onDismiss, + containerColor = MaterialTheme.colorScheme.surface, + contentPadding = PaddingValues(0.dp), + verticalSpacing = 0.dp, + includeBottomSpacer = true + ) { + Column( + modifier = Modifier + .padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingSm + ) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + RulesSheetHeader(appliedAppsCount = appliedAppsCount) + Text( + text = stringResource(R.string.fapps_info_dialog_message), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + + RethinkListGroup { + ruleItems.forEachIndexed { index, item -> + RuleActionListItem( + item = item, + position = cardPositionFor(index, ruleItems.lastIndex), + onClick = { + if (item.type == BlockType.BYPASS_DNS_FIREWALL && showBypassToolTip) { + onBypassDnsTooltip() + } else { + onAction(item.type) + } + } + ) + } + } + } + } +} + +@Composable +private fun RulesSheetHeader(appliedAppsCount: Int) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Start, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = stringResource(R.string.lbl_rules), + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface + ) + Spacer(modifier = Modifier.width(8.dp)) + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusSmMd), + color = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.84f) + ) { + Text( + text = stringResource( + R.string.two_argument_colon, + stringResource(R.string.lbl_apply), + appliedAppsCount.toString() + ), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onSecondaryContainer, + modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp) + ) + } + } +} + +private data class RuleActionItem( + val type: BlockType, + val titleRes: Int, + val descriptionRes: Int, + val iconRes: Int, + val selected: Boolean +) + +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +private fun RuleActionListItem( + item: RuleActionItem, + position: CardPosition, + onClick: () -> Unit +) { + val accentColor = + when (item.type) { + BlockType.LOCKDOWN -> MaterialTheme.colorScheme.error + BlockType.EXCLUDE -> MaterialTheme.colorScheme.secondary + BlockType.BYPASS, + BlockType.BYPASS_DNS_FIREWALL -> MaterialTheme.colorScheme.tertiary + else -> MaterialTheme.colorScheme.primary + } + + RethinkActionListItem( + title = stringResource(item.titleRes), + description = stringResource(item.descriptionRes), + iconRes = item.iconRes, + accentColor = accentColor, + position = position, + highlighted = item.selected, + trailing = { RuleSelectionBadge(selected = item.selected) }, + onClick = onClick + ) +} + +@Composable +private fun RuleSelectionBadge(selected: Boolean) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = + if (selected) { + MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.92f) + } else { + MaterialTheme.colorScheme.surfaceContainerHigh + } + ) { + Text( + text = + stringResource( + if (selected) R.string.lbbs_enabled else R.string.lbl_disabled + ), + style = MaterialTheme.typography.labelMedium, + color = + if (selected) { + MaterialTheme.colorScheme.onSecondaryContainer + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + modifier = Modifier.padding(horizontal = 10.dp, vertical = 5.dp) + ) + } +} + +@Composable +private fun AppListRecycler( + modifier: Modifier = Modifier, + items: List, + eventLogger: EventLogger, + searchQuery: String, + onAppClick: ((Int) -> Unit)? = null +) { + val listState = rememberSaveable(saver = LazyListState.Saver) { LazyListState() } + + if (items.isEmpty()) { + Box( + modifier = modifier + .fillMaxSize() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + contentAlignment = Alignment.Center + ) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadius2xl), + color = MaterialTheme.colorScheme.surfaceContainerLow + ) { + Column( + modifier = Modifier.padding(horizontal = 18.dp, vertical = 14.dp), + verticalArrangement = Arrangement.spacedBy(4.dp) + ) { + Text( + text = stringResource(R.string.fapps_empty_title), + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold + ) + Text( + text = stringResource(R.string.fapps_empty_subtitle), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } + return + } + + val showFastScroller = items.size >= 8 + val fastScrollerKeys = remember(items) { buildFastScrollerIndexKeys(items) } + val density = LocalDensity.current + val navBarBottomInset = with(density) { WindowInsets.navigationBars.getBottom(density).toDp() } + + Box(modifier = modifier.fillMaxSize()) { + AppListContent( + loadedItems = items, + listState = listState, + eventLogger = eventLogger, + searchQuery = searchQuery, + showFastScroller = showFastScroller, + onAppClick = onAppClick + ) + + if (showFastScroller) { + IndexedFastScroller( + items = fastScrollerKeys, + listState = listState, + getIndexKey = { it }, + scrollItemOffset = 2, + minItemCount = 8, + modifier = Modifier + .align(Alignment.CenterEnd) + .padding(top = Dimensions.spacingSm, bottom = navBarBottomInset) + .padding(end = 2.dp), + ) + } + } +} + +@OptIn(ExperimentalFoundationApi::class) +@Composable +private fun AppListContent( + loadedItems: List, + listState: androidx.compose.foundation.lazy.LazyListState, + eventLogger: EventLogger, + searchQuery: String, + showFastScroller: Boolean, + onAppClick: ((Int) -> Unit)? = null +) { + val density = LocalDensity.current + val navBarBottomInset = with(density) { WindowInsets.navigationBars.getBottom(density).toDp() } + + LazyColumn( + state = listState, + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal + if (showFastScroller) FAST_SCROLLER_LIST_END_PADDING else 8.dp, + top = Dimensions.spacingXs, + bottom = Dimensions.screenPaddingHorizontal + navBarBottomInset + ), + verticalArrangement = Arrangement.spacedBy(2.dp) + ) { + loadedItems.forEachIndexed { index, item -> + val currentInitial = appInitial(item.appName, item.packageName) + val previousItem = loadedItems.getOrNull(index - 1) + val previousInitial = + previousItem?.let { appInitial(it.appName, it.packageName) } + val nextItem = loadedItems.getOrNull(index + 1) + val nextInitial = + nextItem?.let { appInitial(it.appName, it.packageName) } + val isFirstInGroup = previousInitial == null || currentInitial != previousInitial + val isLastInGroup = nextInitial == null || currentInitial != nextInitial + + val rowPosition = + when { + isFirstInGroup && isLastInGroup -> FirewallRowPosition.Single + isFirstInGroup -> FirewallRowPosition.First + isLastInGroup -> FirewallRowPosition.Last + else -> FirewallRowPosition.Middle + } + + if (index == 0 || isFirstInGroup) { + stickyHeader(key = "header_$currentInitial") { + AppListLetterHeader(letter = currentInitial) + } + } + + item(key = "app_${item.uid}_${item.packageName}") { + FirewallAppRow( + appInfo = item, + eventLogger = eventLogger, + searchQuery = searchQuery, + rowPosition = rowPosition, + onAppClick = onAppClick + ) + } + } + } +} + +@Composable +private fun AppListLetterHeader(letter: String) { + Box( + modifier = Modifier + .fillMaxWidth() + .background(MaterialTheme.colorScheme.surface) + .padding(start = 20.dp, top = 20.dp, bottom = 4.dp) + ) { + Text( + text = letter, + style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.primary, + fontWeight = FontWeight.Bold + ) + } +} + +private fun appInitial(appName: String, packageName: String): String { + val source = appName.ifBlank { packageName }.trim() + if (source.isEmpty()) return "#" + val first = source.first() + return if (first.isLetter()) { + first.uppercaseChar().toString() + } else { + source.first().toString().uppercase(Locale.getDefault()) + } +} + +private fun buildFastScrollerIndexKeys(loadedItems: List): List { + val indexKeys = mutableListOf() + var previousInitial: String? = null + + loadedItems.forEach { item -> + val initial = appInitial(item.appName, item.packageName) + if (initial != previousInitial) { + indexKeys.add(initial) // sticky header index + previousInitial = initial + } + indexKeys.add(item.appName.ifBlank { item.packageName }) // app row index + } + + return indexKeys +} + +@Composable +private fun FirewallInfoDialogContent() { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(Dimensions.spacingLg) + .verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + Text( + text = stringResource(R.string.fapps_info_dialog_message), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface + ) + HorizontalDivider( + thickness = Dimensions.dividerThickness, + color = MaterialTheme.colorScheme.outlineVariant + ) + InfoRow(R.drawable.ic_firewall_wifi_on_grey, stringResource(R.string.fapps_info_unmetered_msg)) + InfoRow(R.drawable.ic_firewall_data_on_grey, stringResource(R.string.fapps_info_metered_msg)) + InfoRow(R.drawable.ic_firewall_bypass_off, stringResource(R.string.fapps_info_bypass_msg)) + InfoRow(R.drawable.ic_bypass_dns_firewall_off, stringResource(R.string.fapps_info_bypass_dns_firewall_msg)) + InfoRow(R.drawable.ic_firewall_exclude_off, stringResource(R.string.fapps_info_exclude_msg)) + InfoRow(R.drawable.ic_firewall_lockdown_off, stringResource(R.string.fapps_info_isolate_msg)) + } +} + +@Composable +private fun InfoRow(icon: Int, text: String) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = Dimensions.spacingXs), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + Surface( + shape = CircleShape, + color = MaterialTheme.colorScheme.surfaceContainerHighest, + modifier = Modifier.size(36.dp) + ) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) { + Image( + painter = painterResource(id = icon), + contentDescription = null, + modifier = Modifier.size(20.dp) + ) + } + } + Text( + text = text, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + modifier = Modifier.weight(1f) + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) +@Composable +fun FirewallAppFilterSheet( + initialFilters: Filters?, + firewallFilter: FirewallFilter, + onDismiss: () -> Unit, + onApply: (Filters) -> Unit, + onClear: (Filters) -> Unit +) { + val hapticFeedback = LocalHapticFeedback.current + var topFilter by remember { mutableStateOf(initialFilters?.topLevelFilter ?: TopLevelFilter.INSTALLED) } + var selectedFirewallFilter by remember { mutableStateOf(firewallFilter) } + val searchString = initialFilters?.searchString.orEmpty() + val selectedCategories = remember { + mutableStateListOf().apply { + if (initialFilters != null) addAll(initialFilters.categoryFilters) + } + } + val categories = remember { mutableStateListOf() } + val statusOptions = listOf( + FirewallFilter.ALL, + FirewallFilter.ALLOWED, + FirewallFilter.BLOCKED, + FirewallFilter.BYPASS, + FirewallFilter.EXCLUDED, + FirewallFilter.LOCKDOWN, + FirewallFilter.BLOCKED_WIFI, + FirewallFilter.BLOCKED_MOBILE_DATA + ) + + LaunchedEffect(topFilter, initialFilters?.categoryFilters) { + val result = fetchCategories(topFilter) + categories.clear() + categories.addAll(result) + selectedCategories.retainAll(result.toSet()) + } + + fun currentFilters( + top: TopLevelFilter = topFilter, + status: FirewallFilter = selectedFirewallFilter, + categoryFilters: Set = selectedCategories.toSet() + ): Filters { + return Filters( + categoryFilters = categoryFilters, + topLevelFilter = top, + firewallFilter = status, + searchString = searchString + ) + } + + val isDefaultSelection = + topFilter == TopLevelFilter.INSTALLED && + selectedFirewallFilter == FirewallFilter.ALL && + selectedCategories.isEmpty() + + Dialog(onDismissRequest = onDismiss) { + Surface( + modifier = Modifier.fillMaxWidth(0.96f), + shape = RoundedCornerShape(Dimensions.cornerRadiusLg), + color = MaterialTheme.colorScheme.surface, + tonalElevation = 4.dp + ) { + Box( + modifier = Modifier + .fillMaxWidth() + .heightIn(max = 520.dp) + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .verticalScroll(rememberScrollState()) + .padding( + start = 0.dp, + end = 0.dp, + top = 0.dp, + bottom = 0.dp + ), + verticalArrangement = Arrangement.spacedBy(2.dp) + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + horizontalArrangement = Arrangement.End, + verticalAlignment = Alignment.CenterVertically + ) { + TextButton( + onClick = { + performSelectionHaptic(hapticFeedback) + selectedCategories.clear() + topFilter = TopLevelFilter.INSTALLED + selectedFirewallFilter = FirewallFilter.ALL + onClear( + Filters( + topLevelFilter = TopLevelFilter.INSTALLED, + firewallFilter = FirewallFilter.ALL, + searchString = searchString + ) + ) + }, + enabled = !isDefaultSelection, + colors = ButtonDefaults.textButtonColors( + contentColor = MaterialTheme.colorScheme.primary, + disabledContentColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.52f) + ) + ) { + Icon( + imageVector = Icons.Rounded.Close, + contentDescription = null, + modifier = Modifier.size(16.dp) + ) + Spacer(modifier = Modifier.width(4.dp)) + Text( + text = stringResource(R.string.fapps_filter_clear_btn), + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.SemiBold + ) + } + } + + SheetSectionCard(shape = RoundedCornerShape(0.dp)) { + SheetSectionTitle(title = stringResource(R.string.lbl_view)) + ConnectedToggleButtonRow( + options = listOf(TopLevelFilter.INSTALLED, TopLevelFilter.SYSTEM, TopLevelFilter.ALL), + selectedOption = topFilter, + onOptionSelected = { + topFilter = it + selectedCategories.clear() + onApply(currentFilters(top = it, categoryFilters = emptySet())) + }, + modifier = Modifier.fillMaxWidth(), + label = { option, selected -> + Text( + text = + when (option) { + TopLevelFilter.INSTALLED -> stringResource(R.string.fapps_filter_parent_installed) + TopLevelFilter.SYSTEM -> stringResource(R.string.fapps_filter_parent_system) + TopLevelFilter.ALL -> stringResource(R.string.lbl_all) + }, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + style = MaterialTheme.typography.labelLarge, + fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium + ) + } + ) + } + + SheetSectionCard(shape = RoundedCornerShape(0.dp)) { + SheetSectionTitle(title = stringResource(R.string.lbl_status)) + FlowRow( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + statusOptions.forEach { option -> + val selected = selectedFirewallFilter == option + ToggleButton( + checked = selected, + onCheckedChange = { checked -> + if (checked && !selected) { + performSelectionHaptic(hapticFeedback) + selectedFirewallFilter = option + onApply(currentFilters(status = option)) + } + }, + colors = ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.94f), + checkedContentColor = MaterialTheme.colorScheme.onSecondaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.82f), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + border = null, + modifier = Modifier + .clip(RoundedCornerShape(Dimensions.cornerRadiusMd)) + .sizeIn(minHeight = Dimensions.touchTargetSm) + .semantics { role = Role.RadioButton } + ) { + FirewallFilterIcon( + filter = option, + selected = selected, + modifier = Modifier.size(14.dp) + ) + Spacer(modifier = Modifier.size(ToggleButtonDefaults.IconSpacing)) + Text( + text = option.getLabel(), + maxLines = 2, + overflow = TextOverflow.Ellipsis, + style = MaterialTheme.typography.labelMedium, + fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium + ) + } + } + } + } + + SheetSectionCard(shape = RoundedCornerShape(0.dp)) { + SheetSectionTitle( + title = stringResource(R.string.fapps_filter_categories_heading), + count = selectedCategories.size + ) + + if (categories.isEmpty()) { + Text( + text = stringResource(R.string.fapps_empty_subtitle), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(start = 6.dp) + ) + } else { + FlowRow( + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + modifier = Modifier.fillMaxWidth() + ) { + categories.forEach { category -> + val isSelected = selectedCategories.contains(category) + ToggleButton( + checked = isSelected, + onCheckedChange = { checked -> + performSelectionHaptic(hapticFeedback) + if (checked) { + if (!isSelected) selectedCategories.add(category) + } else { + selectedCategories.remove(category) + } + onApply(currentFilters()) + }, + colors = ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.94f), + checkedContentColor = MaterialTheme.colorScheme.onSecondaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.82f), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + border = null, + modifier = Modifier + .clip(RoundedCornerShape(Dimensions.cornerRadiusMd)) + .sizeIn(minHeight = Dimensions.touchTargetSm) + .semantics { role = Role.Checkbox } + ) { + val iconRes = categoryFilterIconRes(category) + if (iconRes != null) { + Icon( + painter = painterResource(id = iconRes), + contentDescription = null, + modifier = Modifier.size(14.dp) + ) + Spacer(modifier = Modifier.size(ToggleButtonDefaults.IconSpacing)) + } + Text( + text = category, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.Medium + ) + } + } + } + } + } + } + } + } +} + +} + +@Composable +private fun FirewallFilterIcon( + filter: FirewallFilter, + selected: Boolean = false, + modifier: Modifier = Modifier +) { + when (filter) { + FirewallFilter.ALL -> Icon( + imageVector = Icons.Rounded.Tune, + contentDescription = null, + modifier = modifier + ) + FirewallFilter.ALLOWED -> Icon( + imageVector = if (selected) Icons.Rounded.CheckCircle else Icons.Outlined.CheckCircle, + contentDescription = null, + modifier = modifier + ) + FirewallFilter.BLOCKED -> Icon( + imageVector = Icons.Rounded.Block, + contentDescription = null, + modifier = modifier + ) + FirewallFilter.BYPASS -> Icon( + painter = painterResource(id = R.drawable.ic_firewall_bypass_off), + contentDescription = null, + modifier = modifier + ) + FirewallFilter.EXCLUDED -> Icon( + painter = painterResource(id = R.drawable.ic_firewall_exclude_off), + contentDescription = null, + modifier = modifier + ) + FirewallFilter.LOCKDOWN -> Icon( + painter = painterResource(id = R.drawable.ic_firewall_lockdown_off), + contentDescription = null, + modifier = modifier + ) + FirewallFilter.BLOCKED_WIFI -> Icon( + painter = painterResource(id = R.drawable.ic_firewall_wifi_off), + contentDescription = null, + modifier = modifier + ) + FirewallFilter.BLOCKED_MOBILE_DATA -> Icon( + painter = painterResource(id = R.drawable.ic_firewall_data_off), + contentDescription = null, + modifier = modifier + ) + } +} + +private fun categoryFilterIconRes(category: String): Int? { + val normalized = category.trim().lowercase(Locale.getDefault()) + return when { + normalized.contains("system component") -> R.drawable.ic_settings + normalized.contains("system service") || normalized.contains("non app") -> + R.drawable.ic_network + normalized.contains("system app") -> R.drawable.ic_android_icon + normalized.contains("installed") -> R.drawable.ic_app_info + normalized.contains("other") -> R.drawable.ic_other_settings + normalized.contains("game") -> R.drawable.ic_firewall_lockdown_off + normalized.contains("social") || normalized.contains("communication") -> + R.drawable.ic_notification + normalized.contains("news") -> R.drawable.ic_notification + normalized.contains("photo") || + normalized.contains("image") || + normalized.contains("camera") -> R.drawable.ic_visibility + normalized.contains("video") || normalized.contains("movie") -> + R.drawable.ic_visibility + normalized.contains("audio") || normalized.contains("music") -> R.drawable.ic_logs + normalized.contains("map") || normalized.contains("travel") -> R.drawable.ic_location_on_24 + normalized.contains("productivity") || + normalized.contains("business") || + normalized.contains("tools") -> R.drawable.ic_settings + normalized.contains("education") || normalized.contains("book") -> R.drawable.ic_about + normalized.contains("health") || normalized.contains("fitness") -> R.drawable.ic_heart + normalized.contains("finance") -> R.drawable.ic_backup + else -> null + } +} + +private suspend fun fetchCategories(filter: TopLevelFilter): List { + return withContext(Dispatchers.IO) { + when (filter) { + TopLevelFilter.ALL -> FirewallManager.getAllCategories() + TopLevelFilter.INSTALLED -> FirewallManager.getCategoriesForInstalledApps() + TopLevelFilter.SYSTEM -> FirewallManager.getCategoriesForSystemApps() + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/CustomRulesScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/CustomRulesScreen.kt new file mode 100644 index 000000000..00f4404a3 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/CustomRulesScreen.kt @@ -0,0 +1,890 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.firewall + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.rounded.Apps +import androidx.compose.material3.ExtendedFloatingActionButton +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FabPosition +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.lifecycle.asFlow +import androidx.paging.LoadState +import androidx.paging.compose.LazyPagingItems +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.database.CustomDomain +import com.celzero.bravedns.database.CustomIp +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.service.DomainRulesManager +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.service.IpRulesManager +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkSearchField +import com.celzero.bravedns.ui.compose.theme.RethinkTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkConnectedChoiceButtonRow +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import com.celzero.bravedns.util.Constants.Companion.UNSPECIFIED_PORT +import com.celzero.bravedns.util.Constants.Companion.UID_EVERYBODY +import com.celzero.bravedns.viewmodel.CustomDomainViewModel +import com.celzero.bravedns.viewmodel.CustomIpViewModel +import inet.ipaddr.IPAddressString +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import androidx.compose.runtime.rememberCoroutineScope + +enum class RulesTab(val value: Int) { + IP(0), + DOMAIN(1); + + companion object { + fun fromValue(value: Int): RulesTab { + return entries.firstOrNull { it.value == value } ?: IP + } + } +} + +enum class RulesMode(val value: Int) { + ALL_RULES(0), + APP_SPECIFIC(1); + + companion object { + fun fromValue(value: Int): RulesMode { + return entries.firstOrNull { it.value == value } ?: APP_SPECIFIC + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CustomRulesScreen( + uid: Int = UID_EVERYBODY, + initialTab: RulesTab = RulesTab.IP, + initialMode: RulesMode = RulesMode.APP_SPECIFIC, + domainViewModel: CustomDomainViewModel, + ipViewModel: CustomIpViewModel, + eventLogger: EventLogger, + onBackClick: (() -> Unit)? = null +) { + val scope = rememberCoroutineScope() + val density = LocalDensity.current + val navBarBottomInset = with(density) { WindowInsets.navigationBars.getBottom(density).toDp() } + var selectedTab by rememberSaveable(uid, initialTab) { mutableStateOf(initialTab) } + var selectedMode by rememberSaveable(uid, initialMode) { mutableStateOf(initialMode) } + var showAddDialog by remember { mutableStateOf(false) } + var ipQuery by rememberSaveable { mutableStateOf("") } + var domainQuery by rememberSaveable { mutableStateOf("") } + val canSwitchScope = uid == UID_EVERYBODY + val effectiveMode = if (canSwitchScope) selectedMode else RulesMode.APP_SPECIFIC + val isUniversalRules = uid == UID_EVERYBODY && effectiveMode == RulesMode.APP_SPECIFIC + val showAddButton = effectiveMode == RulesMode.APP_SPECIFIC + + LaunchedEffect(effectiveMode) { + if (effectiveMode != RulesMode.APP_SPECIFIC) { + showAddDialog = false + } + } + + Scaffold( + topBar = { + RethinkTopBar( + title = + if (isUniversalRules) { + stringResource(R.string.univ_view_blocked_ip) + } else if (effectiveMode == RulesMode.ALL_RULES) { + stringResource(R.string.lbl_app_wise) + } else { + stringResource(R.string.app_ip_domain_rules) + }, + onBackClick = onBackClick + ) + }, + floatingActionButton = { + if (showAddButton) { + ExtendedFloatingActionButton( + onClick = { showAddDialog = true }, + icon = { + Icon(imageVector = Icons.Default.Add, contentDescription = null) + }, + text = { + Text(text = stringResource(R.string.lbl_add)) + }, + modifier = Modifier.padding(bottom = navBarBottomInset + 6.dp) + ) + } + }, + floatingActionButtonPosition = FabPosition.Center, + containerColor = MaterialTheme.colorScheme.background + ) { padding -> + when (selectedTab) { + RulesTab.IP -> + IpRulesContent( + modifier = Modifier.padding(padding), + uid = uid, + selectedTab = selectedTab, + onTabSelected = { selectedTab = it }, + rulesMode = effectiveMode, + canSwitchScope = canSwitchScope, + onRulesModeChange = { selectedMode = it }, + query = ipQuery, + onQueryChange = { ipQuery = it }, + viewModel = ipViewModel, + eventLogger = eventLogger + ) + + RulesTab.DOMAIN -> + DomainRulesContent( + modifier = Modifier.padding(padding), + uid = uid, + selectedTab = selectedTab, + onTabSelected = { selectedTab = it }, + rulesMode = effectiveMode, + canSwitchScope = canSwitchScope, + onRulesModeChange = { selectedMode = it }, + query = domainQuery, + onQueryChange = { domainQuery = it }, + viewModel = domainViewModel, + eventLogger = eventLogger + ) + } + } + + if (showAddDialog && showAddButton) { + AddRuleDialog( + isIpRule = selectedTab == RulesTab.IP, + onDismiss = { showAddDialog = false }, + onAddIpRule = { ip -> + scope.launch(Dispatchers.IO) { + val ipAddress = IPAddressString(ip).address ?: return@launch + IpRulesManager.addIpRule(uid, ipAddress, null, IpRulesManager.IpRuleStatus.BLOCK, "", "") + } + eventLogger.log( + EventType.FW_RULE_MODIFIED, + Severity.LOW, + "Added IP rule", + EventSource.UI, + false, + "IP: $ip" + ) + showAddDialog = false + }, + onAddDomainRule = { domain -> + scope.launch(Dispatchers.IO) { + DomainRulesManager.addDomainRule( + domain, + DomainRulesManager.Status.BLOCK, + DomainRulesManager.DomainType.DOMAIN, + uid = uid + ) + } + eventLogger.log( + EventType.FW_RULE_MODIFIED, + Severity.LOW, + "Added domain rule", + EventSource.UI, + false, + "Domain: $domain" + ) + showAddDialog = false + } + ) + } +} + +@OptIn(FlowPreview::class) +@Composable +private fun IpRulesContent( + modifier: Modifier = Modifier, + uid: Int, + selectedTab: RulesTab, + onTabSelected: (RulesTab) -> Unit, + rulesMode: RulesMode, + canSwitchScope: Boolean, + onRulesModeChange: (RulesMode) -> Unit, + query: String, + onQueryChange: (String) -> Unit, + viewModel: CustomIpViewModel, + eventLogger: EventLogger +) { + val items = + when (rulesMode) { + RulesMode.APP_SPECIFIC -> viewModel.customIpDetails.asFlow().collectAsLazyPagingItems() + RulesMode.ALL_RULES -> viewModel.allIpRules.asFlow().collectAsLazyPagingItems() + } + + RulesContent( + modifier = modifier, + uid = uid, + selectedTab = selectedTab, + onTabSelected = onTabSelected, + rulesMode = rulesMode, + canSwitchScope = canSwitchScope, + onRulesModeChange = onRulesModeChange, + query = query, + onQueryChange = onQueryChange, + hint = stringResource(R.string.lbl_ip_rules), + emptyText = stringResource(R.string.rules_load_failure_desc), + items = items, + setUid = { modeUid -> viewModel.setUid(modeUid) }, + setFilter = { filter -> viewModel.setFilter(filter) }, + groupBy = { it.uid }, + onDeleteRule = { item -> IpRulesManager.removeIpRule(item.uid, item.ipAddress, item.port) }, + deleteEventMessage = "Removed IP rule", + deleteEventDetails = { item -> "IP: ${item.ipAddress}" }, + eventLogger = eventLogger + ) { item, position, onDelete -> + IpRuleListItem( + rule = item, + position = position, + onDelete = onDelete + ) + } +} + +@Composable +private fun IpRuleListItem( + rule: CustomIp, + position: CardPosition, + onDelete: () -> Unit +) { + val status = IpRulesManager.IpRuleStatus.getStatus(rule.status) + val statusLabelRes = + when (status) { + IpRulesManager.IpRuleStatus.BLOCK -> R.string.ci_block + IpRulesManager.IpRuleStatus.TRUST -> R.string.ci_trust_rule + IpRulesManager.IpRuleStatus.BYPASS_UNIVERSAL -> R.string.firewall_status_whitelisted + IpRulesManager.IpRuleStatus.NONE -> R.string.ci_no_rule + } + val statusColor = + when (status) { + IpRulesManager.IpRuleStatus.BLOCK -> MaterialTheme.colorScheme.error + IpRulesManager.IpRuleStatus.TRUST -> MaterialTheme.colorScheme.primary + else -> MaterialTheme.colorScheme.onSurfaceVariant + } + val headline = if (rule.port == UNSPECIFIED_PORT) rule.ipAddress else "${rule.ipAddress}:${rule.port}" + + RuleListItem( + headline = headline, + supporting = stringResource(statusLabelRes), + iconRes = R.drawable.ic_ip_address, + accent = statusColor, + position = position, + onDelete = onDelete + ) +} + +@OptIn(FlowPreview::class) +@Composable +private fun DomainRulesContent( + modifier: Modifier = Modifier, + uid: Int, + selectedTab: RulesTab, + onTabSelected: (RulesTab) -> Unit, + rulesMode: RulesMode, + canSwitchScope: Boolean, + onRulesModeChange: (RulesMode) -> Unit, + query: String, + onQueryChange: (String) -> Unit, + viewModel: CustomDomainViewModel, + eventLogger: EventLogger +) { + val items = + when (rulesMode) { + RulesMode.APP_SPECIFIC -> viewModel.customDomains.asFlow().collectAsLazyPagingItems() + RulesMode.ALL_RULES -> viewModel.allDomainRules.asFlow().collectAsLazyPagingItems() + } + + RulesContent( + modifier = modifier, + uid = uid, + selectedTab = selectedTab, + onTabSelected = onTabSelected, + rulesMode = rulesMode, + canSwitchScope = canSwitchScope, + onRulesModeChange = onRulesModeChange, + query = query, + onQueryChange = onQueryChange, + hint = stringResource(R.string.lbl_domain_rules), + emptyText = stringResource(R.string.cd_no_rules_text), + items = items, + setUid = { modeUid -> viewModel.setUid(modeUid) }, + setFilter = { filter -> viewModel.setFilter(filter) }, + groupBy = { it.uid }, + onDeleteRule = { item -> DomainRulesManager.deleteDomain(item) }, + deleteEventMessage = "Removed domain rule", + deleteEventDetails = { item -> "Domain: ${item.domain}" }, + eventLogger = eventLogger + ) { item, position, onDelete -> + DomainRuleListItem( + rule = item, + position = position, + onDelete = onDelete + ) + } +} + +@OptIn(FlowPreview::class) +@Composable +private fun RulesContent( + modifier: Modifier, + uid: Int, + selectedTab: RulesTab, + onTabSelected: (RulesTab) -> Unit, + rulesMode: RulesMode, + canSwitchScope: Boolean, + onRulesModeChange: (RulesMode) -> Unit, + query: String, + onQueryChange: (String) -> Unit, + hint: String, + emptyText: String, + items: LazyPagingItems, + setUid: (Int) -> Unit, + setFilter: (String) -> Unit, + groupBy: (T) -> Int, + onDeleteRule: suspend (T) -> Unit, + deleteEventMessage: String, + deleteEventDetails: (T) -> String, + eventLogger: EventLogger, + row: @Composable (item: T, position: CardPosition, onDelete: () -> Unit) -> Unit +) { + val scope = rememberCoroutineScope() + val density = LocalDensity.current + val navBarBottomInset = with(density) { WindowInsets.navigationBars.getBottom(density).toDp() } + + LaunchedEffect(uid, rulesMode) { + setUid(if (rulesMode == RulesMode.APP_SPECIFIC) uid else UID_EVERYBODY) + } + + LaunchedEffect(Unit) { + snapshotFlow { query } + .debounce(250) + .distinctUntilChanged() + .collect { q -> setFilter(q) } + } + + val isRefreshing = items.loadState.refresh is LoadState.Loading + val isEmpty = !isRefreshing && items.itemCount == 0 + + Column( + modifier = modifier.fillMaxSize() + ) { + RulesControlDeck( + selectedTab = selectedTab, + onTabSelected = onTabSelected, + rulesMode = rulesMode, + canSwitchScope = canSwitchScope, + onRulesModeChange = onRulesModeChange, + query = query, + onQueryChange = onQueryChange, + hint = hint + ) + + if (isRefreshing) { + RulesInfoRow( + text = stringResource(R.string.lbl_loading), + modifier = Modifier + .fillMaxWidth() + .padding(top = Dimensions.spacingSm) + ) + } else if (isEmpty) { + RulesEmptyState( + selectedTab = selectedTab, + text = emptyText, + modifier = Modifier + .fillMaxSize() + .padding( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + bottom = navBarBottomInset + ) + ) + } else { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = + PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = if (rulesMode == RulesMode.APP_SPECIFIC) { + 112.dp + navBarBottomInset + } else { + Dimensions.spacing3xl + navBarBottomInset + } + ), + verticalArrangement = Arrangement.spacedBy(0.dp) + ) { + items(items.itemCount) { index -> + val item = items[index] ?: return@items + val showHeader = + rulesMode == RulesMode.ALL_RULES && + shouldShowGroupHeader(items, index, groupBy) + if (showHeader) { + if (index > 0) { + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + } + RulesAppHeader(uid = groupBy(item)) + Spacer(modifier = Modifier.height(4.dp)) + } + val position = + if (rulesMode == RulesMode.ALL_RULES) { + groupedCardPosition(items, index, item, groupBy) + } else { + cardPositionFor(index, items.itemCount - 1) + } + + row( + item, + position, + { + scope.launch(Dispatchers.IO) { + onDeleteRule(item) + } + eventLogger.log( + EventType.FW_RULE_MODIFIED, + Severity.LOW, + deleteEventMessage, + EventSource.UI, + false, + deleteEventDetails(item) + ) + } + ) + } + } + } + } +} + +@Composable +private fun RulesEmptyState( + selectedTab: RulesTab, + text: String, + modifier: Modifier = Modifier +) { + val iconRes = + when (selectedTab) { + RulesTab.IP -> R.drawable.ic_ip_address + RulesTab.DOMAIN -> R.drawable.ic_undelegated_domain + } + val accent = + when (selectedTab) { + RulesTab.IP -> MaterialTheme.colorScheme.primary + RulesTab.DOMAIN -> MaterialTheme.colorScheme.tertiary + } + + Box( + modifier = modifier, + contentAlignment = Alignment.Center + ) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + color = MaterialTheme.colorScheme.surfaceContainerLow + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(10.dp) + ) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = accent.copy(alpha = 0.14f) + ) { + Icon( + painter = painterResource(id = iconRes), + contentDescription = null, + tint = accent, + modifier = Modifier + .padding(10.dp) + .size(20.dp) + ) + } + Text( + text = text, + modifier = Modifier.fillMaxWidth(), + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + textAlign = TextAlign.Center + ) + } + } + } +} + +@Composable +private fun DomainRuleListItem( + rule: CustomDomain, + position: CardPosition, + onDelete: () -> Unit +) { + val status = DomainRulesManager.Status.getStatus(rule.status) + val statusLabelRes = + when (status) { + DomainRulesManager.Status.BLOCK -> R.string.ci_block + DomainRulesManager.Status.TRUST -> R.string.ci_trust_rule + DomainRulesManager.Status.NONE -> R.string.ci_no_rule + } + val statusColor = + when (status) { + DomainRulesManager.Status.BLOCK -> MaterialTheme.colorScheme.error + DomainRulesManager.Status.TRUST -> MaterialTheme.colorScheme.primary + else -> MaterialTheme.colorScheme.onSurfaceVariant + } + + RuleListItem( + headline = rule.domain, + supporting = stringResource(statusLabelRes), + iconRes = R.drawable.ic_undelegated_domain, + accent = statusColor, + position = position, + onDelete = onDelete + ) +} + +@Composable +private fun RuleListItem( + headline: String, + supporting: String, + iconRes: Int, + accent: Color, + position: CardPosition, + onDelete: () -> Unit +) { + RethinkListItem( + headline = headline, + supporting = null, + leadingIconPainter = painterResource(id = iconRes), + leadingIconTint = accent, + leadingIconContainerColor = accent.copy(alpha = 0.14f), + position = position, + trailing = { + Row(horizontalArrangement = Arrangement.spacedBy(2.dp)) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = accent.copy(alpha = 0.14f) + ) { + Text( + text = supporting, + style = MaterialTheme.typography.labelSmall, + color = accent, + modifier = Modifier.padding(horizontal = 8.dp, vertical = 3.dp) + ) + } + IconButton(onClick = onDelete) { + Icon(imageVector = Icons.Filled.Delete, contentDescription = stringResource(R.string.lbl_delete)) + } + } + } + ) +} + +@Composable +private fun RulesAppHeader(uid: Int) { + val label by + produceState(initialValue = "UID $uid", key1 = uid) { + value = + withContext(Dispatchers.IO) { + val appName = FirewallManager.getAppNameByUid(uid).orEmpty().trim() + if (appName.isEmpty()) { + "UID $uid" + } else { + appName + } + } + } + + val supporting = if (label == "UID $uid") null else "UID $uid" + RethinkListItem( + headline = label, + supporting = supporting, + leadingIcon = Icons.Rounded.Apps, + position = CardPosition.Single, + defaultContainerColor = MaterialTheme.colorScheme.surfaceContainerHigh + ) +} + +private fun shouldShowGroupHeader( + items: LazyPagingItems, + index: Int, + groupBy: (T) -> Int +): Boolean { + if (index == 0) return true + val current = items[index] ?: return true + val prev = items[index - 1] ?: return true + return groupBy(prev) != groupBy(current) +} + +private fun groupedCardPosition( + items: LazyPagingItems, + index: Int, + item: T, + groupBy: (T) -> Int +): CardPosition { + val itemGroup = groupBy(item) + val hasPrevSame = index > 0 && items[index - 1]?.let(groupBy) == itemGroup + val hasNextSame = index < items.itemCount - 1 && items[index + 1]?.let(groupBy) == itemGroup + return when { + !hasPrevSame && !hasNextSame -> CardPosition.Single + !hasPrevSame -> CardPosition.First + !hasNextSame -> CardPosition.Last + else -> CardPosition.Middle + } +} + +@Composable +private fun RulesControlDeck( + selectedTab: RulesTab, + onTabSelected: (RulesTab) -> Unit, + rulesMode: RulesMode, + canSwitchScope: Boolean, + onRulesModeChange: (RulesMode) -> Unit, + query: String, + onQueryChange: (String) -> Unit, + hint: String +) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal) + .padding(top = Dimensions.spacingXs), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + if (canSwitchScope) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + RuleTypeSelector( + selectedTab = selectedTab, + onTabSelected = onTabSelected, + modifier = Modifier.weight(1f), + compact = true + ) + RuleScopeSelector( + rulesMode = rulesMode, + onRulesModeChange = onRulesModeChange, + modifier = Modifier.weight(1f), + compact = true + ) + } + } else { + RuleTypeSelector( + selectedTab = selectedTab, + onTabSelected = onTabSelected + ) + } + + RulesSearchField( + query = query, + onQueryChange = onQueryChange, + hint = hint + ) + } +} + +@Composable +private fun RuleTypeSelector( + selectedTab: RulesTab, + onTabSelected: (RulesTab) -> Unit, + modifier: Modifier = Modifier, + compact: Boolean = false +) { + RethinkConnectedChoiceButtonRow( + options = listOf(RulesTab.IP, RulesTab.DOMAIN), + selectedOption = selectedTab, + onOptionSelected = { tab -> onTabSelected(tab) }, + modifier = modifier.fillMaxWidth(), + buttonMinHeight = if (compact) 40.dp else 0.dp, + label = { option, selected -> + val labelRes = + when (option) { + RulesTab.IP -> if (compact) R.string.lbl_ip else R.string.lbl_ip_rules + RulesTab.DOMAIN -> if (compact) R.string.lbl_domain else R.string.lbl_domain_rules + } + Text( + text = stringResource(labelRes), + modifier = Modifier.fillMaxWidth(), + maxLines = 1, + overflow = TextOverflow.Ellipsis, + textAlign = TextAlign.Center, + style = if (compact) MaterialTheme.typography.labelMedium else MaterialTheme.typography.labelLarge, + fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium + ) + } + ) +} + +@Composable +private fun RuleScopeSelector( + rulesMode: RulesMode, + onRulesModeChange: (RulesMode) -> Unit, + modifier: Modifier = Modifier, + compact: Boolean = false +) { + RethinkConnectedChoiceButtonRow( + options = listOf(RulesMode.APP_SPECIFIC, RulesMode.ALL_RULES), + selectedOption = rulesMode, + onOptionSelected = { mode -> onRulesModeChange(mode) }, + modifier = modifier.fillMaxWidth(), + buttonMinHeight = if (compact) 40.dp else 0.dp, + label = { option, _ -> + Text( + text = + stringResource( + when (option) { + RulesMode.APP_SPECIFIC -> R.string.firewall_act_universal_tab + RulesMode.ALL_RULES -> R.string.lbl_app_wise + } + ), + modifier = Modifier.fillMaxWidth(), + maxLines = 1, + overflow = TextOverflow.Ellipsis, + textAlign = TextAlign.Center, + style = if (compact) MaterialTheme.typography.labelMedium else MaterialTheme.typography.labelLarge, + fontWeight = if (option == rulesMode) FontWeight.SemiBold else FontWeight.Medium + ) + } + ) +} + +@Composable +private fun RulesSearchField( + query: String, + onQueryChange: (String) -> Unit, + hint: String +) { + RethinkSearchField( + query = query, + onQueryChange = onQueryChange, + modifier = Modifier.fillMaxWidth(), + placeholder = stringResource(R.string.two_argument_colon, stringResource(R.string.lbl_search), hint), + onClearQuery = { onQueryChange("") }, + clearQueryContentDescription = stringResource(R.string.cd_clear_search), + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + containerColor = MaterialTheme.colorScheme.surfaceContainerLow + ) +} + +@Composable +private fun RulesInfoRow( + text: String, + modifier: Modifier = Modifier +) { + RethinkListGroup { + RethinkListItem( + headline = text, + position = CardPosition.Single, + enabled = false, + modifier = modifier.padding(horizontal = Dimensions.screenPaddingHorizontal) + ) + } +} + +@Composable +private fun AddRuleDialog( + isIpRule: Boolean, + onDismiss: () -> Unit, + onAddIpRule: (String) -> Unit, + onAddDomainRule: (String) -> Unit +) { + var ruleValue by remember { mutableStateOf("") } + val title = + if (isIpRule) { + stringResource(R.string.lbl_ip_rules) + } else { + stringResource(R.string.lbl_domain_rules) + } + + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = title, + text = { + OutlinedTextField( + value = ruleValue, + onValueChange = { ruleValue = it }, + label = { Text(text = title) }, + singleLine = true, + modifier = Modifier.fillMaxWidth() + ) + }, + confirmText = stringResource(R.string.lbl_add), + dismissText = stringResource(R.string.lbl_cancel), + confirmEnabled = ruleValue.isNotBlank(), + onConfirm = { + if (ruleValue.isNotBlank()) { + if (isIpRule) onAddIpRule(ruleValue.trim()) + else onAddDomainRule(ruleValue.trim()) + } + }, + onDismiss = onDismiss + ) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/FastScroller.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/FastScroller.kt new file mode 100644 index 000000000..09b053c31 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/FastScroller.kt @@ -0,0 +1,267 @@ +package com.celzero.bravedns.ui.compose.firewall + +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.foundation.gestures.awaitFirstDown +import androidx.compose.foundation.gestures.awaitTouchSlopOrCancellation +import androidx.compose.foundation.gestures.drag +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.hapticfeedback.HapticFeedbackType +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalHapticFeedback +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.IntOffset +import androidx.compose.ui.unit.IntSize +import androidx.compose.ui.unit.dp +import kotlinx.coroutines.launch +import kotlin.math.abs +import kotlin.math.roundToInt + +@Composable +fun IndexedFastScroller( + items: List, + listState: LazyListState, + getIndexKey: (T) -> String, + modifier: Modifier = Modifier, + minItemCount: Int = 24, + onInteractionStart: () -> Unit = {}, + onInteractionEnd: () -> Unit = {}, + scrollItemOffset: Int = 0, +) { + if (items.size < minItemCount) return + + val density = LocalDensity.current + val hapticFeedback = LocalHapticFeedback.current + val coroutineScope = rememberCoroutineScope() + val labelToIndexMap = + remember(items, items.hashCode()) { + val map = mutableMapOf() + items.forEachIndexed { index, item -> + val label = normalizeIndexLabel(getIndexKey(item)) + if (!map.containsKey(label)) { + map[label] = index + } + } + map + } + val labels = + remember(labelToIndexMap) { + labelToIndexMap.keys.sortedWith( + compareBy { if (it == "#") 0 else 1 }.thenBy { it }, + ) + } + + if (labels.isEmpty()) return + + val trackInset = 14.dp + val bubbleSize = 72.dp + val bubbleOffsetX = (-60).dp + val trackInsetPx = with(density) { trackInset.toPx() } + val bubbleSizePx = with(density) { bubbleSize.toPx() } + + var trackSize by remember { mutableStateOf(IntSize.Zero) } + var currentDragY by remember { mutableFloatStateOf(0f) } + var currentLabel by remember { mutableStateOf("") } + var previousLabel by remember { mutableStateOf("") } + var interacting by remember { mutableStateOf(false) } + + fun scrollToLabel(label: String) { + val targetIndex = labelToIndexMap[label] ?: return + coroutineScope.launch { + listState.scrollToItem((targetIndex - scrollItemOffset).coerceAtLeast(0)) + } + } + + fun selectFromPosition(y: Float) { + if (trackSize.height <= 0 || labels.isEmpty()) return + val trackHeight = trackSize.height.toFloat() + val clampedY = y.coerceIn(trackInsetPx, trackHeight - trackInsetPx) + val usableHeight = (trackHeight - (trackInsetPx * 2f)).coerceAtLeast(1f) + val progress = ((clampedY - trackInsetPx) / usableHeight).coerceIn(0f, 1f) + val index = (progress * (labels.size - 1)).roundToInt().coerceIn(0, labels.size - 1) + val selected = labels[index] + + if (selected != previousLabel) { + hapticFeedback.performHapticFeedback(HapticFeedbackType.TextHandleMove) + previousLabel = selected + } + + currentLabel = selected + currentDragY = + if (labels.size > 1) { + trackInsetPx + (index / (labels.size - 1).toFloat()) * usableHeight + } else { + trackHeight / 2f + } + scrollToLabel(selected) + } + + Box( + modifier = + modifier + .width(44.dp) + .fillMaxHeight(), + ) { + Column( + modifier = + Modifier + .fillMaxHeight() + .padding(vertical = trackInset) + .onGloballyPositioned { trackSize = it.size } + .pointerInput(labels, items.hashCode()) { + awaitPointerEventScope { + while (true) { + val down = awaitFirstDown() + interacting = true + onInteractionStart() + selectFromPosition(down.position.y) + + val change = + awaitTouchSlopOrCancellation(down.id) { pointerChange, _ -> + pointerChange.consume() + } + + if (change != null) { + drag(change.id) { dragChange -> + selectFromPosition(dragChange.position.y) + } + } + + interacting = false + previousLabel = "" + onInteractionEnd() + } + } + }, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + val usableHeight = (trackSize.height.toFloat() - (trackInsetPx * 2f)).coerceAtLeast(1f) + val adjustedDragY = (currentDragY - trackInsetPx).coerceIn(0f, usableHeight) + val dragProgress = if (usableHeight > 0f) adjustedDragY / usableHeight else 0f + + labels.forEachIndexed { index, label -> + val labelPosition = + if (labels.size > 1) index.toFloat() / (labels.size - 1) else 0.5f + val distance = abs(labelPosition - dragProgress) + + val scale by animateFloatAsState( + targetValue = + if (interacting) { + when { + distance < 0.06f -> 1.45f + distance < 0.12f -> 1.2f + else -> 0.95f + } + } else { + 1f + }, + animationSpec = spring(dampingRatio = 0.82f), + label = "fastScrollerScale_$index", + ) + val alpha by animateFloatAsState( + targetValue = + if (interacting) { + when { + distance < 0.06f -> 1f + distance < 0.12f -> 0.85f + else -> 0.55f + } + } else { + 0.72f + }, + animationSpec = spring(), + label = "fastScrollerAlpha_$index", + ) + + Box( + modifier = Modifier + .weight(1f) + .fillMaxWidth(), + contentAlignment = Alignment.Center, + ) { + Text( + text = label, + style = MaterialTheme.typography.labelSmall.copy(fontWeight = FontWeight.Bold), + color = MaterialTheme.colorScheme.primary, + textAlign = TextAlign.Center, + modifier = + Modifier + .fillMaxWidth() + .graphicsLayer { + scaleX = scale + scaleY = scale + this.alpha = alpha + }, + ) + } + } + } + + if (interacting && currentLabel.isNotEmpty()) { + val bubbleYPx = (currentDragY - bubbleSizePx / 2f) + .coerceIn(0f, (trackSize.height.toFloat() - bubbleSizePx).coerceAtLeast(0f)) + Surface( + modifier = + Modifier + .align(Alignment.TopStart) + .size(bubbleSize) + .offset { + IntOffset( + x = with(density) { bubbleOffsetX.roundToPx() }, + y = bubbleYPx.roundToInt(), + ) + }, + color = MaterialTheme.colorScheme.primaryContainer, + contentColor = MaterialTheme.colorScheme.onPrimaryContainer, + shape = RoundedCornerShape(16.dp), + shadowElevation = 6.dp, + ) { + Box(contentAlignment = Alignment.Center) { + Text( + text = currentLabel, + style = MaterialTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Bold), + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth(), + ) + } + } + } + } +} + +private fun normalizeIndexLabel(raw: String): String { + val key = raw.trim() + if (key.isEmpty()) return "#" + + if (key.all { it.isDigit() } && key.length <= 3) { + return key + } + + val first = key.first().uppercaseChar() + return if (first.isLetter()) first.toString() else "#" +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/FirewallSettingsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/FirewallSettingsScreen.kt new file mode 100644 index 000000000..e7e9ca0a7 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/FirewallSettingsScreen.kt @@ -0,0 +1,144 @@ +package com.celzero.bravedns.ui.compose.firewall + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Apps +import androidx.compose.material.icons.rounded.GppBad +import androidx.compose.material.icons.rounded.Public +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import kotlin.math.roundToInt +import kotlinx.coroutines.delay +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkActionListItem +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.SectionHeader + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun FirewallSettingsScreen( + onUniversalFirewallClick: () -> Unit, + onCustomIpDomainClick: () -> Unit, + onAppWiseIpDomainClick: () -> Unit, + initialFocusKey: String? = null, + onBackClick: (() -> Unit)? = null +) { + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + val listState = rememberLazyListState() + val density = LocalDensity.current + val initialFocus = initialFocusKey?.trim().orEmpty() + var pendingFocusKey by rememberSaveable(initialFocus) { mutableStateOf(initialFocus) } + var activeFocusKey by rememberSaveable(initialFocus) { + mutableStateOf(initialFocus.ifBlank { null }) + } + + LaunchedEffect(pendingFocusKey) { + val key = pendingFocusKey.trim() + if (key.isBlank()) return@LaunchedEffect + activeFocusKey = key + val target = + when (key) { + "firewall_universal", + "firewall_universal_main" -> 0 to 0 + "firewall_universal_blocked" -> 0 to 108 + "firewall_apps", + "firewall_apps_rules" -> 1 to 0 + else -> null + } + if (target != null) { + val (index, offsetDp) = target + val offsetPx = with(density) { offsetDp.dp.toPx().roundToInt() } + listState.animateScrollToItem(index, offsetPx) + delay(900) + if (activeFocusKey == key) { + activeFocusKey = null + } + } + pendingFocusKey = "" + } + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + containerColor = MaterialTheme.colorScheme.background, + topBar = { + RethinkLargeTopBar( + title = stringResource(id = R.string.firewall_mode_info_title), + subtitle = stringResource(id = R.string.universal_firewall_explanation), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + LazyColumn( + state = listState, + modifier = Modifier + .fillMaxWidth() + .padding(paddingValues), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingMd, + bottom = Dimensions.spacing3xl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + item { + SectionHeader(title = stringResource(id = R.string.firewall_act_universal_tab)) + RethinkListGroup { + RethinkActionListItem( + title = stringResource(id = R.string.univ_firewall_heading), + description = stringResource(id = R.string.universal_firewall_explanation), + icon = Icons.Rounded.Public, + position = CardPosition.First, + highlighted = activeFocusKey == "firewall_universal_main", + onClick = onUniversalFirewallClick + ) + RethinkActionListItem( + title = stringResource(id = R.string.univ_view_blocked_ip), + description = stringResource(id = R.string.univ_view_blocked_ip_desc), + icon = Icons.Rounded.GppBad, + position = CardPosition.Last, + highlighted = activeFocusKey == "firewall_universal_blocked", + onClick = onCustomIpDomainClick + ) + } + } + + item { + SectionHeader(title = stringResource(id = R.string.lbl_app_wise)) + RethinkListGroup { + RethinkActionListItem( + title = stringResource(id = R.string.app_ip_domain_rules), + description = stringResource(id = R.string.app_ip_domain_rules_desc), + icon = Icons.Rounded.Apps, + position = CardPosition.Single, + highlighted = activeFocusKey == "firewall_apps_rules", + onClick = onAppWiseIpDomainClick + ) + } + } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/UniversalFirewallSettingsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/UniversalFirewallSettingsScreen.kt new file mode 100644 index 000000000..65bacee89 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/firewall/UniversalFirewallSettingsScreen.kt @@ -0,0 +1,411 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.firewall + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.database.ConnectionTrackerRepository +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.FirewallRuleset +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkTopBarLazyColumnScreen +import com.celzero.bravedns.ui.compose.theme.RethinkToggleListItem +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.util.BackgroundAccessibilityService +import com.celzero.bravedns.util.Utilities +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class UniversalFirewallStatEntry( + val ruleId: String, + val count: Int +) + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun UniversalFirewallSettingsScreen( + persistentState: PersistentState, + eventLogger: EventLogger, + connTrackerRepository: ConnectionTrackerRepository, + onNavigateToLogs: (String) -> Unit, + onOpenAccessibilitySettings: () -> Unit, + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + + var stats by remember { mutableStateOf>(emptyList()) } + var isLoadingStats by remember { mutableStateOf(true) } + + var blockWhenDeviceLocked by remember { mutableStateOf(persistentState.getBlockWhenDeviceLocked()) } + var blockAppWhenBackground by remember { mutableStateOf(persistentState.getBlockAppWhenBackground()) } + var udpBlocked by remember { mutableStateOf(persistentState.getUdpBlocked()) } + var blockUnknownConnections by remember { mutableStateOf(persistentState.getBlockUnknownConnections()) } + var disallowDnsBypass by remember { mutableStateOf(persistentState.getDisallowDnsBypass()) } + var blockNewApp by remember { mutableStateOf(persistentState.getBlockNewlyInstalledApp()) } + var blockMeteredConnections by remember { mutableStateOf(persistentState.getBlockMeteredConnections()) } + var blockHttpConnections by remember { mutableStateOf(persistentState.getBlockHttpConnections()) } + var universalLockdown by remember { mutableStateOf(persistentState.getUniversalLockdown()) } + var showPermissionDialog by remember { mutableStateOf(false) } + + fun loadStats() { + isLoadingStats = true + scope.launch(Dispatchers.IO) { + val blockedUniversalRules = connTrackerRepository.getBlockedUniversalRulesCount() + val deviceLocked = + blockedUniversalRules.filter { it.blockedByRule.contains(FirewallRuleset.RULE3.id) } + val backgroundMode = + blockedUniversalRules.filter { it.blockedByRule.contains(FirewallRuleset.RULE4.id) } + val unknown = + blockedUniversalRules.filter { it.blockedByRule.contains(FirewallRuleset.RULE5.id) } + val udp = + blockedUniversalRules.filter { it.blockedByRule.contains(FirewallRuleset.RULE6.id) } + val dnsBypass = + blockedUniversalRules.filter { it.blockedByRule.contains(FirewallRuleset.RULE7.id) } + val newApp = + blockedUniversalRules.filter { it.blockedByRule.contains(FirewallRuleset.RULE1B.id) } + val metered = + blockedUniversalRules.filter { it.blockedByRule.contains(FirewallRuleset.RULE1F.id) } + val http = + blockedUniversalRules.filter { it.blockedByRule.contains(FirewallRuleset.RULE10.id) } + val lockdown = + blockedUniversalRules.filter { it.blockedByRule.contains(FirewallRuleset.RULE11.id) } + + val updatedStats = listOf( + UniversalFirewallStatEntry( + FirewallRuleset.RULE3.id, + deviceLocked.size + ), + UniversalFirewallStatEntry( + FirewallRuleset.RULE4.id, + backgroundMode.size + ), + UniversalFirewallStatEntry(FirewallRuleset.RULE5.id, unknown.size), + UniversalFirewallStatEntry(FirewallRuleset.RULE6.id, udp.size), + UniversalFirewallStatEntry( + FirewallRuleset.RULE7.id, + dnsBypass.size + ), + UniversalFirewallStatEntry(FirewallRuleset.RULE1B.id, newApp.size), + UniversalFirewallStatEntry(FirewallRuleset.RULE1F.id, metered.size), + UniversalFirewallStatEntry(FirewallRuleset.RULE10.id, http.size), + UniversalFirewallStatEntry(FirewallRuleset.RULE11.id, lockdown.size) + ) + + withContext(Dispatchers.Main) { + stats = updatedStats + isLoadingStats = false + } + } + } + + fun logEvent(details: String) { + eventLogger.log( + EventType.FW_RULE_MODIFIED, + Severity.LOW, + "Univ firewall setting", + EventSource.UI, + false, + details + ) + } + + fun statsFor(ruleId: String): UniversalFirewallStatEntry? { + return stats.firstOrNull { it.ruleId == ruleId } + } + + fun handleStatsClick(ruleId: String) { + val size = statsFor(ruleId)?.count ?: 0 + if (size > 0) { + onNavigateToLogs(ruleId) + } + } + + fun handleBackgroundToggle(enabled: Boolean) { + if (!enabled) { + blockAppWhenBackground = false + persistentState.setBlockAppWhenBackground(false) + logEvent("Univ firewall background mode changed toggled to false") + return + } + + val isAccessibilityServiceRunning = Utilities.isAccessibilityServiceEnabled( + context, + BackgroundAccessibilityService::class.java + ) + val isAccessibilityServiceEnabled = Utilities.isAccessibilityServiceEnabledViaSettingsSecure( + context, + BackgroundAccessibilityService::class.java + ) + val isAccessibilityServiceFunctional = isAccessibilityServiceRunning && isAccessibilityServiceEnabled + + if (isAccessibilityServiceFunctional) { + blockAppWhenBackground = true + persistentState.setBlockAppWhenBackground(true) + logEvent("Univ firewall background mode changed toggled to true") + return + } + + showPermissionDialog = true + blockAppWhenBackground = false + persistentState.setBlockAppWhenBackground(false) + logEvent("Univ firewall background mode change to true failed due to accessibility service not enabled") + } + + LaunchedEffect(Unit) { + loadStats() + } + + val blockedTotal = stats.sumOf { it.count } + val topBarSubtitle = + if (isLoadingStats) { + stringResource(R.string.universal_firewall_explanation) + } else { + stringResource( + R.string.two_argument_colon, + stringResource(R.string.lbl_blocked), + blockedTotal.toString() + ) + } + + RethinkTopBarLazyColumnScreen( + title = stringResource(R.string.univ_firewall_heading), + subtitle = topBarSubtitle, + onBackClick = onBackClick + ) { + item { + SectionHeader(title = stringResource(R.string.univ_firewall_heading)) + RethinkListGroup { + ToggleWithStats( + iconRes = R.drawable.ic_device_lock, + label = stringResource(R.string.univ_firewall_rule_1), + checked = blockWhenDeviceLocked, + onCheckedChange = { + blockWhenDeviceLocked = it + persistentState.setBlockWhenDeviceLocked(it) + logEvent("Univ firewall device locked mode changed toggled to $it") + }, + stats = statsFor(FirewallRuleset.RULE3.id), + loading = isLoadingStats, + onStatsClick = { handleStatsClick(FirewallRuleset.RULE3.id) }, + position = CardPosition.First + ) + ToggleWithStats( + iconRes = R.drawable.ic_foreground, + label = stringResource(R.string.univ_firewall_rule_2), + checked = blockAppWhenBackground, + onCheckedChange = { handleBackgroundToggle(it) }, + stats = statsFor(FirewallRuleset.RULE4.id), + loading = isLoadingStats, + onStatsClick = { handleStatsClick(FirewallRuleset.RULE4.id) }, + position = CardPosition.Middle + ) + ToggleWithStats( + iconRes = R.drawable.ic_unknown_app, + label = stringResource(R.string.univ_firewall_rule_3), + checked = blockUnknownConnections, + onCheckedChange = { + blockUnknownConnections = it + persistentState.setBlockUnknownConnections(it) + logEvent("Univ firewall unknown connection mode changed toggled to $it") + }, + stats = statsFor(FirewallRuleset.RULE5.id), + loading = isLoadingStats, + onStatsClick = { handleStatsClick(FirewallRuleset.RULE5.id) }, + position = CardPosition.Middle + ) + ToggleWithStats( + iconRes = R.drawable.ic_udp, + label = stringResource(R.string.univ_firewall_rule_4), + checked = udpBlocked, + onCheckedChange = { + udpBlocked = it + persistentState.setUdpBlocked(it) + logEvent("Univ firewall UDP connection mode changed toggled to $it") + }, + stats = statsFor(FirewallRuleset.RULE6.id), + loading = isLoadingStats, + onStatsClick = { handleStatsClick(FirewallRuleset.RULE6.id) }, + position = CardPosition.Middle + ) + ToggleWithStats( + iconRes = R.drawable.ic_prevent_dns_leaks, + label = stringResource(R.string.univ_firewall_rule_5), + checked = disallowDnsBypass, + onCheckedChange = { + disallowDnsBypass = it + persistentState.setDisallowDnsBypass(it) + logEvent("Univ firewall DNS bypass mode changed toggled to $it") + }, + stats = statsFor(FirewallRuleset.RULE7.id), + loading = isLoadingStats, + onStatsClick = { handleStatsClick(FirewallRuleset.RULE7.id) }, + position = CardPosition.Middle + ) + ToggleWithStats( + iconRes = R.drawable.ic_app_info, + label = stringResource(R.string.univ_firewall_rule_6), + checked = blockNewApp, + onCheckedChange = { + blockNewApp = it + persistentState.setBlockNewlyInstalledApp(it) + logEvent("Univ firewall new app block mode changed toggled to $it") + }, + stats = statsFor(FirewallRuleset.RULE1B.id), + loading = isLoadingStats, + onStatsClick = { handleStatsClick(FirewallRuleset.RULE1B.id) }, + position = CardPosition.Middle + ) + ToggleWithStats( + iconRes = R.drawable.ic_univ_metered, + label = stringResource(R.string.univ_firewall_rule_9), + checked = blockMeteredConnections, + onCheckedChange = { + blockMeteredConnections = it + persistentState.setBlockMeteredConnections(it) + logEvent("Univ firewall metered connection block mode changed toggled to $it") + }, + stats = statsFor(FirewallRuleset.RULE1F.id), + loading = isLoadingStats, + onStatsClick = { handleStatsClick(FirewallRuleset.RULE1F.id) }, + position = CardPosition.Middle + ) + ToggleWithStats( + iconRes = R.drawable.ic_http, + label = stringResource(R.string.univ_firewall_rule_8), + checked = blockHttpConnections, + onCheckedChange = { + blockHttpConnections = it + persistentState.setBlockHttpConnections(it) + logEvent("Univ firewall HTTP block mode changed toggled to $it") + }, + stats = statsFor(FirewallRuleset.RULE10.id), + loading = isLoadingStats, + onStatsClick = { handleStatsClick(FirewallRuleset.RULE10.id) }, + position = CardPosition.Middle + ) + ToggleWithStats( + iconRes = R.drawable.ic_global_lockdown, + label = stringResource(R.string.univ_firewall_rule_10), + checked = universalLockdown, + onCheckedChange = { + universalLockdown = it + persistentState.setUniversalLockdown(it) + logEvent("Univ firewall universal lockdown mode changed toggled to $it") + }, + stats = statsFor(FirewallRuleset.RULE11.id), + loading = isLoadingStats, + onStatsClick = { handleStatsClick(FirewallRuleset.RULE11.id) }, + position = CardPosition.Last + ) + } + } + } + + if (showPermissionDialog) { + RethinkConfirmDialog( + onDismissRequest = { showPermissionDialog = false }, + title = stringResource(R.string.alert_permission_accessibility), + message = stringResource(R.string.alert_firewall_accessibility_explanation), + confirmText = stringResource(R.string.univ_accessibility_dialog_positive), + dismissText = stringResource(R.string.univ_accessibility_dialog_negative), + onConfirm = { + showPermissionDialog = false + onOpenAccessibilitySettings() + }, + onDismiss = { showPermissionDialog = false } + ) + } +} + +@Composable +private fun ToggleWithStats( + iconRes: Int, + label: String, + checked: Boolean, + onCheckedChange: (Boolean) -> Unit, + stats: UniversalFirewallStatEntry?, + loading: Boolean, + onStatsClick: () -> Unit, + position: CardPosition = CardPosition.Middle +) { + val blockedCount = stats?.count ?: 0 + val supportingText = + if (loading) { + stringResource(R.string.lbl_loading) + } else { + stringResource( + R.string.two_argument_colon, + stringResource(R.string.lbl_blocked), + blockedCount.toString() + ) + } + + RethinkToggleListItem( + title = label, + description = supportingText, + iconRes = iconRes, + checked = checked, + onCheckedChange = onCheckedChange, + accentColor = MaterialTheme.colorScheme.onSurfaceVariant, + position = position, + trailingPrefix = { + if (!loading && blockedCount > 0) { + IconButton( + onClick = onStatsClick, + modifier = Modifier.size(32.dp) + ) { + Icon( + imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight, + contentDescription = stringResource(R.string.lbl_logs), + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(18.dp) + ) + } + } + } + ) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/home/HomeComponents.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/home/HomeComponents.kt new file mode 100644 index 000000000..88f2b5a02 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/home/HomeComponents.kt @@ -0,0 +1,107 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.home + +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.PlayArrow +import androidx.compose.material.icons.rounded.Stop +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.scale +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.Dimensions + +@Composable +fun StartStopButton( + isPlaying: Boolean, + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + val interactionSource = remember { MutableInteractionSource() } + val isPressed by interactionSource.collectIsPressedAsState() + val scale by animateFloatAsState( + targetValue = if (isPressed) 0.94f else 1f, + animationSpec = spring(dampingRatio = 0.5f, stiffness = Spring.StiffnessMedium), + label = "buttonScale" + ) + + val containerColor = if (isPlaying) MaterialTheme.colorScheme.error + else MaterialTheme.colorScheme.primary + val contentColor = if (isPlaying) MaterialTheme.colorScheme.onError + else MaterialTheme.colorScheme.onPrimary + + val text = if (isPlaying) { + stringResource(R.string.lbl_stop) + } else { + stringResource(R.string.lbl_start) + } + + val icon = if (isPlaying) Icons.Rounded.Stop else Icons.Rounded.PlayArrow + val cornerRadius by animateDpAsState( + targetValue = if (isPlaying) Dimensions.cornerRadiusSmMd else Dimensions.buttonCornerRadius, + animationSpec = spring(dampingRatio = 0.72f, stiffness = Spring.StiffnessMediumLow), + label = "startStopCornerRadius" + ) + + Button( + onClick = onClick, + modifier = modifier + .height(44.dp) + .scale(scale), + interactionSource = interactionSource, + shape = RoundedCornerShape(cornerRadius), + colors = ButtonDefaults.buttonColors( + containerColor = containerColor, + contentColor = contentColor + ), + elevation = ButtonDefaults.buttonElevation(defaultElevation = 2.dp, pressedElevation = 6.dp) + ) { + Icon( + imageVector = icon, + contentDescription = null, + tint = contentColor, + modifier = Modifier.size(Dimensions.iconSizeSm) + ) + Spacer(modifier = Modifier.width(Dimensions.spacingXs)) + Text( + text = text, + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.Bold, + color = contentColor + ) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/home/HomeScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/home/HomeScreen.kt new file mode 100644 index 000000000..7206a1d13 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/home/HomeScreen.kt @@ -0,0 +1,630 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.home + +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Shield +import androidx.compose.material.icons.rounded.ShieldMoon +import androidx.compose.material.icons.rounded.WarningAmber +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.LargeTopAppBar +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.MaterialShapes +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.toShape +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkTheme +import com.celzero.bravedns.ui.compose.theme.cardPositionFor + +data class HomeScreenUiState( + val isVpnActive: Boolean = false, + val dnsLatency: String = "-- ms", + val dnsConnectedName: String = "", + val firewallUniversalRules: Int = 0, + val firewallIpRules: Int = 0, + val firewallDomainRules: Int = 0, + val proxyStatus: String = "", + val networkLogsCount: Long = 0, + val dnsLogsCount: Long = 0, + val appsAllowed: Int = 0, + val appsBlocked: Int = 0, + val appsTotal: Int = 0, + val appsBypassed: Int = 0, + val appsIsolated: Int = 0, + val appsExcluded: Int = 0, + val protectionStatus: String = "", + val isProtectionFailing: Boolean = false +) + +private data class StatusItem( + val headline: String, + val supporting: String, + val iconPainter: Painter, + val iconAccentColor: Color, + val onClick: () -> Unit, +) + +private data class HomeStatusIconTints( + val apps: Color, + val dns: Color, + val firewall: Color, + val proxy: Color, + val logs: Color +) + +private val HomePrimaryCardShape = + RoundedCornerShape(Dimensions.heroCornerRadius) +private val HomeSecondaryCardShape = + RoundedCornerShape(Dimensions.heroCornerRadius) + +@Composable +private fun rememberHomeStatusIconTints(): HomeStatusIconTints { + return HomeStatusIconTints( + apps = Color(0xFF74C5FF), + dns = Color(0xFFC5ACFF), + firewall = Color(0xFFFF907F), + proxy = Color(0xFF46EBC8), + logs = Color(0xFF7EED92) + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun HomeScreen( + uiState: HomeScreenUiState, + onStartStopClick: () -> Unit, + onDnsClick: () -> Unit, + onFirewallClick: () -> Unit, + onProxyClick: () -> Unit, + onLogsClick: () -> Unit, + onAppsClick: () -> Unit, + onSponsorClick: () -> Unit +) { + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + val iconTints = rememberHomeStatusIconTints() + + val dnsSummary = if (uiState.dnsConnectedName.isNotBlank()) { + "${uiState.dnsConnectedName} · ${uiState.dnsLatency}" + } else { + stringResource(R.string.lbl_inactive) + } + + val firewallSummary = + "${uiState.firewallUniversalRules} ${stringResource(R.string.lbl_universal_rules)}" + + " · ${uiState.firewallIpRules} IP · ${uiState.firewallDomainRules} domain" + + val proxySummary = uiState.proxyStatus.ifEmpty { stringResource(R.string.lbl_inactive) } + + val logsSummary = + "${uiState.networkLogsCount} ${stringResource(R.string.lbl_network)}" + + " · ${uiState.dnsLogsCount} DNS" + + val appsSummary = + "${uiState.appsAllowed}/${uiState.appsTotal} ${stringResource(R.string.lbl_allowed)}" + + " · ${uiState.appsBlocked} ${stringResource(R.string.lbl_blocked)}" + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + containerColor = MaterialTheme.colorScheme.surface, + topBar = { + LargeTopAppBar( + title = { + Text( + text = stringResource(R.string.txt_home), + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold, + ) + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + LazyColumn( + state = rememberLazyListState(), + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = Dimensions.spacing3xl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + item { + ProtectionCard(uiState = uiState, onStartStopClick = onStartStopClick) + } + + item { + StatusSection( + title = stringResource(R.string.lbl_status), + accentColor = MaterialTheme.colorScheme.primary, + items = listOf( + StatusItem( + headline = stringResource(R.string.lbl_dns), + supporting = dnsSummary, + iconPainter = painterResource(id = R.drawable.dns_home_screen), + iconAccentColor = iconTints.dns, + onClick = onDnsClick, + ), + StatusItem( + headline = stringResource(R.string.lbl_firewall), + supporting = firewallSummary, + iconPainter = painterResource(id = R.drawable.firewall_home_screen), + iconAccentColor = iconTints.firewall, + onClick = onFirewallClick, + ), + StatusItem( + headline = stringResource(R.string.lbl_proxy), + supporting = proxySummary, + iconPainter = painterResource(id = R.drawable.ic_vpn), + iconAccentColor = iconTints.proxy, + onClick = onProxyClick, + ), + StatusItem( + headline = stringResource(R.string.lbl_logs), + supporting = logsSummary, + iconPainter = painterResource(id = R.drawable.ic_logs_accent), + iconAccentColor = iconTints.logs, + onClick = onLogsClick, + ) + ), + ) + } + + item { + AppsHealthCard( + uiState = uiState, + onClick = onAppsClick + ) + } + } + } +} + +// ─── Status Section ─────────────────────────────────────────────────────── + +@Composable +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +private fun StatusSection( + title: String, + accentColor: Color, + items: List, +) { + val iconTint = MaterialTheme.colorScheme.onPrimaryFixed.copy(alpha = 0.8f) + val statusIconShape = MaterialShapes.Cookie9Sided.toShape() + Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text( + text = title.uppercase(), + style = MaterialTheme.typography.labelMedium, + fontWeight = FontWeight.Bold, + letterSpacing = androidx.compose.ui.unit.TextUnit( + 0.8f, + androidx.compose.ui.unit.TextUnitType.Sp + ), + color = accentColor, + modifier = Modifier.padding( + start = Dimensions.spacingLg, + bottom = Dimensions.spacingSm, + ), + ) + + Column(modifier = Modifier.fillMaxWidth()) { + items.forEachIndexed { index, item -> + RethinkListItem( + headline = item.headline, + supporting = item.supporting, + leadingIconPainter = item.iconPainter, + leadingIconTint = iconTint, + leadingIconContainerColor = item.iconAccentColor, + leadingIconContainerShape = statusIconShape, + position = cardPositionFor(index = index, lastIndex = items.lastIndex), + onClick = item.onClick + ) + } + } + } +} + +// ─── Protection Status Card ─────────────────────────────────────────────── + +@Composable +private fun ProtectionCard( + uiState: HomeScreenUiState, + onStartStopClick: () -> Unit +) { + val statusColors = rememberHomeStatusIconTints() + val iconGlyphTint = MaterialTheme.colorScheme.onPrimaryFixed.copy(alpha = 0.8f) + val outlineVariant = MaterialTheme.colorScheme.outlineVariant + val error = MaterialTheme.colorScheme.error + + val targetIcon = when { + uiState.isProtectionFailing -> Icons.Rounded.WarningAmber + uiState.isVpnActive -> Icons.Rounded.Shield + else -> Icons.Rounded.ShieldMoon + } + + val targetAccentColor = when { + uiState.isProtectionFailing -> statusColors.firewall + uiState.isVpnActive -> statusColors.proxy + else -> MaterialTheme.colorScheme.onSurfaceVariant + } + + val targetContainerColor = when { + uiState.isProtectionFailing -> statusColors.firewall + uiState.isVpnActive -> statusColors.proxy + else -> MaterialTheme.colorScheme.surfaceContainerHighest + } + + val targetBorderColor = when { + uiState.isProtectionFailing -> statusColors.firewall.copy(alpha = 0.34f) + uiState.isVpnActive -> statusColors.proxy.copy(alpha = 0.34f) + else -> outlineVariant.copy(alpha = 0.36f) + } + + val accentColor by animateColorAsState( + targetValue = targetAccentColor, + animationSpec = spring(stiffness = Spring.StiffnessLow), + label = "protectionCardAccent" + ) + + val containerColor by animateColorAsState( + targetValue = targetContainerColor, + animationSpec = spring(stiffness = Spring.StiffnessLow), + label = "protectionCardIconContainer" + ) + + val borderColor by animateColorAsState( + targetValue = targetBorderColor, + animationSpec = spring(stiffness = Spring.StiffnessLow), + label = "protectionCardBorder" + ) + + val interactionSource = remember { MutableInteractionSource() } + val isPressed by interactionSource.collectIsPressedAsState() + val scale by animateFloatAsState( + targetValue = if (isPressed) 0.98f else 1f, + animationSpec = spring(stiffness = Spring.StiffnessHigh), + label = "pressScale" + ) + + val statusLabel = uiState.protectionStatus.ifEmpty { + if (uiState.isVpnActive) "Protected" else "Not active" + } + + Surface( + onClick = onStartStopClick, + shape = HomePrimaryCardShape, + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, borderColor), + tonalElevation = 0.dp, + interactionSource = interactionSource, + modifier = Modifier + .fillMaxWidth() + .graphicsLayer { + scaleX = scale + scaleY = scale + } + ) { + Column(modifier = Modifier.padding(Dimensions.cardPadding)) { + + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + Surface( + shape = RoundedCornerShape(Dimensions.iconContainerRadius), + color = containerColor, + modifier = Modifier.size(Dimensions.iconContainerLg) + ) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) { + Icon( + imageVector = targetIcon, + contentDescription = null, + tint = if (uiState.isVpnActive || uiState.isProtectionFailing) { + iconGlyphTint + } else { + accentColor + }, + modifier = Modifier.size(Dimensions.iconSizeMd) + ) + } + } + + Column(modifier = Modifier.weight(1f)) { + Text( + text = "Protection", + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Text( + text = statusLabel, + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.onSurface + ) + } + + StartStopButton( + isPlaying = uiState.isVpnActive, + onClick = onStartStopClick + ) + } + + Spacer(modifier = Modifier.height(Dimensions.spacingMd)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + MetricChip( + label = "Latency", + value = uiState.dnsLatency, + modifier = Modifier.weight(1f) + ) + MetricChip( + label = stringResource(R.string.lbl_network), + value = uiState.networkLogsCount.toString(), + modifier = Modifier.weight(1f) + ) + MetricChip( + label = stringResource(R.string.lbl_blocked), + value = uiState.appsBlocked.toString(), + valueColor = if (uiState.appsBlocked > 0) statusColors.firewall + else MaterialTheme.colorScheme.onSurface, + modifier = Modifier.weight(1f) + ) + } + } + } +} + +@Composable +private fun MetricChip( + label: String, + value: String, + modifier: Modifier = Modifier, + valueColor: Color = MaterialTheme.colorScheme.onSurface +) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + color = MaterialTheme.colorScheme.surfaceContainerHigh, + modifier = modifier + ) { + Column( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 10.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = value, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, + color = valueColor + ) + Spacer(modifier = Modifier.height(2.dp)) + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1 + ) + } + } +} + +// ─── Apps Health Card ───────────────────────────────────────────────────── + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun AppsHealthCard( + uiState: HomeScreenUiState, + onClick: () -> Unit +) { + val statusColors = rememberHomeStatusIconTints() + val iconGlyphTint = MaterialTheme.colorScheme.onPrimaryFixed.copy(alpha = 0.8f) + val appsProgress = remember(uiState.appsAllowed, uiState.appsTotal) { + if (uiState.appsTotal > 0) uiState.appsAllowed.toFloat() / uiState.appsTotal.toFloat() + else 0f + } + + Surface( + onClick = onClick, + shape = HomeSecondaryCardShape, + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.36f)) + ) { + Column(modifier = Modifier.padding(Dimensions.cardPadding)) { + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically, + ) { + Surface( + shape = RoundedCornerShape(Dimensions.iconContainerRadius), + color = statusColors.apps, + modifier = Modifier.size(Dimensions.iconContainerMd) + ) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) { + Icon( + painter = painterResource(id = R.drawable.ic_app_info_accent), + contentDescription = null, + tint = iconGlyphTint, + modifier = Modifier.size(Dimensions.iconSizeSm) + ) + } + } + + Text( + text = stringResource(R.string.lbl_apps), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, + modifier = Modifier.weight(1f) + ) + + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = statusColors.apps + ) { + Text( + text = uiState.appsTotal.toString(), + style = MaterialTheme.typography.labelMedium, + fontWeight = FontWeight.Bold, + color = iconGlyphTint, + modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp) + ) + } + } + + Spacer(modifier = Modifier.height(Dimensions.spacingMd)) + + LinearProgressIndicator( + progress = { appsProgress }, + modifier = Modifier + .fillMaxWidth() + .height(10.dp) + .clip(RoundedCornerShape(Dimensions.cornerRadiusPill)), + color = statusColors.apps, + trackColor = MaterialTheme.colorScheme.surfaceContainerHighest, + strokeCap = StrokeCap.Round + ) + + Spacer(modifier = Modifier.height(Dimensions.spacingMd)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly + ) { + AppStat( + label = stringResource(R.string.lbl_allowed), + value = uiState.appsAllowed.toString(), + color = MaterialTheme.colorScheme.secondary + ) + AppStat( + label = stringResource(R.string.lbl_blocked), + value = uiState.appsBlocked.toString(), + color = if (uiState.appsBlocked > 0) statusColors.firewall + else MaterialTheme.colorScheme.onSurfaceVariant + ) + AppStat( + label = stringResource(R.string.lbl_bypassed), + value = uiState.appsBypassed.toString(), + color = statusColors.dns + ) + } + } + } +} + +@Composable +private fun AppStat(label: String, value: String, color: Color) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text( + text = value, + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + color = color + ) + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } +} + +// ─── Preview ────────────────────────────────────────────────────────────── + +@Preview(showBackground = true) +@Composable +fun HomeScreenPreview() { + RethinkTheme { + HomeScreen( + uiState = HomeScreenUiState( + isVpnActive = true, + dnsLatency = "24ms", + dnsConnectedName = "Cloudflare", + firewallUniversalRules = 12, + firewallIpRules = 3, + firewallDomainRules = 8, + appsTotal = 120, + appsAllowed = 115, + appsBlocked = 5, + appsBypassed = 2, + networkLogsCount = 4320, + dnsLogsCount = 1230, + protectionStatus = "Protected" + ), + onStartStopClick = {}, + onDnsClick = {}, + onFirewallClick = {}, + onProxyClick = {}, + onLogsClick = {}, + onAppsClick = {}, + onSponsorClick = {} + ) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/home/HomeScreenViewModel.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/home/HomeScreenViewModel.kt new file mode 100644 index 000000000..8e39bdebd --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/home/HomeScreenViewModel.kt @@ -0,0 +1,233 @@ +package com.celzero.bravedns.ui.compose.home + +import androidx.lifecycle.LiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.asFlow +import androidx.lifecycle.viewModelScope +import com.celzero.bravedns.R +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.service.DomainRulesManager +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.service.IpRulesManager +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.util.Utilities +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import android.content.Context +import com.celzero.bravedns.service.BraveVPNService +import com.celzero.bravedns.service.DnsLogTracker +import com.celzero.bravedns.service.ProxyManager +import com.celzero.bravedns.service.ProxyStateManager +import com.celzero.bravedns.service.WireguardManager +import com.celzero.firestack.backend.Backend + +class HomeScreenViewModel( + private val persistentState: PersistentState, + private val appConfig: AppConfig +) : ViewModel() { + + private val _uiState = MutableStateFlow(HomeScreenUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + private var proxyStateListenerJob: Job? = null + private var dnsLatencyJob: Job? = null + + init { + observeVpnState() + observeDnsStates() + observeFirewallStates() + observeLogsCount() + observeProxyStates() + observeAppStates() + } + + private fun observeVpnState() { + persistentState.vpnEnabledLiveData.asFlow().onEach { enabled -> + _uiState.update { it.copy(isVpnActive = enabled) } + syncDnsStatus() + }.launchIn(viewModelScope) + + VpnController.connectionStatus.asFlow().onEach { + if (VpnController.isAppPaused()) return@onEach + syncDnsStatus() + }.launchIn(viewModelScope) + } + + private fun observeDnsStates() { + appConfig.getConnectedDnsObservable().asFlow().onEach { dnsName -> + _uiState.update { it.copy(dnsConnectedName = dnsName) } + }.launchIn(viewModelScope) + + // DNS Latency polling + dnsLatencyJob?.cancel() + dnsLatencyJob = viewModelScope.launch(Dispatchers.IO) { + while (true) { + if (appConfig.getBraveMode().isDnsActive()) { + val dnsId = getDnsId() + val p50 = VpnController.p50(dnsId) + val latencyText = formatLatency(p50) + _uiState.update { it.copy(dnsLatency = latencyText) } + } else { + _uiState.update { it.copy(dnsConnectedName = "Disabled", dnsLatency = "-- ms") } + } + delay(5000L) + } + } + } + + private fun getDnsId(): String { + return if (WireguardManager.oneWireGuardEnabled()) { + val id = WireguardManager.getOneWireGuardProxyId() + if (id == null) { + if (appConfig.isSmartDnsEnabled()) Backend.Plus else Backend.Preferred + } else { + "${ProxyManager.ID_WG_BASE}${id}" + } + } else { + if (appConfig.isSmartDnsEnabled()) Backend.Plus else Backend.Preferred + } + } + + private fun formatLatency(p50: Long): String { + return when (p50) { + in 0L..19L -> "Very Fast" + in 20L..50L -> "Fast" + in 51L..100L -> "Slow" + else -> "Very Slow" + } + } + + private fun observeFirewallStates() { + persistentState.universalRulesCount.asFlow().onEach { count -> + _uiState.update { it.copy(firewallUniversalRules = count) } + }.launchIn(viewModelScope) + + IpRulesManager.getCustomIpsLiveData().asFlow().onEach { count -> + _uiState.update { it.copy(firewallIpRules = count) } + }.launchIn(viewModelScope) + + DomainRulesManager.getUniversalCustomDomainCount().asFlow().onEach { count -> + _uiState.update { it.copy(firewallDomainRules = count) } + }.launchIn(viewModelScope) + } + + private fun observeLogsCount() { + appConfig.dnsLogsCount.asFlow().onEach { count -> + _uiState.update { it.copy(dnsLogsCount = count) } + }.launchIn(viewModelScope) + + appConfig.networkLogsCount.asFlow().onEach { count -> + _uiState.update { it.copy(networkLogsCount = count) } + }.launchIn(viewModelScope) + } + + private fun observeProxyStates() { + persistentState.getProxyStatus().asFlow().distinctUntilChanged().onEach { status -> + proxyStateListenerJob?.cancel() + if (status != -1) { + proxyStateListenerJob = viewModelScope.launch(Dispatchers.IO) { + while (true) { + updateUiWithProxyStates() + delay(1500L) + } + } + } else { + _uiState.update { it.copy(proxyStatus = "Inactive") } + } + }.launchIn(viewModelScope) + } + + private suspend fun updateUiWithProxyStates() { + if (!persistentState.getVpnEnabled()) { + _uiState.update { it.copy(proxyStatus = "Inactive") } + return + } + + val proxyType = AppConfig.ProxyType.of(appConfig.getProxyType()) + if (proxyType.isProxyTypeWireguard()) { + val status = ProxyStateManager.calculateWireguardProxyStatus() + _uiState.update { it.copy(proxyStatus = status.statusText) } + } else { + val status = if (appConfig.isProxyEnabled()) "Active" else "Inactive" + _uiState.update { it.copy(proxyStatus = status) } + } + } + + private fun observeAppStates() { + FirewallManager.getApplistObserver().asFlow().onEach { list -> + val blockedCount = list.count { it.connectionStatus != FirewallManager.ConnectionStatus.ALLOW.id } + val bypassCount = list.count { it.firewallStatus == FirewallManager.FirewallStatus.BYPASS_UNIVERSAL.id || it.firewallStatus == FirewallManager.FirewallStatus.BYPASS_DNS_FIREWALL.id } + val excludedCount = list.count { it.firewallStatus == FirewallManager.FirewallStatus.EXCLUDE.id } + val isolatedCount = list.count { it.firewallStatus == FirewallManager.FirewallStatus.ISOLATE.id } + val allApps = list.size + val allowedApps = allApps - (blockedCount + bypassCount + excludedCount + isolatedCount) + + _uiState.update { + it.copy( + appsAllowed = allowedApps, + appsTotal = allApps, + appsBlocked = blockedCount, + appsBypassed = bypassCount, + appsExcluded = excludedCount, + appsIsolated = isolatedCount + ) + } + }.launchIn(viewModelScope) + } + + fun syncDnsStatus() { + viewModelScope.launch { + val vpnState = VpnController.state() + val isEch = vpnState.serverName?.contains(DnsLogTracker.ECH, true) == true + var isFailing = false + var statusString = "Protected" + + if (vpnState.on) { + when (vpnState.connectionState) { + BraveVPNService.State.APP_ERROR, + BraveVPNService.State.DNS_ERROR, + BraveVPNService.State.DNS_SERVER_DOWN, + BraveVPNService.State.NO_INTERNET -> { + isFailing = true + statusString = "Failing" + } + BraveVPNService.State.WORKING, + BraveVPNService.State.NEW -> { + statusString = if (isEch) "Ultra Secure" else "Protected" + } + else -> { + isFailing = true + statusString = "Failing" + } + } + } else if (persistentState.getVpnEnabled()) { + isFailing = true + statusString = "Waiting" + } else { + isFailing = true + statusString = "Exposed" + } + + if (VpnController.isUnderlyingVpnNetworkEmpty()) { + isFailing = true + statusString = "No Network" + } + + _uiState.update { + it.copy(protectionStatus = statusString, isProtectionFailing = isFailing) + } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/home/PauseScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/home/PauseScreen.kt new file mode 100644 index 000000000..57d8c3612 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/home/PauseScreen.kt @@ -0,0 +1,315 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.home + +import androidx.compose.foundation.gestures.detectTapGestures +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.ElevatedButton +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.lifecycle.Observer +import androidx.lifecycle.compose.LocalLifecycleOwner +import com.celzero.bravedns.R +import com.celzero.bravedns.database.AppInfo +import com.celzero.bravedns.service.BraveVPNService +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.service.PauseTimer.PAUSE_VPN_EXTRA_MILLIS +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import java.util.concurrent.TimeUnit + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun PauseScreen(onFinish: () -> Unit) { + val lifecycleOwner = LocalLifecycleOwner.current + val scope = rememberCoroutineScope() + val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() + + var timerText by remember { mutableStateOf("00:00:00") } + var timerDesc by remember { mutableStateOf("") } + var autoOp by remember { mutableStateOf(AutoOp.NONE) } + var longPressJob by remember { mutableStateOf(null) } + + DisposableEffect(lifecycleOwner) { + val connectionObserver = Observer { state -> + if (state != BraveVPNService.State.PAUSED) onFinish() + } + val timerObserver = Observer { millis -> + val ss = (TimeUnit.MILLISECONDS.toSeconds(millis) % 60).toString().padStart(2, '0') + val mm = (TimeUnit.MILLISECONDS.toMinutes(millis) % 60).toString().padStart(2, '0') + val hh = TimeUnit.MILLISECONDS.toHours(millis).toString().padStart(2, '0') + timerText = "$hh:$mm:$ss" + } + val appListObserver = Observer> { list -> + timerDesc = list.count { a -> a.connectionStatus != FirewallManager.ConnectionStatus.ALLOW.id }.toString() + } + + VpnController.connectionStatus.observe(lifecycleOwner, connectionObserver) + VpnController.getPauseCountDownObserver()?.observe(lifecycleOwner, timerObserver) + FirewallManager.getApplistObserver().observe(lifecycleOwner, appListObserver) + if (!VpnController.isAppPaused()) onFinish() + + onDispose { + VpnController.connectionStatus.removeObserver(connectionObserver) + VpnController.getPauseCountDownObserver()?.removeObserver(timerObserver) + FirewallManager.getApplistObserver().removeObserver(appListObserver) + longPressJob?.cancel() + } + } + + fun handleLongPress() { + if (longPressJob?.isActive == true) return + longPressJob = scope.launch(Dispatchers.Main) { + while (autoOp != AutoOp.NONE) { + when (autoOp) { + AutoOp.INCREASE -> { + delay(200); VpnController.increasePauseDuration(PAUSE_VPN_EXTRA_MILLIS) + } + + AutoOp.DECREASE -> { + delay(200); VpnController.decreasePauseDuration(PAUSE_VPN_EXTRA_MILLIS) + } + + else -> {} + } + } + } + } + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + containerColor = MaterialTheme.colorScheme.background, + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.pause_text), + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(horizontal = Dimensions.screenPaddingHorizontal), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + Spacer(modifier = Modifier.height(Dimensions.spacingMd)) + + // ── Timer card ──────────────────────────────────────────────── + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadius5xl), + color = MaterialTheme.colorScheme.surfaceContainer, + tonalElevation = 0.dp + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 24.dp, vertical = 32.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + // Label chip + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = MaterialTheme.colorScheme.secondaryContainer + ) { + Text( + text = stringResource(R.string.pause_text).uppercase(), + style = MaterialTheme.typography.labelSmall, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.onSecondaryContainer, + letterSpacing = androidx.compose.ui.unit.TextUnit( + 1.2f, + androidx.compose.ui.unit.TextUnitType.Sp + ), + modifier = Modifier.padding(horizontal = 12.dp, vertical = 5.dp) + ) + } + + Spacer(modifier = Modifier.height(8.dp)) + + // Monospace countdown timer — big, bold, beautiful + Text( + text = timerText, + style = MaterialTheme.typography.displayLarge, + fontFamily = FontFamily.Monospace, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.onSurface, + textAlign = TextAlign.Center + ) + + Spacer(modifier = Modifier.height(4.dp)) + + // Blocked apps count + if (timerDesc.isNotEmpty()) { + Text( + text = stringResource(R.string.pause_desc, timerDesc), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center + ) + } + + Spacer(modifier = Modifier.height(20.dp)) + + // ── Controls ────────────────────────────────────────── + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically + ) { + PauseControlButton( + icon = R.drawable.ic_minus, + size = 52.dp, + containerColor = MaterialTheme.colorScheme.surfaceContainerHighest, + onClick = { VpnController.decreasePauseDuration(PAUSE_VPN_EXTRA_MILLIS) }, + onLongClick = { autoOp = AutoOp.DECREASE; handleLongPress() }, + onRelease = { autoOp = AutoOp.NONE } + ) + Spacer(modifier = Modifier.width(16.dp)) + // Resume button — large, prominent, error tint + PauseControlButton( + icon = R.drawable.ic_stop, + size = 72.dp, + containerColor = MaterialTheme.colorScheme.errorContainer, + iconTintIsOnError = true, + onClick = { VpnController.resumeApp(); onFinish() }, + onLongClick = {}, + onRelease = {} + ) + Spacer(modifier = Modifier.width(16.dp)) + PauseControlButton( + icon = R.drawable.ic_plus, + size = 52.dp, + containerColor = MaterialTheme.colorScheme.surfaceContainerHighest, + onClick = { VpnController.increasePauseDuration(PAUSE_VPN_EXTRA_MILLIS) }, + onLongClick = { autoOp = AutoOp.INCREASE; handleLongPress() }, + onRelease = { autoOp = AutoOp.NONE } + ) + } + } + } + + // Resume bottom button — full width + ElevatedButton( + onClick = { VpnController.resumeApp(); onFinish() }, + modifier = Modifier.fillMaxWidth().height(52.dp), + shape = RoundedCornerShape(Dimensions.cornerRadiusXl), + colors = ButtonDefaults.elevatedButtonColors( + containerColor = MaterialTheme.colorScheme.error, + contentColor = MaterialTheme.colorScheme.onError + ) + ) { + Icon( + painter = painterResource(R.drawable.ic_stop), + contentDescription = null, + modifier = Modifier.size(18.dp) + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = stringResource(R.string.notif_dialog_pause_dialog_positive), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold + ) + } + } + } +} + +@Composable +private fun PauseControlButton( + icon: Int, + size: Dp, + containerColor: androidx.compose.ui.graphics.Color, + iconTintIsOnError: Boolean = false, + onClick: () -> Unit, + onLongClick: () -> Unit, + onRelease: () -> Unit +) { + val iconTint = if (iconTintIsOnError) MaterialTheme.colorScheme.onErrorContainer + else MaterialTheme.colorScheme.onSurfaceVariant + + Surface( + modifier = Modifier.size(size), + shape = RoundedCornerShape(size / 3), + color = containerColor, + tonalElevation = 0.dp + ) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .fillMaxSize() + .pointerInput(Unit) { + detectTapGestures( + onTap = { onClick() }, + onLongPress = { onLongClick() }, + onPress = { tryAwaitRelease(); onRelease() } + ) + } + ) { + Icon( + painter = androidx.compose.ui.res.painterResource(id = icon), + contentDescription = null, + tint = iconTint, + modifier = Modifier.size(size * 0.44f) + ) + } + } +} + +private enum class AutoOp { INCREASE, DECREASE, NONE } diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/home/WelcomeScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/home/WelcomeScreen.kt new file mode 100644 index 000000000..8e93dfb00 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/home/WelcomeScreen.kt @@ -0,0 +1,281 @@ +/* + * Copyright 2020 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.home + +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateDpAsState +import androidx.compose.animation.core.spring +import androidx.compose.animation.expandVertically +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkVertically +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawing +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.only +import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.WindowInsetsSides +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.pager.HorizontalPager +import androidx.compose.foundation.pager.PagerState +import androidx.compose.foundation.pager.rememberPagerState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.rounded.ArrowForward +import androidx.compose.material.icons.rounded.Check +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.Dimensions +import kotlinx.coroutines.launch + +@Composable +fun WelcomeScreen(onFinish: () -> Unit) { + val slides = remember { + listOf( + WelcomeSlide(R.drawable.ic_launcher, R.string.slide_2_title, R.string.slide_2_desc), + WelcomeSlide(R.drawable.ic_wireguard_welcome, R.string.wireguard_title, R.string.wireguard_desc), + WelcomeSlide(R.drawable.ic_firewall_welcome, R.string.firewall_title, R.string.firewall_desc), + WelcomeSlide(R.drawable.ic_dns_welcome, R.string.dns_title, R.string.dns_desc) + ) + } + + val pagerState = rememberPagerState { slides.size } + val scope = rememberCoroutineScope() + val isLastPage = pagerState.currentPage >= slides.lastIndex + + Scaffold( + containerColor = MaterialTheme.colorScheme.surface, + contentWindowInsets = WindowInsets.safeDrawing.only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal) + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { + // Skip link — top right, subtle + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal, vertical = 8.dp), + horizontalArrangement = Arrangement.End + ) { + AnimatedVisibility( + visible = !isLastPage, + enter = expandVertically() + fadeIn(), + exit = fadeOut() + shrinkVertically() + ) { + TextButton(onClick = onFinish) { + Text( + text = stringResource(R.string.skip), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } + + // Full slide pager — takes all available space + HorizontalPager( + state = pagerState, + modifier = Modifier + .weight(1f) + .padding(horizontal = Dimensions.screenPaddingHorizontal), + pageSpacing = 12.dp, + beyondViewportPageCount = 1 + ) { page -> + WelcomeSlideContent(slide = slides[page]) + } + + // Bottom nav area + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal) + .padding(top = 20.dp) + .padding(bottom = 12.dp) + .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom)), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(20.dp) + ) { + PillDotIndicator(count = slides.size, pagerState = pagerState) + + Button( + onClick = { + if (isLastPage) onFinish() + else scope.launch { pagerState.animateScrollToPage(pagerState.currentPage + 1) } + }, + modifier = Modifier + .fillMaxWidth() + .height(56.dp), + shape = RoundedCornerShape(Dimensions.cornerRadiusXl), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primary + ) + ) { + if (isLastPage) { + Icon( + imageVector = Icons.Rounded.Check, + contentDescription = null, + modifier = Modifier.size(20.dp) + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = stringResource(R.string.finish), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold + ) + } else { + Text( + text = stringResource(R.string.next), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold + ) + Spacer(modifier = Modifier.width(8.dp)) + Icon( + imageVector = Icons.AutoMirrored.Rounded.ArrowForward, + contentDescription = null, + modifier = Modifier.size(20.dp) + ) + } + } + } + } + } +} + +@Composable +private fun WelcomeSlideContent(slide: WelcomeSlide) { + // Each slide fills the allocated space — M3 tonal card, no border + Surface( + modifier = Modifier.fillMaxSize(), + shape = RoundedCornerShape(Dimensions.cornerRadius5xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 0.dp + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 28.dp, vertical = 36.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + // Feature image in a tinted circular container + Surface( + shape = CircleShape, + color = MaterialTheme.colorScheme.primaryContainer, + modifier = Modifier.size(180.dp) + ) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) { + Image( + painter = painterResource(id = slide.image), + contentDescription = null, + modifier = Modifier.size(110.dp) + ) + } + } + + Spacer(modifier = Modifier.height(36.dp)) + + Text( + text = stringResource(slide.title), + style = MaterialTheme.typography.headlineMedium, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.onSurface, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + + Spacer(modifier = Modifier.height(12.dp)) + + Text( + text = stringResource(slide.desc), + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + } + } +} + +@Composable +private fun PillDotIndicator(count: Int, pagerState: PagerState) { + val activeColor = MaterialTheme.colorScheme.primary + val inactiveColor = MaterialTheme.colorScheme.surfaceContainerHighest + val dotSize = 8.dp + + Row( + horizontalArrangement = Arrangement.spacedBy(6.dp, Alignment.CenterHorizontally), + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth() + ) { + repeat(count) { index -> + val isSelected = pagerState.currentPage == index + val width by animateDpAsState( + targetValue = if (isSelected) 24.dp else dotSize, + animationSpec = spring(stiffness = Spring.StiffnessMediumLow), + label = "dotWidth" + ) + val color by animateColorAsState( + targetValue = if (isSelected) activeColor else inactiveColor, + animationSpec = spring(stiffness = Spring.StiffnessMediumLow), + label = "dotColor" + ) + Box( + modifier = Modifier + .height(dotSize) + .width(width) + .clip(RoundedCornerShape(Dimensions.cornerRadiusXs)) + .background(color) + ) + } + } +} + +private data class WelcomeSlide(val image: Int, val title: Int, val desc: Int) diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/logs/AppWiseDomainLogsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/logs/AppWiseDomainLogsScreen.kt new file mode 100644 index 000000000..ddd62420f --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/logs/AppWiseDomainLogsScreen.kt @@ -0,0 +1,181 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.logs + +import android.graphics.drawable.Drawable +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.lifecycle.asFlow +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.CloseConnsDialog +import com.celzero.bravedns.adapter.DomainRow +import com.celzero.bravedns.data.AppConnection +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.ui.bottomsheet.AppDomainRulesSheet +import com.celzero.bravedns.util.Constants.Companion.INVALID_UID +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.viewmodel.AppConnectionsViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +@Composable +fun AppWiseDomainLogsScreen( + uid: Int, + viewModel: AppConnectionsViewModel, + eventLogger: EventLogger, + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val twoArgumentColonTemplate = stringResource(R.string.two_argument_colon) + val twoArgumentSpaceTemplate = stringResource(R.string.two_argument_space) + val appOtherAppsTemplate = stringResource(R.string.ctbs_app_other_apps, "", "") + val searchLabel = stringResource(R.string.lbl_search) + val serviceProviderLabel = stringResource(R.string.lbl_service_providers) + val universalIpLabel = stringResource(R.string.search_universal_ips) + var appName by remember(uid) { mutableStateOf("") } + var searchHint by remember { mutableStateOf("") } + var appIcon by remember { mutableStateOf(null) } + var selectedCategory by remember { mutableStateOf(AppConnectionsViewModel.TimeCategory.SEVEN_DAYS) } + var showDeleteDialog by remember { mutableStateOf(false) } + + LaunchedEffect(uid) { + if (uid == INVALID_UID) { + onBackClick?.invoke() + return@LaunchedEffect + } + + viewModel.setUid(uid) + viewModel.setFilter("", AppConnectionsViewModel.FilterType.DOMAIN) + viewModel.timeCategoryChanged(selectedCategory, true) + + withContext(Dispatchers.IO) { + val meta = resolveAppWiseLogsHeader( + context = context, + uid = uid, + isAsn = false, + appOtherAppsTemplate = appOtherAppsTemplate, + twoArgumentColonTemplate = twoArgumentColonTemplate, + twoArgumentSpaceTemplate = twoArgumentSpaceTemplate, + searchLabel = searchLabel, + serviceProvidersLabel = serviceProviderLabel, + universalIpsLabel = universalIpLabel + ) + if (meta == null) { + withContext(Dispatchers.Main) { onBackClick?.invoke() } + return@withContext + } + withContext(Dispatchers.Main) { + appName = meta.appName + searchHint = meta.searchHint + appIcon = meta.appIcon + } + } + } + + val items = remember(uid) { viewModel.appDomainLogs.asFlow() }.collectAsLazyPagingItems() + + AppWiseLogsScaffold( + title = appName, + onBackClick = onBackClick + ) { paddingValues -> + if (showDeleteDialog) { + AppWiseLogsDeleteDialog( + onDismiss = { showDeleteDialog = false }, + onConfirm = { viewModel.deleteLogs(uid) } + ) + } + + AppWiseLogsScreenContent( + title = appName.ifBlank { stringResource(R.string.lbl_logs) }, + searchHint = searchHint, + appIcon = appIcon ?: Utilities.getDefaultIcon(context), + showToggleGroup = true, + selectedCategory = selectedCategory, + onCategorySelected = { category -> + selectedCategory = category + viewModel.timeCategoryChanged(category, true) + }, + defaultHintRes = R.string.search_custom_domains, + showDeleteIcon = true, + onDeleteClick = { showDeleteDialog = true }, + onQueryChange = { query -> + viewModel.setFilter(query, AppConnectionsViewModel.FilterType.DOMAIN) + }, + modifier = Modifier.fillMaxSize().padding(paddingValues) + ) { + AppWiseDomainList( + items = items, + uid = uid, + eventLogger = eventLogger + ) + } + } +} + +@Composable +private fun AppWiseDomainList( + items: androidx.paging.compose.LazyPagingItems, + uid: Int, + eventLogger: EventLogger +) { + var showDomainRulesSheet by remember { mutableStateOf(false) } + var selectedDomain by remember { mutableStateOf("") } + var refreshToken by remember { mutableStateOf(0) } + var pendingCloseDialog by remember { mutableStateOf(null) } + + pendingCloseDialog?.let { conn -> + CloseConnsDialog( + conn = conn, + onConfirm = { pendingCloseDialog = null }, + onDismiss = { pendingCloseDialog = null } + ) + } + + if (showDomainRulesSheet && selectedDomain.isNotEmpty()) { + AppDomainRulesSheet( + uid = uid, + domain = selectedDomain, + eventLogger = eventLogger, + onDismiss = { showDomainRulesSheet = false }, + onUpdated = { refreshToken++ } + ) + } + + AppWiseLogsPagedList(items = items) { item -> + DomainRow( + conn = item, + uid = uid, + isActiveConn = false, + refreshToken = refreshToken, + onIpClick = { conn -> + selectedDomain = conn.appOrDnsName.orEmpty() + if (selectedDomain.isNotEmpty()) { + showDomainRulesSheet = true + } + } + ) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/logs/AppWiseIpLogsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/logs/AppWiseIpLogsScreen.kt new file mode 100644 index 000000000..bf2d20a4b --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/logs/AppWiseIpLogsScreen.kt @@ -0,0 +1,192 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.logs + +import android.graphics.drawable.Drawable +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.lifecycle.asFlow +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.IpRow +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.ui.bottomsheet.AppIpRulesSheet +import com.celzero.bravedns.util.Constants.Companion.INVALID_UID +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.removeBeginningTrailingCommas +import com.celzero.bravedns.viewmodel.AppConnectionsViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +@Composable +fun AppWiseIpLogsScreen( + uid: Int, + isAsn: Boolean, + viewModel: AppConnectionsViewModel, + eventLogger: EventLogger, + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val twoArgumentColonTemplate = stringResource(R.string.two_argument_colon) + val twoArgumentSpaceTemplate = stringResource(R.string.two_argument_space) + val appOtherAppsTemplate = stringResource(R.string.ctbs_app_other_apps, "", "") + val searchLabel = stringResource(R.string.lbl_search) + val serviceProviderLabel = stringResource(R.string.lbl_service_providers) + val universalIpLabel = stringResource(R.string.search_universal_ips) + var appName by remember(uid) { mutableStateOf("") } + var searchHint by remember { mutableStateOf("") } + var appIcon by remember { mutableStateOf(null) } + val showDeleteIcon = remember { !isAsn } + var showDeleteDialog by remember { mutableStateOf(false) } + var selectedCategory by remember { mutableStateOf(AppConnectionsViewModel.TimeCategory.SEVEN_DAYS) } + var isRethinkApp by remember(uid) { mutableStateOf(false) } + + LaunchedEffect(uid, isAsn) { + if (uid == INVALID_UID) { + onBackClick?.invoke() + return@LaunchedEffect + } + viewModel.timeCategoryChanged(selectedCategory, isDomain = false) + withContext(Dispatchers.IO) { + val meta = resolveAppWiseLogsHeader( + context = context, + uid = uid, + isAsn = isAsn, + appOtherAppsTemplate = appOtherAppsTemplate, + twoArgumentColonTemplate = twoArgumentColonTemplate, + twoArgumentSpaceTemplate = twoArgumentSpaceTemplate, + searchLabel = searchLabel, + serviceProvidersLabel = serviceProviderLabel, + universalIpsLabel = universalIpLabel + ) + if (meta == null) { + withContext(Dispatchers.Main) { onBackClick?.invoke() } + return@withContext + } + withContext(Dispatchers.Main) { + appName = meta.appName + searchHint = meta.searchHint + appIcon = meta.appIcon + isRethinkApp = meta.isRethinkApp + } + } + } + + AppWiseLogsScaffold( + title = appName, + onBackClick = onBackClick + ) { paddingValues -> + if (showDeleteDialog) { + AppWiseLogsDeleteDialog( + onDismiss = { showDeleteDialog = false }, + onConfirm = { viewModel.deleteLogs(uid) } + ) + } + + AppWiseLogsScreenContent( + title = appName.ifBlank { stringResource(R.string.lbl_logs) }, + searchHint = searchHint, + appIcon = appIcon ?: Utilities.getDefaultIcon(context), + showToggleGroup = true, + selectedCategory = selectedCategory, + onCategorySelected = { category -> + selectedCategory = category + viewModel.timeCategoryChanged(category, isDomain = false) + }, + defaultHintRes = R.string.search_universal_ips, + showDeleteIcon = showDeleteIcon, + onDeleteClick = { showDeleteDialog = true }, + onQueryChange = { query -> + val type = + if (isAsn) { + AppConnectionsViewModel.FilterType.ASN + } else { + AppConnectionsViewModel.FilterType.IP + } + viewModel.setFilter(query, type) + }, + modifier = Modifier.fillMaxSize().padding(paddingValues), + queryEnabled = !isAsn + ) { + AppWiseIpList( + viewModel = viewModel, + uid = uid, + isAsn = isAsn, + isRethinkApp = isRethinkApp, + eventLogger = eventLogger + ) + } + } +} + +@Composable +private fun AppWiseIpList( + viewModel: AppConnectionsViewModel, + uid: Int, + isAsn: Boolean, + isRethinkApp: Boolean, + eventLogger: EventLogger +) { + var showIpRulesSheet by remember { mutableStateOf(false) } + var selectedIp by remember { mutableStateOf("") } + var selectedDomains by remember { mutableStateOf("") } + var refreshToken by remember { mutableStateOf(0) } + + if (showIpRulesSheet && selectedIp.isNotEmpty()) { + AppIpRulesSheet( + uid = uid, + ipAddress = selectedIp, + domains = selectedDomains, + eventLogger = eventLogger, + onDismiss = { showIpRulesSheet = false }, + onUpdated = { refreshToken++ } + ) + } + + LaunchedEffect(uid, isRethinkApp) { + if (!isRethinkApp) viewModel.setUid(uid) + } + + val flow = remember(isRethinkApp, isAsn) { + if (isRethinkApp) viewModel.rinrIpLogs else if (isAsn) viewModel.asnLogs else viewModel.appIpLogs + } + val items = flow.asFlow().collectAsLazyPagingItems() + + AppWiseLogsPagedList(items = items) { item -> + IpRow( + conn = item, + isAsn = isAsn, + refreshToken = refreshToken, + onIpClick = { conn -> + if (!isAsn) { + selectedIp = conn.ipAddress + selectedDomains = + removeBeginningTrailingCommas(conn.appOrDnsName ?: "").replace(",,", ",").replace(",", ", ") + showIpRulesSheet = true + } + } + ) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/logs/AppWiseLogsShared.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/logs/AppWiseLogsShared.kt new file mode 100644 index 000000000..7137e5543 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/logs/AppWiseLogsShared.kt @@ -0,0 +1,440 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.logs + +import android.content.Context +import android.graphics.drawable.Drawable +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Close +import androidx.compose.material.icons.rounded.Delete +import androidx.compose.material.icons.rounded.Search +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.core.graphics.drawable.toBitmap +import androidx.paging.compose.LazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.util.Constants.Companion.INVALID_UID +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.viewmodel.AppConnectionsViewModel +import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.distinctUntilChanged + +@Composable +internal fun AppWiseLogsDeleteDialog( + onDismiss: () -> Unit, + onConfirm: () -> Unit +) { + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = stringResource(R.string.ada_delete_logs_dialog_title), + message = stringResource(R.string.ada_delete_logs_dialog_desc), + confirmText = stringResource(R.string.lbl_proceed), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + onDismiss() + onConfirm() + }, + onDismiss = onDismiss, + isConfirmDestructive = true + ) +} + +internal data class AppWiseLogsHeader( + val appName: String, + val searchHint: String, + val appIcon: Drawable?, + val isRethinkApp: Boolean +) + +internal suspend fun resolveAppWiseLogsHeader( + context: Context, + uid: Int, + isAsn: Boolean, + appOtherAppsTemplate: String, + twoArgumentColonTemplate: String, + twoArgumentSpaceTemplate: String, + searchLabel: String, + serviceProvidersLabel: String, + universalIpsLabel: String +): AppWiseLogsHeader? { + if (uid == INVALID_UID) return null + + val info = FirewallManager.getAppInfoByUid(uid) ?: return null + val packageNames = FirewallManager.getPackageNamesByUid(uid) + val isRethinkApp = packageNames.any { it == context.packageName } + + val visibleName = + if (packageNames.size >= 2) { + String.format( + appOtherAppsTemplate, + info.appName, + (packageNames.size - 1).toString() + ) + } else { + info.appName + } + val truncated = visibleName.substring(0, visibleName.length.coerceAtMost(10)) + val hint = + if (isAsn) { + val txt = + String.format(twoArgumentSpaceTemplate, searchLabel, serviceProvidersLabel) + String.format(twoArgumentColonTemplate, truncated, txt) + } else { + String.format(twoArgumentColonTemplate, truncated, universalIpsLabel) + } + + return AppWiseLogsHeader( + appName = visibleName, + searchHint = hint, + appIcon = Utilities.getIcon(context, info.packageName, info.appName), + isRethinkApp = isRethinkApp + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +internal fun AppWiseLogsScaffold( + title: String, + onBackClick: (() -> Unit)? = null, + content: @Composable (paddingValues: PaddingValues) -> Unit +) { + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = title, + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + }, + containerColor = MaterialTheme.colorScheme.background + ) { paddingValues -> + content(paddingValues) + } +} + +@Composable +internal fun AppWiseLogsScreenContent( + title: String, + searchHint: String, + appIcon: Drawable?, + showToggleGroup: Boolean, + selectedCategory: AppConnectionsViewModel.TimeCategory, + onCategorySelected: (AppConnectionsViewModel.TimeCategory) -> Unit, + defaultHintRes: Int, + showDeleteIcon: Boolean, + onDeleteClick: () -> Unit, + onQueryChange: (String) -> Unit, + modifier: Modifier = Modifier, + queryEnabled: Boolean = true, + content: @Composable () -> Unit +) { + Column(modifier = modifier.fillMaxSize()) { + Surface( + modifier = + Modifier.padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingSm + ), + shape = RoundedCornerShape(Dimensions.cardCornerRadiusLarge), + color = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 1.dp + ) { + Column( + modifier = Modifier.padding(Dimensions.spacingLg), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold + ) + Text( + text = searchHint, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + Column( + modifier = + Modifier.padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingMd + ) + ) { + if (showToggleGroup) { + AppWiseTimeCategoryToggleRow( + selectedCategory = selectedCategory, + onCategorySelected = onCategorySelected + ) + Spacer(modifier = Modifier.height(Dimensions.spacingMd)) + } + + AppWiseSearchHeaderRow( + appIcon = appIcon, + searchHint = searchHint, + defaultHintRes = defaultHintRes, + showDeleteIcon = showDeleteIcon, + onDeleteClick = onDeleteClick, + queryEnabled = queryEnabled, + onQueryChange = onQueryChange + ) + } + + content() + } +} + +@Composable +internal fun AppWiseLogsPagedList( + items: LazyPagingItems, + modifier: Modifier = Modifier, + row: @Composable (T) -> Unit +) { + androidx.compose.foundation.lazy.LazyColumn( + modifier = modifier.fillMaxSize(), + contentPadding = + PaddingValues( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingSm + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + items(count = items.itemCount) { index -> + val item = items[index] ?: return@items + row(item) + } + } +} + +@Composable +internal fun AppWiseTimeCategoryToggleRow( + selectedCategory: AppConnectionsViewModel.TimeCategory, + onCategorySelected: (AppConnectionsViewModel.TimeCategory) -> Unit +) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = Dimensions.spacingSm), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically + ) { + listOf( + AppConnectionsViewModel.TimeCategory.ONE_HOUR to + stringResource(R.string.ci_desc, "1", stringResource(R.string.lbl_hour)), + AppConnectionsViewModel.TimeCategory.TWENTY_FOUR_HOUR to + stringResource(R.string.ci_desc, "24", stringResource(R.string.lbl_hour)), + AppConnectionsViewModel.TimeCategory.SEVEN_DAYS to + stringResource(R.string.ci_desc, "7", stringResource(R.string.lbl_day)) + ).forEach { (category, label) -> + TimeCategoryToggleButton( + label = label, + selected = selectedCategory == category, + onClick = { onCategorySelected(category) }, + modifier = Modifier.weight(1f) + ) + } + } +} + +@Composable +private fun TimeCategoryToggleButton( + label: String, + selected: Boolean, + onClick: () -> Unit, + modifier: Modifier = Modifier +) { + Button( + onClick = onClick, + modifier = modifier.height(36.dp), + contentPadding = PaddingValues(horizontal = 8.dp), + colors = ButtonDefaults.buttonColors( + containerColor = + if (selected) { + MaterialTheme.colorScheme.primaryContainer + } else { + MaterialTheme.colorScheme.surfaceContainerHigh + }, + contentColor = + if (selected) { + MaterialTheme.colorScheme.onPrimaryContainer + } else { + MaterialTheme.colorScheme.onSurfaceVariant + } + ), + shape = RoundedCornerShape(Dimensions.buttonCornerRadiusLarge) + ) { + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } +} + +@OptIn(FlowPreview::class) +@Composable +internal fun AppWiseSearchHeaderRow( + appIcon: Drawable?, + searchHint: String, + defaultHintRes: Int, + showDeleteIcon: Boolean, + onDeleteClick: () -> Unit, + onQueryChange: (String) -> Unit, + queryEnabled: Boolean = true +) { + val clearSearchContentDescription = stringResource(R.string.cd_clear_search) + val deleteContentDescription = stringResource(R.string.lbl_delete) + var query by remember { mutableStateOf("") } + + LaunchedEffect(Unit) { + snapshotFlow { query } + .debounce(500L) + .distinctUntilChanged() + .collect { value -> onQueryChange(value) } + } + + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cardCornerRadiusLarge), + color = MaterialTheme.colorScheme.surfaceContainerHigh + ) { + Row( + modifier = Modifier.padding(horizontal = Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier + .padding(Dimensions.spacingSm) + .size(Dimensions.iconSizeMd) + .clip(CircleShape) + .background(MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.4f)), + contentAlignment = Alignment.Center + ) { + val bitmap = remember(appIcon) { appIcon?.toBitmap(width = 48, height = 48) } + if (bitmap != null) { + Image( + bitmap = bitmap.asImageBitmap(), + contentDescription = null, + modifier = Modifier.size(20.dp) + ) + } else { + Icon( + imageVector = Icons.Rounded.Search, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(20.dp) + ) + } + } + + OutlinedTextField( + value = query, + onValueChange = { query = it }, + modifier = Modifier.weight(1f), + singleLine = true, + enabled = queryEnabled, + placeholder = { + Text( + text = searchHint.ifEmpty { stringResource(defaultHintRes) }, + style = MaterialTheme.typography.bodyMedium + ) + }, + colors = OutlinedTextFieldDefaults.colors( + focusedBorderColor = Color.Transparent, + unfocusedBorderColor = Color.Transparent, + focusedContainerColor = Color.Transparent, + unfocusedContainerColor = Color.Transparent + ) + ) + + AnimatedVisibility(visible = query.isNotEmpty()) { + IconButton(onClick = { query = "" }) { + Icon( + imageVector = Icons.Rounded.Close, + contentDescription = clearSearchContentDescription, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(Dimensions.iconSizeSm) + ) + } + } + + if (showDeleteIcon) { + IconButton(onClick = onDeleteClick) { + Icon( + imageVector = Icons.Rounded.Delete, + contentDescription = deleteContentDescription, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(Dimensions.iconSizeMd) + ) + } + } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/logs/NetworkLogsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/logs/NetworkLogsScreen.kt new file mode 100644 index 000000000..c25ecd56e --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/logs/NetworkLogsScreen.kt @@ -0,0 +1,1532 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.logs + +import android.graphics.drawable.Drawable +import android.widget.Toast +import androidx.activity.compose.BackHandler +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Block +import androidx.compose.material.icons.outlined.CheckCircle +import androidx.compose.material.icons.outlined.NetworkPing +import androidx.compose.material.icons.outlined.Public +import androidx.compose.material.icons.outlined.Shield +import androidx.compose.material.icons.rounded.Apps +import androidx.compose.material.icons.rounded.Block +import androidx.compose.material.icons.rounded.CheckCircle +import androidx.compose.material.icons.rounded.Close +import androidx.compose.material.icons.rounded.Delete +import androidx.compose.material.icons.rounded.FilterList +import androidx.compose.material.icons.rounded.MoreVert +import androidx.compose.material.icons.rounded.NetworkPing +import androidx.compose.material.icons.rounded.Public +import androidx.compose.material.icons.rounded.Refresh +import androidx.compose.material.icons.rounded.Shield +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.ButtonGroupDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.ToggleButton +import androidx.compose.material3.ToggleButtonDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog +import androidx.lifecycle.asFlow +import androidx.paging.LoadState +import androidx.paging.compose.LazyPagingItems +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.ConnectionRow +import com.celzero.bravedns.adapter.DnsLogRow +import com.celzero.bravedns.database.ConnectionTracker +import com.celzero.bravedns.database.ConnectionTrackerRepository +import com.celzero.bravedns.database.DnsLog +import com.celzero.bravedns.database.DnsLogRepository +import com.celzero.bravedns.database.LogAppCount +import com.celzero.bravedns.database.RethinkLogRepository +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.FirewallRuleset +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.ui.compose.theme.RethinkBottomSheetCard +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkModalBottomSheet +import com.celzero.bravedns.ui.compose.theme.RethinkSearchField +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.viewmodel.ConnectionTrackerViewModel +import com.celzero.bravedns.viewmodel.DnsLogViewModel +import com.celzero.bravedns.viewmodel.RethinkLogViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +enum class LogTab { CONNECTION, DNS } + +private data class LogsTabSpec( + val tab: LogTab, + val title: Int +) + +@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class) +@Composable +fun NetworkLogsScreen( + connectionTrackerViewModel: ConnectionTrackerViewModel, + dnsLogViewModel: DnsLogViewModel, + rethinkLogViewModel: RethinkLogViewModel, + connectionTrackerRepository: ConnectionTrackerRepository, + dnsLogRepository: DnsLogRepository, + rethinkLogRepository: RethinkLogRepository, + persistentState: PersistentState, + eventLogger: EventLogger, + onBackClick: (() -> Unit)? = null +) { + val tabs = + listOf( + LogsTabSpec( + tab = LogTab.CONNECTION, + title = R.string.firewall_act_network_monitor_tab + ), + LogsTabSpec( + tab = LogTab.DNS, + title = R.string.dns_mode_info_title + ) + ) + val selectedTab = remember { mutableIntStateOf(0) } + + var selectedDns by remember { mutableStateOf(null) } + var onRefreshLogs by remember { mutableStateOf<(() -> Unit)?>(null) } + var onClearLogs by remember { mutableStateOf<(() -> Unit)?>(null) } + + LaunchedEffect(selectedTab.intValue) { + onRefreshLogs = null + onClearLogs = null + } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + containerColor = MaterialTheme.colorScheme.surface, + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.lbl_logs), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior, + actions = { + LogsInlineTabSwitch( + selectedTabIndex = selectedTab.intValue, + onTabSelected = { selectedTab.intValue = it } + ) + LogsTopBarOverflowActions( + onRefresh = onRefreshLogs, + onDelete = onClearLogs + ) + } + ) + } + ) { padding -> + Column( + modifier = + Modifier + .fillMaxSize() + .padding(padding), + ) { + when (tabs[selectedTab.intValue].tab) { + LogTab.CONNECTION -> { + ConnectionLogsContent( + viewModel = connectionTrackerViewModel, + repository = connectionTrackerRepository, + persistentState = persistentState, + onTopBarActionsChange = { refreshAction, clearAction -> + if (onRefreshLogs !== refreshAction) onRefreshLogs = refreshAction + if (onClearLogs !== clearAction) onClearLogs = clearAction + } + ) + } + + LogTab.DNS -> { + DnsLogsContent( + viewModel = dnsLogViewModel, + repository = dnsLogRepository, + persistentState = persistentState, + onTopBarActionsChange = { refreshAction, clearAction -> + if (onRefreshLogs !== refreshAction) onRefreshLogs = refreshAction + if (onClearLogs !== clearAction) onClearLogs = clearAction + }, + onShowDnsLog = { selectedDns = it } + ) + } + } + } + } + + if (selectedDns != null) { + DnsLogDetailsSheet( + log = selectedDns!!, + onDismiss = { selectedDns = null } + ) + } +} + +@OptIn(FlowPreview::class) +@Composable +private fun ConnectionLogsContent( + viewModel: ConnectionTrackerViewModel, + repository: ConnectionTrackerRepository, + persistentState: PersistentState, + onTopBarActionsChange: (refreshAction: (() -> Unit)?, clearAction: (() -> Unit)?) -> Unit +) { + val logsFlow = remember(viewModel) { viewModel.connectionTrackerList.asFlow() } + val items = logsFlow.collectAsLazyPagingItems() + + var showDeleteDialog by remember { mutableStateOf(false) } + var showRulesDialog by remember { mutableStateOf(false) } + var showAppFilterDialog by remember { mutableStateOf(false) } + var selectedAppFilter by remember { mutableStateOf(null) } + var appPickerQuery by remember { mutableStateOf("") } + var appFilterOptions by remember { mutableStateOf>(emptyList()) } + var appFilterOptionsLoading by remember { mutableStateOf(false) } + var parentFilter by remember { mutableStateOf(ConnectionTrackerViewModel.TopLevelFilter.ALL) } + var childFilters by remember { mutableStateOf(setOf()) } + + val filterOptions = listOf( + LogsFilterOption( + value = ConnectionTrackerViewModel.TopLevelFilter.ALL, + label = stringResource(R.string.lbl_all), + selectedIcon = Icons.Rounded.Public, + unselectedIcon = Icons.Outlined.Public + ), + LogsFilterOption( + value = ConnectionTrackerViewModel.TopLevelFilter.ALLOWED, + label = stringResource(R.string.lbl_allowed), + selectedIcon = Icons.Rounded.CheckCircle, + unselectedIcon = Icons.Outlined.CheckCircle + ), + LogsFilterOption( + value = ConnectionTrackerViewModel.TopLevelFilter.BLOCKED, + label = stringResource(R.string.lbl_blocked), + selectedIcon = Icons.Rounded.Block, + unselectedIcon = Icons.Outlined.Block + ) + ) + val refreshAction = remember(items) { { items.refresh() } } + val clearAction = remember { { showDeleteDialog = true } } + val openAppFilterAction = remember { { showAppFilterDialog = true } } + + BackHandler(enabled = selectedAppFilter != null && !showDeleteDialog && !showRulesDialog && !showAppFilterDialog) { + selectedAppFilter = null + } + + LaunchedEffect(refreshAction, clearAction, persistentState.logsEnabled, items.itemCount) { + onTopBarActionsChange( + refreshAction.takeIf { persistentState.logsEnabled }, + clearAction.takeIf { persistentState.logsEnabled && items.itemCount > 0 } + ) + } + + LaunchedEffect(Unit) { + // Reset stale filters when re-entering the screen to avoid empty/hidden results. + viewModel.setFilter("", emptySet(), ConnectionTrackerViewModel.TopLevelFilter.ALL) + } + + LaunchedEffect(Unit) { + snapshotFlow { Triple(selectedAppFilter.orEmpty(), parentFilter, childFilters) } + .debounce(300) + .distinctUntilChanged() + .collect { (q, type, filters) -> + viewModel.setFilter(q, filters, type) + } + } + + if (!persistentState.logsEnabled) { + LogsDisabledState() + return + } + + val ruleFilters = when (parentFilter) { + ConnectionTrackerViewModel.TopLevelFilter.BLOCKED -> FirewallRuleset.getBlockedRules() + ConnectionTrackerViewModel.TopLevelFilter.ALLOWED -> FirewallRuleset.getAllowedRules() + ConnectionTrackerViewModel.TopLevelFilter.ALL -> FirewallRuleset.entries.toList() + } + val hasRulesFilter = ruleFilters.isNotEmpty() + + LaunchedEffect(showAppFilterDialog, parentFilter, childFilters, persistentState.logsEnabled) { + if (!showAppFilterDialog || !persistentState.logsEnabled) return@LaunchedEffect + appFilterOptionsLoading = true + appFilterOptions = + withContext(Dispatchers.IO) { + when (parentFilter) { + ConnectionTrackerViewModel.TopLevelFilter.ALL -> + repository.getAllLoggedAppsWithCount(childFilters) + ConnectionTrackerViewModel.TopLevelFilter.ALLOWED -> + repository.getAllowedLoggedAppsWithCount(childFilters) + ConnectionTrackerViewModel.TopLevelFilter.BLOCKED -> + repository.getBlockedLoggedAppsWithCount(childFilters) + } + } + appFilterOptionsLoading = false + } + + val listState = rememberLazyListState() + + Box(modifier = Modifier.fillMaxSize()) { + Column(modifier = Modifier.fillMaxSize()) { + LogsControlsDeck { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingXs), + verticalAlignment = Alignment.CenterVertically + ) { + LogsPrimaryFilterRow( + options = filterOptions, + selectedValue = parentFilter, + onValueSelected = { filterType -> + parentFilter = filterType + childFilters = emptySet() + }, + modifier = Modifier.weight(1f) + ) + + LogsCompactIconAction( + icon = Icons.Rounded.FilterList, + contentDescription = stringResource(R.string.lbl_rules), + selected = childFilters.isNotEmpty(), + enabled = hasRulesFilter, + count = childFilters.size, + onClick = { showRulesDialog = true } + ) + + LogsCompactIconAction( + icon = Icons.Rounded.Apps, + contentDescription = stringResource(R.string.lbl_apps), + selected = selectedAppFilter != null, + enabled = true, + onClick = { openAppFilterAction() } + ) + } + } + + LogsPagedListContent( + items = items, + listState = listState, + modifier = Modifier.weight(1f) + ) { item, index, itemCount -> + ConnectionRow( + ct = item, + index = index, + itemCount = itemCount + ) + } + } + + if (showRulesDialog && ruleFilters.isNotEmpty()) { + LogsRulesDialog( + rules = ruleFilters, + selectedRules = childFilters, + onToggleRule = { ruleId -> + childFilters = + if (childFilters.contains(ruleId)) childFilters - ruleId + else childFilters + ruleId + }, + onClear = { childFilters = emptySet() }, + onDismiss = { showRulesDialog = false } + ) + } + + if (showAppFilterDialog) { + LogsAppFilterDialog( + options = appFilterOptions, + selectedApp = selectedAppFilter, + searchQuery = appPickerQuery, + isLoading = appFilterOptionsLoading, + onSearchQueryChange = { appPickerQuery = it }, + onSelectApp = { selectedApp -> + selectedAppFilter = selectedApp + showAppFilterDialog = false + }, + onClearSelection = { selectedAppFilter = null }, + onDismiss = { showAppFilterDialog = false } + ) + } + } + + LogsDeleteDialog( + show = showDeleteDialog, + onDismiss = { showDeleteDialog = false }, + onDelete = { repository.clearAllData() }, + onRefresh = { items.refresh() } + ) +} + +@OptIn(FlowPreview::class) +@Composable +private fun DnsLogsContent( + viewModel: DnsLogViewModel, + repository: DnsLogRepository, + persistentState: PersistentState, + onTopBarActionsChange: (refreshAction: (() -> Unit)?, clearAction: (() -> Unit)?) -> Unit, + onShowDnsLog: (DnsLog) -> Unit +) { + val logsFlow = remember(viewModel) { viewModel.dnsLogsList.asFlow() } + val items = logsFlow.collectAsLazyPagingItems() + + var showDeleteDialog by remember { mutableStateOf(false) } + var showAppFilterDialog by remember { mutableStateOf(false) } + var selectedAppFilter by remember { mutableStateOf(null) } + var appPickerQuery by remember { mutableStateOf("") } + var appFilterOptions by remember { mutableStateOf>(emptyList()) } + var appFilterOptionsLoading by remember { mutableStateOf(false) } + var filterType by remember { mutableStateOf(DnsLogViewModel.DnsLogFilter.ALL) } + + val filterOptions = listOf( + LogsFilterOption( + value = DnsLogViewModel.DnsLogFilter.ALL, + label = stringResource(R.string.lbl_all), + selectedIcon = Icons.Rounded.Public, + unselectedIcon = Icons.Outlined.Public + ), + LogsFilterOption( + value = DnsLogViewModel.DnsLogFilter.ALLOWED, + label = stringResource(R.string.lbl_allowed), + selectedIcon = Icons.Rounded.CheckCircle, + unselectedIcon = Icons.Outlined.CheckCircle + ), + LogsFilterOption( + value = DnsLogViewModel.DnsLogFilter.BLOCKED, + label = stringResource(R.string.lbl_blocked), + selectedIcon = Icons.Rounded.Block, + unselectedIcon = Icons.Outlined.Block + ) + ) + val refreshAction = remember(items) { { items.refresh() } } + val clearAction = remember { { showDeleteDialog = true } } + + BackHandler(enabled = selectedAppFilter != null && !showDeleteDialog && !showAppFilterDialog) { + selectedAppFilter = null + } + + LaunchedEffect(refreshAction, clearAction, persistentState.logsEnabled, items.itemCount) { + onTopBarActionsChange( + refreshAction.takeIf { persistentState.logsEnabled }, + clearAction.takeIf { persistentState.logsEnabled && items.itemCount > 0 } + ) + } + + LaunchedEffect(Unit) { + // Reset stale filters when re-entering the screen to avoid empty/hidden results. + viewModel.setFilter("", DnsLogViewModel.DnsLogFilter.ALL) + } + + LaunchedEffect(Unit) { + snapshotFlow { Pair(selectedAppFilter.orEmpty(), filterType) } + .debounce(300) + .distinctUntilChanged() + .collect { (q, type) -> + viewModel.setFilter(q, type) + } + } + + if (!persistentState.logsEnabled) { + LogsDisabledState() + return + } + + LaunchedEffect(showAppFilterDialog, filterType, persistentState.logsEnabled) { + if (!showAppFilterDialog || !persistentState.logsEnabled) return@LaunchedEffect + appFilterOptionsLoading = true + appFilterOptions = + withContext(Dispatchers.IO) { + when (filterType) { + DnsLogViewModel.DnsLogFilter.ALL -> repository.getAllLoggedAppsWithCount() + DnsLogViewModel.DnsLogFilter.ALLOWED -> repository.getAllowedLoggedAppsWithCount() + DnsLogViewModel.DnsLogFilter.BLOCKED -> repository.getBlockedLoggedAppsWithCount() + else -> repository.getAllLoggedAppsWithCount() + } + } + appFilterOptionsLoading = false + } + + val listState = rememberLazyListState() + + Column(modifier = Modifier.fillMaxSize()) { + LogsControlsDeck { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingXs), + verticalAlignment = Alignment.CenterVertically + ) { + LogsPrimaryFilterRow( + options = filterOptions, + selectedValue = filterType, + onValueSelected = { selectedFilter -> + filterType = selectedFilter + }, + modifier = Modifier.weight(1f) + ) + + LogsCompactIconAction( + icon = Icons.Rounded.Apps, + contentDescription = stringResource(R.string.lbl_apps), + selected = selectedAppFilter != null, + enabled = true, + onClick = { showAppFilterDialog = true } + ) + } + } + + LogsPagedListContent( + items = items, + listState = listState, + modifier = Modifier.weight(1f) + ) { item, index, itemCount -> + DnsLogRow( + log = item, + loadFavIcon = persistentState.fetchFavIcon, + isRethinkDns = false, + onShowBlocklist = onShowDnsLog, + index = index, + itemCount = itemCount, + ) + } + } + + if (showAppFilterDialog) { + LogsAppFilterDialog( + options = appFilterOptions, + selectedApp = selectedAppFilter, + searchQuery = appPickerQuery, + isLoading = appFilterOptionsLoading, + onSearchQueryChange = { appPickerQuery = it }, + onSelectApp = { selectedApp -> + selectedAppFilter = selectedApp + showAppFilterDialog = false + }, + onClearSelection = { selectedAppFilter = null }, + onDismiss = { showAppFilterDialog = false } + ) + } + + LogsDeleteDialog( + show = showDeleteDialog, + onDismiss = { showDeleteDialog = false }, + onDelete = { repository.clearAllData() }, + onRefresh = { items.refresh() } + ) +} + +@Composable +private fun LogsControlsDeck( + modifier: Modifier = Modifier, + content: @Composable () -> Unit +) { + Column( + modifier = + modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal) + .padding(top = Dimensions.spacingXs), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + content() + } +} + +@Composable +private fun LogsDisabledState() { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadius2xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + modifier = Modifier + .padding(horizontal = Dimensions.screenPaddingHorizontal) + .padding(vertical = Dimensions.spacingXl) + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.spacingLg, vertical = Dimensions.spacingMd), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + Icon( + painter = painterResource(id = R.drawable.ic_logs_accent), + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(20.dp) + ) + Text( + text = stringResource(R.string.logs_disabled_summary), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } +} + +@Composable +private fun LogsTopBarOverflowActions( + onRefresh: (() -> Unit)?, + onDelete: (() -> Unit)? +) { + val isRefreshEnabled = onRefresh != null + val isDeleteEnabled = onDelete != null + var expanded by remember { mutableStateOf(false) } + + IconButton( + onClick = { expanded = true } + ) { + Icon( + imageVector = Icons.Rounded.MoreVert, + contentDescription = stringResource(R.string.wireguard_fab_more_actions) + ) + } + + DropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false } + ) { + DropdownMenuItem( + text = { Text(stringResource(R.string.cd_refresh)) }, + leadingIcon = { + Icon( + imageVector = Icons.Rounded.Refresh, + contentDescription = null + ) + }, + enabled = isRefreshEnabled, + onClick = { + expanded = false + onRefresh?.invoke() + } + ) + DropdownMenuItem( + text = { Text(stringResource(R.string.lbl_delete)) }, + leadingIcon = { + Icon( + imageVector = Icons.Rounded.Delete, + contentDescription = null, + tint = MaterialTheme.colorScheme.error + ) + }, + enabled = isDeleteEnabled, + onClick = { + expanded = false + onDelete?.invoke() + } + ) + } +} + +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +private fun LogsInlineTabSwitch( + selectedTabIndex: Int, + onTabSelected: (Int) -> Unit, + modifier: Modifier = Modifier +) { + val options = + listOf( + 0 to R.string.firewall_act_network_monitor_tab, + 1 to R.string.dns_mode_info_title + ) + Row( + modifier = modifier, + horizontalArrangement = Arrangement.spacedBy(ButtonGroupDefaults.ConnectedSpaceBetween) + ) { + options.forEachIndexed { index, (value, labelRes) -> + val selected = selectedTabIndex == value + ToggleButton( + checked = selected, + onCheckedChange = { checked -> + if (checked && !selected) onTabSelected(value) + }, + shapes = + when (index) { + 0 -> ButtonGroupDefaults.connectedLeadingButtonShapes() + options.lastIndex -> ButtonGroupDefaults.connectedTrailingButtonShapes() + else -> ButtonGroupDefaults.connectedMiddleButtonShapes() + }, + colors = ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.94f), + checkedContentColor = MaterialTheme.colorScheme.onSecondaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.82f), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + border = null, + modifier = Modifier + .heightIn(min = 34.dp) + .semantics { role = Role.RadioButton } + ) { + val tabIcon = + when (value) { + 0 -> if (selected) Icons.Rounded.NetworkPing else Icons.Outlined.NetworkPing + else -> if (selected) Icons.Rounded.Shield else Icons.Outlined.Shield + } + Icon( + imageVector = tabIcon, + contentDescription = null, + modifier = Modifier.size(14.dp) + ) + Spacer(modifier = Modifier.size(ToggleButtonDefaults.IconSpacing)) + Text( + text = stringResource(labelRes), + style = MaterialTheme.typography.labelSmall, + fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium + ) + } + } + } +} + +@Composable +private fun LogsCompactIconAction( + icon: ImageVector, + contentDescription: String, + selected: Boolean = false, + enabled: Boolean, + count: Int = 0, + onClick: () -> Unit +) { + Box(modifier = Modifier.size(36.dp)) { + IconButton( + onClick = onClick, + enabled = enabled, + modifier = Modifier.matchParentSize() + ) { + Icon( + imageVector = icon, + contentDescription = contentDescription, + modifier = Modifier.size(20.dp), + tint = + if (!enabled) MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.42f) + else if (selected) MaterialTheme.colorScheme.primary + else MaterialTheme.colorScheme.onSurfaceVariant + ) + } + if (selected) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = MaterialTheme.colorScheme.primary, + modifier = Modifier + .align(Alignment.TopEnd) + .padding(top = 5.dp, end = 5.dp) + .size(6.dp) + ) {} + } + if (count > 0) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = MaterialTheme.colorScheme.secondaryContainer, + modifier = Modifier + .align(Alignment.TopEnd) + .padding(top = 1.dp, end = 1.dp) + ) { + Text( + text = count.toString(), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSecondaryContainer, + fontWeight = FontWeight.SemiBold, + modifier = Modifier.padding(horizontal = 5.dp, vertical = 1.dp) + ) + } + } + } +} + +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +private fun LogsAppFilterDialog( + options: List, + selectedApp: String?, + searchQuery: String, + isLoading: Boolean, + onSearchQueryChange: (String) -> Unit, + onSelectApp: (String?) -> Unit, + onClearSelection: () -> Unit, + onDismiss: () -> Unit +) { + val filteredOptions = + remember(options, searchQuery) { + if (searchQuery.isBlank()) { + options + } else { + options.filter { it.appName.contains(searchQuery.trim(), ignoreCase = true) } + } + } + val totalCount = remember(options) { options.sumOf { it.count } } + + Dialog(onDismissRequest = onDismiss) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadius2xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + modifier = Modifier + .fillMaxWidth() + .heightIn(max = 560.dp) + .padding(horizontal = Dimensions.spacingMd) + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.spacingSm, vertical = Dimensions.spacingSm), + verticalArrangement = Arrangement.spacedBy(2.dp) + ) { + RethinkSearchField( + query = searchQuery, + onQueryChange = onSearchQueryChange, + placeholder = stringResource(R.string.search_apps_count_placeholder, options.size), + onClearQuery = { onSearchQueryChange("") }, + clearQueryContentDescription = stringResource(R.string.cd_clear_search), + closeWhenEmptyContentDescription = stringResource(R.string.lbl_dismiss), + onCloseWhenEmpty = onDismiss, + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh, + textStyle = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium), + iconSize = 18.dp, + trailingIconSize = 16.dp, + trailingIconButtonSize = 30.dp + ) + if (selectedApp != null) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.End + ) { + TextButton(onClick = onClearSelection) { + Text( + text = stringResource(R.string.fapps_filter_clear_btn), + color = MaterialTheme.colorScheme.error, + fontWeight = FontWeight.SemiBold + ) + } + } + } + + if (isLoading) { + LogsLoadingState() + } else { + LazyColumn( + modifier = Modifier + .fillMaxWidth() + .weight(1f, fill = false), + verticalArrangement = Arrangement.spacedBy(2.dp) + ) { + item("all_apps") { + LogsAppFilterListItem( + app = null, + selected = selectedApp == null, + count = totalCount, + onClick = { onSelectApp(null) } + ) + } + + items(filteredOptions, key = { "${it.packageName}|${it.appName}" }) { app -> + LogsAppFilterListItem( + app = app, + selected = selectedApp == app.appName, + count = app.count, + onClick = { onSelectApp(app.appName) } + ) + } + } + } + } + } + } +} + +@Composable +private fun LogsAppFilterListItem( + app: LogAppCount?, + selected: Boolean, + count: Int, + onClick: () -> Unit +) { + val context = LocalContext.current + var appIcon by remember(app?.packageName, app?.appName) { mutableStateOf(null) } + + LaunchedEffect(app?.packageName, app?.appName) { + if (app == null) return@LaunchedEffect + appIcon = + withContext(Dispatchers.IO) { + if (app.packageName.isBlank()) { + Utilities.getDefaultIcon(context) + } else { + Utilities.getIcon(context, app.packageName, app.appName) + } + } + } + + Surface( + onClick = onClick, + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + color = + if (selected) MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.34f) + else MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 0.dp, + shadowElevation = 0.dp + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.spacingMd, vertical = Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically + ) { + if (app == null) { + Icon( + imageVector = Icons.Rounded.Public, + contentDescription = null, + modifier = Modifier.size(24.dp), + tint = + if (selected) MaterialTheme.colorScheme.secondary + else MaterialTheme.colorScheme.onSurfaceVariant + ) + } else { + val iconPainter = rememberDrawablePainter(appIcon ?: Utilities.getDefaultIcon(context)) + iconPainter?.let { painter -> + Image( + painter = painter, + contentDescription = null, + modifier = Modifier + .size(24.dp) + .clip(RoundedCornerShape(7.dp)) + ) + } + } + + Spacer(modifier = Modifier.size(Dimensions.spacingMd)) + + Text( + text = app?.appName ?: stringResource(R.string.lbl_all), + style = MaterialTheme.typography.bodyLarge, + fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium, + modifier = Modifier.weight(1f), + color = MaterialTheme.colorScheme.onSurface + ) + + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = + if (selected) MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.84f) + else MaterialTheme.colorScheme.surfaceContainerHigh + ) { + Text( + text = count.toString(), + style = MaterialTheme.typography.labelMedium, + color = + if (selected) MaterialTheme.colorScheme.onSecondaryContainer + else MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(horizontal = 8.dp, vertical = 3.dp) + ) + } + } + } +} + +private data class LogsFilterOption( + val value: T, + val label: String, + val selectedIcon: ImageVector, + val unselectedIcon: ImageVector = selectedIcon +) + +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +private fun LogsPrimaryFilterRow( + options: List>, + selectedValue: T, + onValueSelected: (T) -> Unit, + modifier: Modifier = Modifier +) { + Row( + modifier = modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(ButtonGroupDefaults.ConnectedSpaceBetween) + ) { + options.forEachIndexed { index, option -> + val selected = option.value == selectedValue + ToggleButton( + checked = selected, + onCheckedChange = { checked -> + if (checked && !selected) onValueSelected(option.value) + }, + shapes = + when (index) { + 0 -> ButtonGroupDefaults.connectedLeadingButtonShapes() + options.lastIndex -> ButtonGroupDefaults.connectedTrailingButtonShapes() + else -> ButtonGroupDefaults.connectedMiddleButtonShapes() + }, + colors = ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.94f), + checkedContentColor = MaterialTheme.colorScheme.onSecondaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.82f), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + border = null, + modifier = Modifier.semantics { role = Role.RadioButton } + ) { + val showLabel = selected + Icon( + imageVector = if (selected) option.selectedIcon else option.unselectedIcon, + contentDescription = if (showLabel) null else option.label, + modifier = Modifier.size(16.dp) + ) + if (showLabel) { + Spacer(modifier = Modifier.size(ToggleButtonDefaults.IconSpacing)) + Text( + text = option.label, + maxLines = 1, + fontWeight = FontWeight.SemiBold + ) + } + } + } + } +} + +@Composable +private fun LogsRulesDialog( + rules: List, + selectedRules: Set, + onToggleRule: (String) -> Unit, + onClear: () -> Unit, + onDismiss: () -> Unit +) { + val selectedCount = selectedRules.size + + Dialog(onDismissRequest = onDismiss) { + Surface( + modifier = Modifier.fillMaxWidth(0.96f), + shape = RoundedCornerShape(Dimensions.cornerRadiusLg), + color = MaterialTheme.colorScheme.surface, + tonalElevation = 4.dp + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .heightIn(max = 560.dp) + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.spacingXs, + top = Dimensions.spacingMd, + bottom = Dimensions.spacingSm + ), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = Icons.Rounded.FilterList, + contentDescription = null, + modifier = Modifier.size(20.dp), + tint = MaterialTheme.colorScheme.primary + ) + Spacer(modifier = Modifier.size(Dimensions.spacingSm)) + Text( + text = stringResource(R.string.lbl_rules), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold + ) + if (selectedCount > 0) { + Spacer(modifier = Modifier.size(Dimensions.spacingSm)) + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusPill), + color = MaterialTheme.colorScheme.primaryContainer + ) { + Text( + text = selectedCount.toString(), + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onPrimaryContainer, + fontWeight = FontWeight.SemiBold, + modifier = Modifier.padding(horizontal = 7.dp, vertical = 2.dp) + ) + } + } + Spacer(modifier = Modifier.weight(1f)) + if (selectedCount > 0) { + TextButton(onClick = onClear) { + Text( + text = stringResource(R.string.fapps_filter_clear_btn), + fontWeight = FontWeight.SemiBold + ) + } + } + IconButton( + onClick = onDismiss, + modifier = Modifier.size(36.dp) + ) { + Icon( + imageVector = Icons.Rounded.Close, + contentDescription = stringResource(R.string.lbl_dismiss), + modifier = Modifier.size(18.dp) + ) + } + } + + LazyColumn( + modifier = Modifier + .fillMaxWidth() + .weight(1f, fill = false), + contentPadding = PaddingValues( + start = Dimensions.spacingSm, + end = Dimensions.spacingSm, + bottom = Dimensions.spacingSm + ) + ) { + itemsIndexed(rules, key = { _, rule -> rule.id }) { index, rule -> + val selected = selectedRules.contains(rule.id) + RethinkListItem( + headline = stringResource(rule.title), + supportingAnnotated = htmlToAnnotatedString(stringResource(rule.desc)), + leadingIconPainter = painterResource(id = FirewallRuleset.getRulesIcon(rule.id)), + leadingIconTint = if (selected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant, + leadingIconContainerColor = if (selected) MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.6f) else MaterialTheme.colorScheme.surfaceContainerHighest, + position = cardPositionFor(index = index, lastIndex = rules.lastIndex), + highlighted = selected, + highlightContainerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.28f), + trailing = if (selected) { + { + Icon( + imageVector = Icons.Rounded.CheckCircle, + contentDescription = null, + modifier = Modifier.size(20.dp), + tint = MaterialTheme.colorScheme.primary + ) + } + } else null, + onClick = { onToggleRule(rule.id) } + ) + } + } + } + } + } +} + +private fun htmlToAnnotatedString(input: String): AnnotatedString { + val sanitized = input.replace(Regex("(?i)"), "") + val tokenRegex = Regex("(?i)|") + val builder = AnnotatedString.Builder() + var cursor = 0 + var italicDepth = 0 + + tokenRegex.findAll(sanitized).forEach { match -> + if (match.range.first > cursor) { + builder.append(sanitized.substring(cursor, match.range.first)) + } + + when { + match.value.matches(Regex("(?i)")) -> builder.append("\n") + match.value.equals("", ignoreCase = true) -> { + builder.pushStyle(SpanStyle(fontStyle = FontStyle.Italic)) + italicDepth++ + } + match.value.equals("", ignoreCase = true) && italicDepth > 0 -> { + builder.pop() + italicDepth-- + } + } + cursor = match.range.last + 1 + } + + if (cursor < sanitized.length) { + builder.append(sanitized.substring(cursor)) + } + while (italicDepth > 0) { + builder.pop() + italicDepth-- + } + return builder.toAnnotatedString() +} + +@Composable +private fun LogsPagedListContent( + items: LazyPagingItems, + listState: LazyListState, + modifier: Modifier = Modifier, + rowContent: @Composable (item: T, index: Int, itemCount: Int) -> Unit +) { + val refreshState = items.loadState.refresh + val itemCount = items.itemCount + val isLoading = refreshState is LoadState.Loading && itemCount == 0 + val isEmpty = refreshState is LoadState.NotLoading && itemCount == 0 + val hasLoadError = refreshState is LoadState.Error && itemCount == 0 + val density = LocalDensity.current + val navBarBottomInset = with(density) { WindowInsets.navigationBars.getBottom(density).toDp() } + + LazyColumn( + state = listState, + modifier = modifier.fillMaxSize(), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingXs, + bottom = Dimensions.screenPaddingHorizontal + navBarBottomInset + ), + verticalArrangement = Arrangement.spacedBy(2.dp) + ) { + if (isLoading) { + item(key = "logs_loading") { + LogsLoadingState() + } + } else if (isEmpty) { + item(key = "logs_empty") { + LogsEmptyState() + } + } else if (hasLoadError) { + item(key = "logs_load_error") { + LogsLoadErrorState(onRetry = { items.retry() }) + } + } else { + items( + count = itemCount + ) { index -> + val item = items[index] ?: return@items + rowContent(item, index, itemCount) + } + } + } +} + +@Composable +private fun LogsLoadingState() { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusXl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + modifier = Modifier + .fillMaxWidth() + .padding(top = Dimensions.spacingSm) + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.spacingLg, vertical = Dimensions.spacingLg), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically + ) { + CircularProgressIndicator(modifier = Modifier.size(18.dp), strokeWidth = 2.dp) + Text( + text = stringResource(id = R.string.lbl_loading), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } +} + +@Composable +private fun LogsLoadErrorState(onRetry: () -> Unit) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusXl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + modifier = Modifier + .fillMaxWidth() + .padding(top = Dimensions.spacingSm) + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.spacingLg, vertical = Dimensions.spacingMd), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = stringResource(id = R.string.error_loading_log_file), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.weight(1f) + ) + TextButton(onClick = onRetry) { + Text(text = stringResource(id = R.string.cd_refresh)) + } + } + } +} + +@Composable +private fun LogsDeleteDialog( + show: Boolean, + onDismiss: () -> Unit, + onDelete: suspend () -> Unit, + onRefresh: () -> Unit +) { + if (!show) return + val context = LocalContext.current + val scope = rememberCoroutineScope() + val refreshCompleteText = stringResource(R.string.refresh_complete) + ConfirmClearLogsDialog( + onDismiss = onDismiss, + onConfirm = { + onDismiss() + scope.launch(Dispatchers.IO) { onDelete() } + Utilities.showToastUiCentered( + context, + refreshCompleteText, + Toast.LENGTH_SHORT + ) + onRefresh() + } + ) +} + +@Composable +private fun LogsEmptyState() { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusXl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + modifier = Modifier + .fillMaxWidth() + .padding(top = Dimensions.spacingSm) + ) { + Text( + text = stringResource(id = R.string.lbl_no_logs), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + modifier = Modifier.padding(horizontal = Dimensions.spacingXl, vertical = Dimensions.spacingLg) + ) + } +} + +@Composable +private fun ConfirmClearLogsDialog( + onDismiss: () -> Unit, + onConfirm: () -> Unit +) { + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = stringResource(R.string.conn_track_clear_logs_title), + message = stringResource(R.string.conn_track_clear_logs_message), + confirmText = stringResource(R.string.lbl_delete), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = onConfirm, + onDismiss = onDismiss, + isConfirmDestructive = true + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun ConnTrackerDetailsSheet( + connection: ConnectionTracker, + onDismiss: () -> Unit +) { + val status = if (connection.isBlocked) stringResource(R.string.lbl_blocked) else stringResource(R.string.lbl_allowed) + LogDetailsSheet( + title = connection.appName, + appPackageName = connection.packageName, + appDisplayName = connection.appName, + details = listOf( + LogDetailEntry(stringResource(R.string.log_detail_ip_address), connection.ipAddress), + LogDetailEntry(stringResource(R.string.log_detail_port), connection.port.toString()), + LogDetailEntry(stringResource(R.string.log_detail_protocol), connection.protocol.toString()), + LogDetailEntry(stringResource(R.string.lbl_status), status, isError = connection.isBlocked) + ), + onDismiss = onDismiss + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun DnsLogDetailsSheet( + log: DnsLog, + onDismiss: () -> Unit +) { + val status = if (log.isBlocked) stringResource(R.string.lbl_blocked) else stringResource(R.string.lbl_allowed) + val response = log.responseIps.ifEmpty { stringResource(R.string.settings_app_list_default_app) } + LogDetailsSheet( + title = log.queryStr, + appPackageName = log.packageName, + appDisplayName = log.appName, + details = listOf( + LogDetailEntry(stringResource(R.string.log_detail_app_name), log.appName), + LogDetailEntry(stringResource(R.string.log_detail_response), response), + LogDetailEntry(stringResource(R.string.dns_detail_latency), "${log.latency}ms"), + LogDetailEntry(stringResource(R.string.lbl_status), status, isError = log.isBlocked) + ), + onDismiss = onDismiss + ) +} + +private data class LogDetailEntry( + val label: String, + val value: String, + val isError: Boolean = false +) + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun LogDetailsSheet( + title: String, + appPackageName: String, + appDisplayName: String, + details: List, + onDismiss: () -> Unit +) { + val context = LocalContext.current + var appIcon by remember(appPackageName, appDisplayName) { mutableStateOf(null) } + + LaunchedEffect(appPackageName, appDisplayName) { + appIcon = kotlinx.coroutines.withContext(Dispatchers.IO) { + if (appPackageName.isBlank()) { + Utilities.getDefaultIcon(context) + } else { + Utilities.getIcon(context, appPackageName, appDisplayName) + } + } + } + + RethinkModalBottomSheet(onDismissRequest = onDismiss, includeBottomSpacer = true) { + RethinkBottomSheetCard( + shape = RoundedCornerShape(Dimensions.cornerRadius4xl), + contentPadding = PaddingValues(Dimensions.spacingLg) + ) { + Column( + modifier = Modifier + .fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + val iconPainter = + rememberDrawablePainter(appIcon ?: Utilities.getDefaultIcon(context)) + iconPainter?.let { painter -> + Image( + painter = painter, + contentDescription = null, + modifier = Modifier + .size(30.dp) + .clip(RoundedCornerShape(9.dp)) + ) + } + Text( + text = title, + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.SemiBold + ) + } + details.forEach { entry -> + DetailRow( + label = entry.label, + value = entry.value, + isError = entry.isError + ) + } + + Spacer(modifier = Modifier.height(Dimensions.spacingXl)) + TextButton(onClick = onDismiss, modifier = Modifier.align(Alignment.End)) { + Text(text = stringResource(R.string.lbl_dismiss)) + } + } + } + } +} + +@Composable +private fun DetailRow(label: String, value: String, isError: Boolean = false) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = Dimensions.spacingXs), + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text( + text = label, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Text( + text = value, + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.SemiBold, + color = if (isError) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onSurface + ) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/navigation/HomeNavigation.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/navigation/HomeNavigation.kt new file mode 100644 index 000000000..a2a1e63c8 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/navigation/HomeNavigation.kt @@ -0,0 +1,1274 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.navigation + +import android.graphics.drawable.Drawable +import androidx.activity.compose.BackHandler +import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInVertically +import androidx.compose.animation.slideOutVertically +import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.tween +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Home +import androidx.compose.material.icons.filled.Info +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.filled.Star +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.WindowInsetsSides +import androidx.compose.foundation.layout.consumeWindowInsets +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.only +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawing +import androidx.compose.foundation.layout.width +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.NavigationBarItemDefaults +import androidx.compose.material3.NavigationRail +import androidx.compose.material3.NavigationRailItem +import androidx.compose.material3.NavigationRailItemDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.lifecycle.asFlow +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.toRoute +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.data.SummaryStatisticsType +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.ui.compose.alerts.AlertsScreen +import com.celzero.bravedns.ui.compose.about.AboutScreen +import com.celzero.bravedns.ui.compose.about.AboutUiState +import com.celzero.bravedns.ui.compose.app.AppInfoScreen +import com.celzero.bravedns.ui.compose.configure.ConfigureScreen +import com.celzero.bravedns.ui.compose.configure.SettingsSearchDestination +import com.celzero.bravedns.ui.compose.events.EventsScreen +import com.celzero.bravedns.ui.compose.firewall.FirewallSettingsScreen +import com.celzero.bravedns.ui.compose.home.HomeScreen +import com.celzero.bravedns.ui.compose.settings.AdvancedSettingsScreen +import com.celzero.bravedns.ui.compose.settings.AntiCensorshipScreen +import com.celzero.bravedns.ui.compose.settings.AppLockScreen +import com.celzero.bravedns.ui.compose.settings.AppLockResult +import com.celzero.bravedns.ui.compose.settings.MiscSettingsScreen +import com.celzero.bravedns.ui.compose.settings.TunnelSettingsScreen +import com.celzero.bravedns.ui.compose.settings.ConsoleLogScreen +import com.celzero.bravedns.ui.compose.settings.ProxySettingsScreen +import com.celzero.bravedns.ui.compose.proxy.TcpProxyMainScreen +import com.celzero.bravedns.ui.compose.logs.NetworkLogsScreen +import com.celzero.bravedns.ui.compose.settings.PingTestScreen +import com.celzero.bravedns.ui.dialog.WgIncludeAppsScreen +import com.celzero.bravedns.ui.compose.logs.AppWiseIpLogsScreen +import com.celzero.bravedns.viewmodel.ProxyAppsMappingViewModel +import com.celzero.bravedns.ui.compose.apps.AppListScreen +import com.celzero.bravedns.ui.compose.firewall.CustomRulesScreen +import com.celzero.bravedns.ui.compose.home.WelcomeScreen +import com.celzero.bravedns.ui.compose.home.HomeScreenUiState +import com.celzero.bravedns.ui.compose.firewall.RulesMode +import com.celzero.bravedns.ui.compose.firewall.RulesTab +import com.celzero.bravedns.ui.compose.wireguard.WgConfigDetailScreen +import com.celzero.bravedns.ui.compose.wireguard.WgConfigEditorScreen +import com.celzero.bravedns.ui.compose.wireguard.WgType +import com.celzero.bravedns.ui.compose.rpn.RpnAvailabilityScreen +import com.celzero.bravedns.ui.compose.rpn.RpnCountriesScreen +import com.celzero.bravedns.ui.compose.rpn.RpnWinProxyDetailsScreen +import com.celzero.bravedns.ui.compose.logs.DomainConnectionsInputType +import com.celzero.bravedns.ui.compose.logs.DomainConnectionsScreen +import com.celzero.bravedns.ui.compose.statistics.DetailedStatisticsScreen +import com.celzero.bravedns.ui.compose.statistics.SummaryStatisticsScreen +import com.celzero.bravedns.ui.compose.database.DatabaseScreen +import com.celzero.bravedns.database.EventDao +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.service.ProxyManager +import com.celzero.bravedns.viewmodel.AppConnectionsViewModel +import com.celzero.bravedns.viewmodel.CustomDomainViewModel +import com.celzero.bravedns.viewmodel.CustomIpViewModel +import com.celzero.bravedns.viewmodel.DomainConnectionsViewModel +import com.celzero.bravedns.viewmodel.DetailedStatisticsViewModel +import com.celzero.bravedns.viewmodel.EventsViewModel +import com.celzero.bravedns.viewmodel.SummaryStatisticsViewModel +import com.celzero.bravedns.viewmodel.ConsoleLogViewModel +import com.celzero.bravedns.database.ConsoleLogRepository +import com.celzero.bravedns.download.AppDownloadManager +import com.celzero.bravedns.ui.compose.dns.ConfigureRethinkBasicScreen +import com.celzero.bravedns.ui.compose.dns.ConfigureRethinkScreenType +import com.celzero.bravedns.ui.compose.dns.DnsDetailScreen +import com.celzero.bravedns.ui.compose.dns.DnsListScreen +import com.celzero.bravedns.ui.compose.dns.DnsSettingsViewModel +import com.celzero.bravedns.viewmodel.LocalBlocklistPacksMapViewModel +import com.celzero.bravedns.viewmodel.RemoteBlocklistPacksMapViewModel +import com.celzero.bravedns.viewmodel.RethinkEndpointViewModel +import com.celzero.bravedns.viewmodel.RethinkLocalFileTagViewModel +import com.celzero.bravedns.viewmodel.RethinkRemoteFileTagViewModel +import com.celzero.bravedns.viewmodel.AppInfoViewModel +import com.celzero.bravedns.database.RefreshDatabase +import com.celzero.bravedns.viewmodel.ConnectionTrackerViewModel +import com.celzero.bravedns.viewmodel.DnsLogViewModel +import com.celzero.bravedns.viewmodel.RethinkLogViewModel +import com.celzero.bravedns.database.ConnectionTrackerRepository +import com.celzero.bravedns.database.DnsLogRepository +import com.celzero.bravedns.database.RethinkLogRepository +import com.celzero.bravedns.ui.compose.dns.ConfigureOtherDnsScreen +import com.celzero.bravedns.ui.compose.dns.DnsScreenType +import com.celzero.bravedns.ui.compose.firewall.UniversalFirewallSettingsScreen +import com.celzero.bravedns.ui.compose.settings.CheckoutScreen +import com.celzero.bravedns.database.AppDatabase +import com.celzero.bravedns.viewmodel.DoHEndpointViewModel +import com.celzero.bravedns.viewmodel.DoTEndpointViewModel +import com.celzero.bravedns.viewmodel.DnsProxyEndpointViewModel +import com.celzero.bravedns.viewmodel.DnsCryptEndpointViewModel +import com.celzero.bravedns.viewmodel.DnsCryptRelayEndpointViewModel +import com.celzero.bravedns.viewmodel.ODoHEndpointViewModel +import com.celzero.bravedns.viewmodel.CheckoutViewModel +import com.celzero.bravedns.ui.compose.logs.AppWiseDomainLogsScreen +import com.celzero.bravedns.viewmodel.WgConfigViewModel +import com.celzero.bravedns.ui.compose.wireguard.WgMainScreen +import com.celzero.bravedns.util.Constants.Companion.UID_EVERYBODY +import com.celzero.bravedns.util.Utilities +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private const val BOTTOM_BAR_ENTER_DURATION = 220 +private const val BOTTOM_BAR_EXIT_DURATION = 180 +private const val NAV_ENTER_DURATION = 240 +private const val NAV_EXIT_DURATION = 200 + +enum class HomeDestination( + val route: HomeRoute, + val labelRes: Int, + val selectedIcon: ImageVector, + val unselectedIcon: ImageVector +) { + HOME(HomeRoute.Home, R.string.txt_home, Icons.Filled.Home, Icons.Filled.Home), + STATS(HomeRoute.Stats, R.string.title_statistics, Icons.Filled.Star, Icons.Filled.Star), + CONFIGURE(HomeRoute.Configure, R.string.lbl_configure, Icons.Filled.Settings, Icons.Filled.Settings), + ABOUT(HomeRoute.About, R.string.title_about, Icons.Filled.Info, Icons.Filled.Info) +} + +sealed interface HomeNavRequest { + data class DetailedStats( + val type: SummaryStatisticsType, + val timeCategory: SummaryStatisticsViewModel.TimeCategory + ) : HomeNavRequest + + data object Alerts : HomeNavRequest + data object RpnCountries : HomeNavRequest + data object RpnAvailability : HomeNavRequest + data object Events : HomeNavRequest + data object FirewallSettings : HomeNavRequest + data object AdvancedSettings : HomeNavRequest + data object AntiCensorship : HomeNavRequest + data object TunnelSettings : HomeNavRequest + data object MiscSettings : HomeNavRequest + data object ConsoleLogs : HomeNavRequest + data object NetworkLogs : HomeNavRequest + data object AppList : HomeNavRequest + data class CustomRules( + val uid: Int = UID_EVERYBODY, + val tab: CustomRulesTab = CustomRulesTab.IP, + val mode: CustomRulesMode = CustomRulesMode.APP_SPECIFIC + ) : HomeNavRequest + data object ProxySettings : HomeNavRequest + data object TcpProxyMain : HomeNavRequest + data object Welcome : HomeNavRequest + data object AppLock : HomeNavRequest + data object PingTest : HomeNavRequest + data object DnsDetail : HomeNavRequest + data class WgConfigDetail(val configId: Int, val wgType: WgType) : HomeNavRequest + data class WgConfigEditor(val configId: Int, val wgType: WgType) : HomeNavRequest + data class RpnWinProxyDetails(val countryCode: String) : HomeNavRequest + data class AppInfo(val uid: Int) : HomeNavRequest + data class DomainConnections( + val type: DomainConnectionsInputType, + val flag: String, + val domain: String, + val asn: String, + val ip: String, + val isBlocked: Boolean, + val timeCategory: DomainConnectionsViewModel.TimeCategory + ) : HomeNavRequest + + data object DnsList : HomeNavRequest + data class AppWiseIpLogs(val uid: Int, val isAsn: Boolean) : HomeNavRequest + data class ConfigureRethinkBasic( + val screenType: ConfigureRethinkScreenType, + val remoteName: String = "", + val remoteUrl: String = "", + val uid: Int = -1 + ) : HomeNavRequest + + data class ConfigureOtherDns(val dnsType: Int) : HomeNavRequest + data object UniversalFirewallSettings : HomeNavRequest + data class AppWiseDomainLogs(val uid: Int) : HomeNavRequest + data object Checkout : HomeNavRequest + data object WgMain : HomeNavRequest + data object Database : HomeNavRequest +} + +@Composable +fun HomeScreenRoot( + homeUiState: HomeScreenUiState, + onHomeStartStopClick: () -> Unit, + onHomeDnsClick: () -> Unit, + onHomeFirewallClick: () -> Unit, + onHomeProxyClick: () -> Unit, + onHomeLogsClick: () -> Unit, + onHomeAppsClick: () -> Unit, + onHomeSponsorClick: () -> Unit, + summaryViewModel: SummaryStatisticsViewModel, + onOpenDetailedStats: (SummaryStatisticsType) -> Unit, + startDestination: HomeRoute, + isDebug: Boolean, + onConfigureAppsClick: () -> Unit, + onConfigureDnsClick: () -> Unit, + onConfigureFirewallClick: () -> Unit, + onFirewallUniversalClick: () -> Unit, + onFirewallCustomIpClick: () -> Unit, + onFirewallAppWiseIpClick: () -> Unit, + onConfigureProxyClick: () -> Unit, + onConfigureNetworkClick: () -> Unit, + onConfigureOthersClick: () -> Unit, + onConfigureLogsClick: () -> Unit, + onConfigureAntiCensorshipClick: () -> Unit, + onConfigureAdvancedClick: () -> Unit, + aboutUiState: AboutUiState, + onSponsorClick: () -> Unit, + onTelegramClick: () -> Unit, + onBugReportClick: () -> Unit, + onWhatsNewClick: () -> Unit, + onAppUpdateClick: () -> Unit, + onContributorsClick: () -> Unit, + onTranslateClick: () -> Unit, + onWebsiteClick: () -> Unit, + onGithubClick: () -> Unit, + onFaqClick: () -> Unit, + onDocsClick: () -> Unit, + onPrivacyPolicyClick: () -> Unit, + onTermsOfServiceClick: () -> Unit, + onLicenseClick: () -> Unit, + onTwitterClick: () -> Unit, + onEmailClick: () -> Unit, + onRedditClick: () -> Unit, + onElementClick: () -> Unit, + onMastodonClick: () -> Unit, + onGeneralSettingsClick: () -> Unit, + onAppInfoClick: () -> Unit, + onVpnProfileClick: () -> Unit, + onNotificationClick: () -> Unit, + onStatsClick: () -> Unit, + onDbStatsClick: () -> Unit, + onFlightRecordClick: () -> Unit, + onEventLogsClick: () -> Unit, + onTokenClick: () -> Unit, + onTokenDoubleTap: () -> Unit, + onFossClick: () -> Unit, + onFlossFundsClick: () -> Unit, + snackbarHostState: SnackbarHostState, + detailedStatsViewModel: DetailedStatisticsViewModel, + domainConnectionsViewModel: DomainConnectionsViewModel, + eventsViewModel: EventsViewModel, + eventDao: EventDao, + appInfoEventLogger: EventLogger, + appInfoIpRulesViewModel: CustomIpViewModel, + appInfoDomainRulesViewModel: CustomDomainViewModel, + appInfoNetworkLogsViewModel: AppConnectionsViewModel, + persistentState: PersistentState, + appConfig: AppConfig, + onOpenVpnProfile: () -> Unit, + onRefreshDatabase: (() -> Unit)? = null, + onThemeModeChanged: ((Int) -> Unit)? = null, + onThemeColorChanged: ((Int) -> Unit)? = null, + consoleLogViewModel: ConsoleLogViewModel, + consoleLogRepository: ConsoleLogRepository, + onShareConsoleLogs: () -> Unit, + onConsoleLogsDeleteComplete: () -> Unit, + proxyAppsMappingViewModel: ProxyAppsMappingViewModel, + dnsSettingsViewModel: DnsSettingsViewModel, + appDownloadManager: AppDownloadManager, + onDnsCustomDnsClick: () -> Unit, + onDnsRethinkPlusDnsClick: () -> Unit, + onDnsLocalBlocklistConfigureClick: () -> Unit, + homeNavRequest: HomeNavRequest?, + onHomeNavConsumed: () -> Unit, + onAppLockResult: (AppLockResult) -> Unit = {}, + // ConfigureRethinkBasic dependencies + rethinkEndpointViewModel: RethinkEndpointViewModel, + remoteFileTagViewModel: RethinkRemoteFileTagViewModel, + localFileTagViewModel: RethinkLocalFileTagViewModel, + remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, + localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, + appInfoViewModel: AppInfoViewModel, + refreshDatabase: RefreshDatabase, + connectionTrackerViewModel: ConnectionTrackerViewModel, + dnsLogViewModel: DnsLogViewModel, + rethinkLogViewModel: RethinkLogViewModel, + connectionTrackerRepository: ConnectionTrackerRepository, + dnsLogRepository: DnsLogRepository, + rethinkLogRepository: RethinkLogRepository, + onConfigureOtherDns: (Int) -> Unit, + // ConfigureOtherDns dependencies + dohViewModel: DoHEndpointViewModel, + dotViewModel: DoTEndpointViewModel, + dnsProxyViewModel: DnsProxyEndpointViewModel, + dnsCryptViewModel: DnsCryptEndpointViewModel, + dnsCryptRelayViewModel: DnsCryptRelayEndpointViewModel, + oDohViewModel: ODoHEndpointViewModel, + // UniversalFirewallSettings callbacks + onNavigateToLogs: (String) -> Unit, + onOpenAccessibilitySettings: () -> Unit, + // WireGuard dependencies + wgConfigViewModel: WgConfigViewModel, + // Checkout dependencies + checkoutViewModel: CheckoutViewModel?, + onNavigateToProxy: () -> Unit, + // WgMain callbacks + onWgCreateClick: () -> Unit, + onWgImportClick: () -> Unit, + onWgQrScanClick: () -> Unit, + appDatabase: AppDatabase +) { + val navController = rememberNavController() + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = navBackStackEntry?.destination + val currentHierarchy = currentDestination?.hierarchy.orEmpty() + val currentRoute = currentDestination?.route + val topLevelRoutes = remember { + HomeDestination.entries.mapNotNull { it.route::class.qualifiedName }.toSet() + } + val isHomeRoute = currentRoute == HomeRoute.Home::class.qualifiedName + val isWelcomeRoute = currentRoute == HomeRoute.Welcome::class.qualifiedName + val showBottomBar = + !isWelcomeRoute && + currentHierarchy.any { it.route != null && topLevelRoutes.contains(it.route) } + val isWideScreen = LocalConfiguration.current.screenWidthDp >= 840 + val showNavigationRail = showBottomBar && isWideScreen + val showNavigationBar = showBottomBar && !isWideScreen + + LaunchedEffect(homeNavRequest) { + val request = homeNavRequest ?: return@LaunchedEffect + when (request) { + is HomeNavRequest.DetailedStats -> { + navController.navigate(HomeRoute.DetailedStats(request.type.tid, request.timeCategory.value)) + } + + HomeNavRequest.Alerts -> { + navController.navigate(HomeRoute.Alerts) + } + + HomeNavRequest.RpnCountries -> { + navController.navigate(HomeRoute.RpnCountries) + } + + HomeNavRequest.RpnAvailability -> { + navController.navigate(HomeRoute.RpnAvailability) + } + + HomeNavRequest.Events -> { + navController.navigate(HomeRoute.Events) + } + + HomeNavRequest.FirewallSettings -> { + navController.navigate(HomeRoute.FirewallSettings()) + } + + HomeNavRequest.AdvancedSettings -> { + navController.navigate(HomeRoute.AdvancedSettings) + } + + HomeNavRequest.AntiCensorship -> { + navController.navigate(HomeRoute.AntiCensorship) + } + + HomeNavRequest.TunnelSettings -> { + navController.navigate(HomeRoute.TunnelSettings()) + } + + HomeNavRequest.MiscSettings -> { + navController.navigate(HomeRoute.MiscSettings()) + } + + HomeNavRequest.ConsoleLogs -> { + navController.navigate(HomeRoute.ConsoleLogs) + } + + HomeNavRequest.NetworkLogs -> { + navController.navigate(HomeRoute.NetworkLogs) + } + + HomeNavRequest.AppList -> { + navController.navigate(HomeRoute.AppList) + } + + is HomeNavRequest.CustomRules -> { + navController.navigate( + HomeRoute.CustomRules( + uid = request.uid, + tab = request.tab.value, + mode = request.mode.value + ) + ) + } + + HomeNavRequest.ProxySettings -> { + navController.navigate(HomeRoute.ProxySettings()) + } + + HomeNavRequest.TcpProxyMain -> { + navController.navigate(HomeRoute.TcpProxyMain) + } + + HomeNavRequest.Welcome -> { + navController.navigate(HomeRoute.Welcome) + } + + HomeNavRequest.PingTest -> { + navController.navigate(HomeRoute.PingTest) + } + + HomeNavRequest.AppLock -> { + navController.navigate(HomeRoute.AppLock) + } + + HomeNavRequest.DnsDetail -> { + navController.navigate(HomeRoute.DnsDetail()) + } + + is HomeNavRequest.RpnWinProxyDetails -> { + navController.navigate(HomeRoute.RpnWinProxyDetails(request.countryCode)) + } + + is HomeNavRequest.DomainConnections -> { + navController.navigate( + HomeRoute.DomainConnections( + typeId = request.type.type, + flag = request.flag, + domain = request.domain, + asn = request.asn, + ip = request.ip, + isBlocked = request.isBlocked, + timeCategory = request.timeCategory.value + ) + ) + } + + is HomeNavRequest.AppInfo -> { + navController.navigate(HomeRoute.AppInfo(request.uid)) + } + + is HomeNavRequest.WgConfigDetail -> { + navController.navigate(HomeRoute.WgConfigDetail(request.configId, request.wgType)) + } + + is HomeNavRequest.WgConfigEditor -> { + navController.navigate(HomeRoute.WgConfigEditor(request.configId, request.wgType)) + } + + is HomeNavRequest.ConfigureRethinkBasic -> { + navController.navigate( + HomeRoute.ConfigureRethinkBasic( + screenTypeOrdinal = request.screenType.ordinal, + remoteName = request.remoteName, + remoteUrl = request.remoteUrl, + uid = request.uid + ) + ) + } + + HomeNavRequest.DnsList -> { + navController.navigate(HomeRoute.DnsList) + } + + is HomeNavRequest.AppWiseIpLogs -> { + navController.navigate(HomeRoute.AppWiseIpLogs(request.uid, request.isAsn)) + } + + is HomeNavRequest.ConfigureOtherDns -> { + navController.navigate(HomeRoute.ConfigureOtherDns(request.dnsType)) + } + + HomeNavRequest.UniversalFirewallSettings -> { + navController.navigate(HomeRoute.UniversalFirewallSettings) + } + + is HomeNavRequest.AppWiseDomainLogs -> { + navController.navigate(HomeRoute.AppWiseDomainLogs(request.uid)) + } + + HomeNavRequest.Checkout -> { + navController.navigate(HomeRoute.Checkout) + } + + HomeNavRequest.WgMain -> { + navController.navigate(HomeRoute.WgMain) + } + + HomeNavRequest.Database -> { + navController.navigate(HomeRoute.Database) + } + } + onHomeNavConsumed() + } + + BackHandler(enabled = !isHomeRoute) { + if (isWelcomeRoute) { + persistentState.firstTimeLaunch = false + navController.navigate(HomeRoute.Home) { + popUpTo(navController.graph.findStartDestination().id) { inclusive = true } + launchSingleTop = true + } + } else { + navController.navigate(HomeRoute.Home) { + popUpTo(navController.graph.findStartDestination().id) { inclusive = false } + launchSingleTop = true + } + } + } + + Scaffold( + containerColor = MaterialTheme.colorScheme.background, + contentWindowInsets = WindowInsets(0, 0, 0, 0), + snackbarHost = { SnackbarHost(hostState = snackbarHostState) }, + bottomBar = { + AnimatedVisibility( + visible = showNavigationBar, + enter = slideInVertically( + initialOffsetY = { it }, + animationSpec = tween( + durationMillis = BOTTOM_BAR_ENTER_DURATION, + easing = FastOutSlowInEasing + ) + ) + fadeIn(animationSpec = tween(durationMillis = BOTTOM_BAR_ENTER_DURATION)), + exit = slideOutVertically( + targetOffsetY = { it }, + animationSpec = tween( + durationMillis = BOTTOM_BAR_EXIT_DURATION, + easing = FastOutSlowInEasing + ) + ) + fadeOut(animationSpec = tween(durationMillis = BOTTOM_BAR_EXIT_DURATION)) + ) { + NavigationBar( + modifier = Modifier.fillMaxWidth(), + windowInsets = + WindowInsets.safeDrawing.only( + WindowInsetsSides.Start + WindowInsetsSides.End + WindowInsetsSides.Bottom + ) + ) { + HomeDestination.entries.forEach { destination -> + val routeName = destination.route::class.qualifiedName + val isSelected = currentHierarchy.any { it.route == routeName } + NavigationBarItem( + selected = isSelected, + onClick = { + navController.navigate(destination.route) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + }, + icon = { + Icon( + imageVector = + if (isSelected) destination.selectedIcon else destination.unselectedIcon, + contentDescription = stringResource(id = destination.labelRes) + ) + }, + label = { + Text( + text = stringResource(id = destination.labelRes), + style = MaterialTheme.typography.labelMedium + ) + }, + alwaysShowLabel = true, + colors = NavigationBarItemDefaults.colors( + selectedIconColor = MaterialTheme.colorScheme.onSecondaryContainer, + selectedTextColor = MaterialTheme.colorScheme.onSurface, + indicatorColor = MaterialTheme.colorScheme.secondaryContainer, + unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant, + unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant + ) + ) + } + } + } + } + ) { paddingValues -> + val navHostModifier = Modifier + .padding(paddingValues) + .consumeWindowInsets(WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom)) + + val navHostContent: @Composable (Modifier) -> Unit = { modifier -> + NavHost( + navController = navController, + startDestination = startDestination, + modifier = modifier, + enterTransition = { + val topLevelTransition = + topLevelRoutes.contains(initialState.destination.route) && + topLevelRoutes.contains(targetState.destination.route) + if (topLevelTransition) { + fadeIn(animationSpec = tween(durationMillis = NAV_EXIT_DURATION)) + } else { + slideIntoContainer( + towards = AnimatedContentTransitionScope.SlideDirection.Left, + animationSpec = tween( + durationMillis = NAV_ENTER_DURATION, + easing = FastOutSlowInEasing + ) + ) + fadeIn(animationSpec = tween(durationMillis = NAV_ENTER_DURATION)) + } + }, + exitTransition = { + val topLevelTransition = + topLevelRoutes.contains(initialState.destination.route) && + topLevelRoutes.contains(targetState.destination.route) + if (topLevelTransition) { + fadeOut(animationSpec = tween(durationMillis = NAV_EXIT_DURATION)) + } else { + slideOutOfContainer( + towards = AnimatedContentTransitionScope.SlideDirection.Left, + animationSpec = tween( + durationMillis = NAV_EXIT_DURATION, + easing = FastOutSlowInEasing + ) + ) + fadeOut(animationSpec = tween(durationMillis = NAV_EXIT_DURATION)) + } + }, + popEnterTransition = { + val topLevelTransition = + topLevelRoutes.contains(initialState.destination.route) && + topLevelRoutes.contains(targetState.destination.route) + if (topLevelTransition) { + fadeIn(animationSpec = tween(durationMillis = NAV_EXIT_DURATION)) + } else { + slideIntoContainer( + towards = AnimatedContentTransitionScope.SlideDirection.Right, + animationSpec = tween( + durationMillis = NAV_ENTER_DURATION, + easing = FastOutSlowInEasing + ) + ) + fadeIn(animationSpec = tween(durationMillis = NAV_ENTER_DURATION)) + } + }, + popExitTransition = { + val topLevelTransition = + topLevelRoutes.contains(initialState.destination.route) && + topLevelRoutes.contains(targetState.destination.route) + if (topLevelTransition) { + fadeOut(animationSpec = tween(durationMillis = NAV_EXIT_DURATION)) + } else { + slideOutOfContainer( + towards = AnimatedContentTransitionScope.SlideDirection.Right, + animationSpec = tween( + durationMillis = NAV_EXIT_DURATION, + easing = FastOutSlowInEasing + ) + ) + fadeOut(animationSpec = tween(durationMillis = NAV_EXIT_DURATION)) + } + } + ) { + composable { + HomeScreen( + uiState = homeUiState, + onStartStopClick = onHomeStartStopClick, + onDnsClick = onHomeDnsClick, + onFirewallClick = onHomeFirewallClick, + onProxyClick = onHomeProxyClick, + onLogsClick = onHomeLogsClick, + onAppsClick = onHomeAppsClick, + onSponsorClick = onHomeSponsorClick + ) + } + composable { + SummaryStatisticsScreen( + viewModel = summaryViewModel, + persistentState = persistentState, + onSeeMoreClick = onOpenDetailedStats + ) + } + composable { + AlertsScreen(onBackClick = { navController.popBackStack() }) + } + composable { + RpnCountriesScreen(onBackClick = { navController.popBackStack() }) + } + composable { + RpnAvailabilityScreen(onBackClick = { navController.popBackStack() }) + } + composable { + EventsScreen( + viewModel = eventsViewModel, + eventDao = eventDao, + onBackClick = { navController.popBackStack() } + ) + } + composable { entry -> + val args = entry.toRoute() + FirewallSettingsScreen( + onUniversalFirewallClick = onFirewallUniversalClick, + onCustomIpDomainClick = onFirewallCustomIpClick, + onAppWiseIpDomainClick = onFirewallAppWiseIpClick, + initialFocusKey = args.focusKey.takeIf { it.isNotBlank() }, + onBackClick = { navController.popBackStack() } + ) + } + composable { + AdvancedSettingsScreen( + persistentState = persistentState, + onBackClick = { navController.popBackStack() } + ) + } + composable { + AntiCensorshipScreen( + persistentState = persistentState, + eventLogger = appInfoEventLogger, + onBackClick = { navController.popBackStack() } + ) + } + composable { entry -> + val args = entry.toRoute() + TunnelSettingsScreen( + persistentState = persistentState, + appConfig = appConfig, + eventLogger = appInfoEventLogger, + onOpenVpnProfile = onOpenVpnProfile, + initialFocusKey = args.focusKey.takeIf { it.isNotBlank() }, + onBackClick = { navController.popBackStack() } + ) + } + composable { entry -> + val args = entry.toRoute() + MiscSettingsScreen( + persistentState = persistentState, + eventLogger = appInfoEventLogger, + initialFocusKey = args.focusKey.takeIf { it.isNotBlank() }, + onBackClick = { navController.popBackStack() }, + onRefreshDatabase = onRefreshDatabase, + onThemeModeChanged = onThemeModeChanged, + onThemeColorChanged = onThemeColorChanged + ) + } + composable { + PingTestScreen( + onBackClick = { navController.popBackStack() } + ) + } + composable { + ConsoleLogScreen( + viewModel = consoleLogViewModel, + consoleLogRepository = consoleLogRepository, + persistentState = persistentState, + onShareClick = onShareConsoleLogs, + onDeleteComplete = onConsoleLogsDeleteComplete, + onBackClick = { navController.popBackStack() } + ) + } + composable { + NetworkLogsScreen( + connectionTrackerViewModel = connectionTrackerViewModel, + dnsLogViewModel = dnsLogViewModel, + rethinkLogViewModel = rethinkLogViewModel, + connectionTrackerRepository = connectionTrackerRepository, + dnsLogRepository = dnsLogRepository, + rethinkLogRepository = rethinkLogRepository, + persistentState = persistentState, + eventLogger = appInfoEventLogger, + onBackClick = { navController.popBackStack() } + ) + } + + composable { + AppListScreen( + viewModel = appInfoViewModel, + eventLogger = appInfoEventLogger, + refreshDatabase = refreshDatabase, + onAppClick = { uid -> navController.navigate(HomeRoute.AppInfo(uid)) }, + onBackClick = { navController.popBackStack() } + ) + } + + composable { entry -> + val args = entry.toRoute() + CustomRulesScreen( + uid = args.uid, + initialTab = RulesTab.fromValue(args.tab), + initialMode = RulesMode.fromValue(args.mode), + domainViewModel = appInfoDomainRulesViewModel, + ipViewModel = appInfoIpRulesViewModel, + eventLogger = appInfoEventLogger, + onBackClick = { navController.popBackStack() } + ) + } + + composable { entry -> + val args = entry.toRoute() + ProxySettingsScreen( + appConfig = appConfig, + persistentState = persistentState, + eventLogger = appInfoEventLogger, + mappingViewModel = proxyAppsMappingViewModel, + initialFocusKey = args.focusKey.takeIf { it.isNotBlank() }, + onWireguardClick = { navController.navigate(HomeRoute.WgMain) }, + onOpenOrbotApps = { + navController.navigate(HomeRoute.OrbotAppSelect) { + launchSingleTop = true + } + }, + onNavigateToDns = { navController.navigate(HomeRoute.DnsDetail()) }, + onBackClick = { navController.popBackStack() } + ) + } + + composable { + WgIncludeAppsScreen( + viewModel = proxyAppsMappingViewModel, + proxyId = ProxyManager.ID_ORBOT_BASE, + proxyName = ProxyManager.ORBOT_PROXY_NAME, + onDismiss = { navController.popBackStack() } + ) + } + + composable { + TcpProxyMainScreen( + appConfig = appConfig, + mappingViewModel = proxyAppsMappingViewModel, + onBackClick = { navController.popBackStack() } + ) + } + composable { + WelcomeScreen( + onFinish = { + persistentState.firstTimeLaunch = false + navController.navigate(HomeRoute.Home) { + popUpTo(navController.graph.findStartDestination().id) { inclusive = true } + launchSingleTop = true + } + } + ) + } + composable { + AppLockScreen( + persistentState = persistentState, + onAuthResult = { result -> + onAppLockResult(result) + navController.popBackStack() + } + ) + } + composable { entry -> + val args = entry.toRoute() + DnsDetailScreen( + viewModel = dnsSettingsViewModel, + persistentState = persistentState, + appDownloadManager = appDownloadManager, + initialFocusKey = args.focusKey.takeIf { it.isNotBlank() }, + onCustomDnsClick = onDnsCustomDnsClick, + onRethinkPlusDnsClick = onDnsRethinkPlusDnsClick, + onLocalBlocklistConfigureClick = onDnsLocalBlocklistConfigureClick, + onBackClick = { navController.popBackStack() } + ) + } + composable { entry -> + val args = entry.toRoute() + AppInfoScreen( + uid = args.uid, + eventLogger = appInfoEventLogger, + ipRulesViewModel = appInfoIpRulesViewModel, + domainRulesViewModel = appInfoDomainRulesViewModel, + networkLogsViewModel = appInfoNetworkLogsViewModel, + onBackClick = { navController.popBackStack() }, + onAppWiseIpLogsClick = { u, isAsn -> + navController.navigate(HomeRoute.AppWiseIpLogs(u, isAsn)) + }, + onCustomIpRulesClick = { u -> + navController.navigate( + HomeRoute.CustomRules( + uid = u, + tab = CustomRulesTab.IP.value, + mode = CustomRulesMode.APP_SPECIFIC.value + ) + ) + }, + onCustomDomainRulesClick = { u -> + navController.navigate( + HomeRoute.CustomRules( + uid = u, + tab = CustomRulesTab.DOMAIN.value, + mode = CustomRulesMode.APP_SPECIFIC.value + ) + ) + } + ) + } + composable { + DnsListScreen( + appConfig = appConfig, + onConfigureOtherDns = onConfigureOtherDns, + onConfigureRethinkBasic = { type -> + navController.navigate( + HomeRoute.ConfigureRethinkBasic( + screenTypeOrdinal = ConfigureRethinkScreenType.entries[type].ordinal, + remoteName = "", + remoteUrl = "", + uid = -1 + ) + ) + }, + onBackClick = { navController.popBackStack() } + ) + } + composable { entry -> + val args = entry.toRoute() + AppWiseIpLogsScreen( + uid = args.uid, + isAsn = args.isAsn, + viewModel = appInfoNetworkLogsViewModel, + eventLogger = appInfoEventLogger, + onBackClick = { navController.popBackStack() } + ) + } + + composable { entry -> + val args = entry.toRoute() + RpnWinProxyDetailsScreen( + countryCode = args.countryCode, + onBackClick = { navController.popBackStack() } + ) + } + + composable { entry -> + val args = entry.toRoute() + val timeCategory = DomainConnectionsViewModel.TimeCategory.fromValue(args.timeCategory) + ?: DomainConnectionsViewModel.TimeCategory.ONE_HOUR + val type = DomainConnectionsInputType.fromValue(args.typeId) + + DomainConnectionsScreen( + viewModel = domainConnectionsViewModel, + type = type, + flag = args.flag, + domain = args.domain, + asn = args.asn, + ip = args.ip, + isBlocked = args.isBlocked, + timeCategory = timeCategory, + onBackClick = { navController.popBackStack() } + ) + } + + composable { entry -> + val args = entry.toRoute() + val type = SummaryStatisticsType.getType(args.typeId) + val timeCategory = SummaryStatisticsViewModel.TimeCategory.fromValue(args.timeCategory) + + DetailedStatisticsScreen( + type = type, + timeCategory = timeCategory ?: SummaryStatisticsViewModel.TimeCategory.TWENTY_FOUR_HOUR, + viewModel = detailedStatsViewModel, + onBackClick = { navController.popBackStack() } + ) + } + + composable { entry -> + val args = entry.toRoute() + WgConfigDetailScreen( + configId = args.configId, + wgType = args.wgType, + persistentState = persistentState, + eventLogger = appInfoEventLogger, + mappingViewModel = proxyAppsMappingViewModel, + onEditConfig = { id, type -> + navController.navigate(HomeRoute.WgConfigEditor(id, type)) + }, + onBackClick = { navController.popBackStack() } + ) + } + + composable { entry -> + val args = entry.toRoute() + WgConfigEditorScreen( + configId = args.configId, + wgType = args.wgType, + persistentState = persistentState, + onBackClick = { navController.popBackStack() }, + onSaveSuccess = { navController.popBackStack() } + ) + } + composable { + ConfigureScreen( + isDebug = isDebug, + onAppsClick = onConfigureAppsClick, + onDnsClick = onConfigureDnsClick, + onFirewallClick = onConfigureFirewallClick, + onProxyClick = onConfigureProxyClick, + onNetworkClick = onConfigureNetworkClick, + onOthersClick = onConfigureOthersClick, + onLogsClick = onConfigureLogsClick, + onAntiCensorshipClick = onConfigureAntiCensorshipClick, + onAdvancedClick = onConfigureAdvancedClick, + onSearchDestinationClick = { destination -> + when (destination) { + SettingsSearchDestination.Apps -> navController.navigate(HomeRoute.AppList) + is SettingsSearchDestination.Dns -> navController.navigate( + HomeRoute.DnsDetail(destination.focusKey) + ) + is SettingsSearchDestination.Firewall -> navController.navigate( + HomeRoute.FirewallSettings(destination.focusKey) + ) + is SettingsSearchDestination.Proxy -> navController.navigate( + HomeRoute.ProxySettings(destination.focusKey) + ) + is SettingsSearchDestination.Network -> navController.navigate( + HomeRoute.TunnelSettings(destination.focusKey) + ) + is SettingsSearchDestination.General -> navController.navigate( + HomeRoute.MiscSettings(destination.focusKey) + ) + SettingsSearchDestination.Logs -> navController.navigate(HomeRoute.NetworkLogs) + SettingsSearchDestination.AntiCensorship -> navController.navigate(HomeRoute.AntiCensorship) + SettingsSearchDestination.Advanced -> navController.navigate(HomeRoute.AdvancedSettings) + } + } + ) + } + composable { + AboutScreen( + uiState = aboutUiState, + onSponsorClick = onSponsorClick, + onTelegramClick = onTelegramClick, + onBugReportClick = onBugReportClick, + onWhatsNewClick = onWhatsNewClick, + onAppUpdateClick = onAppUpdateClick, + onContributorsClick = onContributorsClick, + onTranslateClick = onTranslateClick, + onWebsiteClick = onWebsiteClick, + onGithubClick = onGithubClick, + onFaqClick = onFaqClick, + onDocsClick = onDocsClick, + onPrivacyPolicyClick = onPrivacyPolicyClick, + onTermsOfServiceClick = onTermsOfServiceClick, + onLicenseClick = onLicenseClick, + onTwitterClick = onTwitterClick, + onEmailClick = onEmailClick, + onRedditClick = onRedditClick, + onElementClick = onElementClick, + onMastodonClick = onMastodonClick, + onGeneralSettingsClick = onGeneralSettingsClick, + onAppInfoClick = onAppInfoClick, + onVpnProfileClick = onVpnProfileClick, + onNotificationClick = onNotificationClick, + onStatsClick = onStatsClick, + onDbStatsClick = onDbStatsClick, + onFlightRecordClick = onFlightRecordClick, + onEventLogsClick = onEventLogsClick, + onTokenClick = onTokenClick, + onTokenDoubleTap = onTokenDoubleTap, + onFossClick = onFossClick, + onFlossFundsClick = onFlossFundsClick, + persistentState = persistentState, + onThemeModeChanged = onThemeModeChanged, + onThemeColorChanged = onThemeColorChanged + ) + } + composable { entry -> + val args = entry.toRoute() + val screenType = ConfigureRethinkScreenType.entries.getOrElse(args.screenTypeOrdinal) { + ConfigureRethinkScreenType.REMOTE + } + ConfigureRethinkBasicScreen( + screenType = screenType, + uid = args.uid, + persistentState = persistentState, + appConfig = appConfig, + appDownloadManager = appDownloadManager, + rethinkEndpointViewModel = rethinkEndpointViewModel, + remoteFileTagViewModel = remoteFileTagViewModel, + localFileTagViewModel = localFileTagViewModel, + remoteBlocklistPacksMapViewModel = remoteBlocklistPacksMapViewModel, + localBlocklistPacksMapViewModel = localBlocklistPacksMapViewModel, + onBackClick = { navController.popBackStack() } + ) + } + composable { entry -> + val args = entry.toRoute() + ConfigureOtherDnsScreen( + dnsType = DnsScreenType.fromIndex(args.dnsType), + appConfig = appConfig, + persistentState = persistentState, + dohViewModel = dohViewModel, + dotViewModel = dotViewModel, + dnsProxyViewModel = dnsProxyViewModel, + dnsCryptViewModel = dnsCryptViewModel, + dnsCryptRelayViewModel = dnsCryptRelayViewModel, + oDohViewModel = oDohViewModel, + onBackClick = { navController.popBackStack() } + ) + } + composable { + UniversalFirewallSettingsScreen( + persistentState = persistentState, + eventLogger = appInfoEventLogger, + connTrackerRepository = connectionTrackerRepository, + onNavigateToLogs = onNavigateToLogs, + onOpenAccessibilitySettings = onOpenAccessibilitySettings, + onBackClick = { navController.popBackStack() } + ) + } + composable { + val currentCheckoutViewModel = checkoutViewModel + if (currentCheckoutViewModel == null) { + Text(text = stringResource(id = R.string.checkout_unavailable_desc)) + } else { + val paymentStatus by currentCheckoutViewModel.paymentStatus.collectAsStateWithLifecycle() + val workInfoList by currentCheckoutViewModel.paymentWorkInfo + .asFlow() + .collectAsStateWithLifecycle(initialValue = emptyList()) + + LaunchedEffect(workInfoList) { + currentCheckoutViewModel.updatePaymentStatusFromWorkInfo(workInfoList) + } + + CheckoutScreen( + paymentStatus = paymentStatus, + onStartPayment = { currentCheckoutViewModel.startPayment() }, + onNavigateToProxy = onNavigateToProxy, + onBackClick = { navController.popBackStack() } + ) + } + } + composable { entry -> + val args = entry.toRoute() + AppWiseDomainLogsScreen( + uid = args.uid, + viewModel = appInfoNetworkLogsViewModel, + eventLogger = appInfoEventLogger, + onBackClick = { navController.popBackStack() } + ) + } + composable { + WgMainScreen( + wgConfigViewModel = wgConfigViewModel, + persistentState = persistentState, + appConfig = appConfig, + eventLogger = appInfoEventLogger, + onBackClick = { navController.popBackStack() }, + onCreateClick = onWgCreateClick, + onImportClick = onWgImportClick, + onQrScanClick = onWgQrScanClick, + onConfigDetailClick = { configId, wgType -> + navController.navigate(HomeRoute.WgConfigDetail(configId, wgType)) + } + ) + } + composable { + DatabaseScreen( + onBackClick = { navController.popBackStack() }, + appDatabase = appDatabase + ) + } + } + } + + if (showNavigationRail) { + Row( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .consumeWindowInsets(paddingValues) + ) { + NavigationRail( + modifier = Modifier + .fillMaxHeight() + .width(88.dp), + containerColor = MaterialTheme.colorScheme.surfaceContainer, + windowInsets = WindowInsets.safeDrawing.only(WindowInsetsSides.Start) + ) { + HomeDestination.entries.forEach { destination -> + val routeName = destination.route::class.qualifiedName + val isSelected = currentHierarchy.any { it.route == routeName } + NavigationRailItem( + selected = isSelected, + onClick = { + navController.navigate(destination.route) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + }, + icon = { + Icon( + imageVector = if (isSelected) destination.selectedIcon else destination.unselectedIcon, + contentDescription = stringResource(id = destination.labelRes) + ) + }, + label = { + Text( + text = stringResource(id = destination.labelRes), + style = MaterialTheme.typography.labelMedium + ) + }, + alwaysShowLabel = true, + colors = NavigationRailItemDefaults.colors( + selectedIconColor = MaterialTheme.colorScheme.onSecondaryContainer, + selectedTextColor = MaterialTheme.colorScheme.onSurface, + indicatorColor = MaterialTheme.colorScheme.secondaryContainer, + unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant, + unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant + ) + ) + } + } + + navHostContent(Modifier.weight(1f)) + } + } else { + navHostContent(navHostModifier) + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/navigation/HomeRoute.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/navigation/HomeRoute.kt new file mode 100644 index 000000000..015aa91b0 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/navigation/HomeRoute.kt @@ -0,0 +1,167 @@ +package com.celzero.bravedns.ui.compose.navigation + +import com.celzero.bravedns.util.Constants.Companion.UID_EVERYBODY +import kotlinx.serialization.Serializable +import com.celzero.bravedns.ui.compose.wireguard.WgType + +sealed interface HomeRoute { + + @Serializable + data object Home : HomeRoute + + @Serializable + data object Stats : HomeRoute + + @Serializable + data object Configure : HomeRoute + + @Serializable + data object About : HomeRoute + + @Serializable + data object Alerts : HomeRoute + + @Serializable + data object RpnCountries : HomeRoute + + @Serializable + data object RpnAvailability : HomeRoute + + @Serializable + data object Events : HomeRoute + + @Serializable + data class FirewallSettings(val focusKey: String = "") : HomeRoute + + @Serializable + data object AdvancedSettings : HomeRoute + + @Serializable + data object AntiCensorship : HomeRoute + + @Serializable + data class TunnelSettings(val focusKey: String = "") : HomeRoute + + @Serializable + data class MiscSettings(val focusKey: String = "") : HomeRoute + + @Serializable + data object ConsoleLogs : HomeRoute + + @Serializable + data object NetworkLogs : HomeRoute + + @Serializable + data object AppList : HomeRoute + + @Serializable + data class CustomRules( + val uid: Int = UID_EVERYBODY, + val tab: Int = CustomRulesTab.IP.value, + val mode: Int = CustomRulesMode.APP_SPECIFIC.value + ) : HomeRoute + + @Serializable + data class ProxySettings(val focusKey: String = "") : HomeRoute + + @Serializable + data object OrbotAppSelect : HomeRoute + + @Serializable + data object TcpProxyMain : HomeRoute + + @Serializable + data object Welcome : HomeRoute + + @Serializable + data object PingTest : HomeRoute + + @Serializable + data object AppLock : HomeRoute + + @Serializable + data class DnsDetail(val focusKey: String = "") : HomeRoute + + @Serializable + data class DetailedStats(val typeId: Int, val timeCategory: Int) : HomeRoute + + @Serializable + data class RpnWinProxyDetails(val countryCode: String) : HomeRoute + + @Serializable + data class DomainConnections( + val typeId: Int, + val flag: String, + val domain: String, + val asn: String, + val ip: String, + val isBlocked: Boolean, + val timeCategory: Int + ) : HomeRoute + + @Serializable + data class AppInfo(val uid: Int) : HomeRoute + + @Serializable + data class WgConfigDetail(val configId: Int, val wgType: WgType) : HomeRoute + + @Serializable + data class WgConfigEditor(val configId: Int, val wgType: WgType) : HomeRoute + + // We handle ConfigureRethinkBasic carefully as it uses an enum index + @Serializable + data class ConfigureRethinkBasic( + val screenTypeOrdinal: Int, + val remoteName: String = "", + val remoteUrl: String = "", + val uid: Int = -1 + ) : HomeRoute + + @Serializable + data object DnsList : HomeRoute + + @Serializable + data class AppWiseIpLogs(val uid: Int, val isAsn: Boolean) : HomeRoute + + @Serializable + data class ConfigureOtherDns(val dnsType: Int) : HomeRoute + + @Serializable + data object UniversalFirewallSettings : HomeRoute + + @Serializable + data class AppWiseDomainLogs(val uid: Int) : HomeRoute + + @Serializable + data object Checkout : HomeRoute + + @Serializable + data object WgMain : HomeRoute + + @Serializable + data object Database : HomeRoute +} + +@Serializable +enum class CustomRulesTab(val value: Int) { + IP(0), + DOMAIN(1); + + companion object { + fun fromValue(value: Int): CustomRulesTab { + return entries.firstOrNull { it.value == value } ?: IP + } + } +} + +@Serializable +enum class CustomRulesMode(val value: Int) { + ALL_RULES(0), + APP_SPECIFIC(1); + + companion object { + fun fromValue(value: Int): CustomRulesMode { + return entries.firstOrNull { it.value == value } ?: APP_SPECIFIC + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/proxy/TcpProxyMainScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/proxy/TcpProxyMainScreen.kt new file mode 100644 index 000000000..80d53c905 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/proxy/TcpProxyMainScreen.kt @@ -0,0 +1,289 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.proxy + +import android.widget.Toast +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Apps +import androidx.compose.material.icons.rounded.Settings +import androidx.compose.material.icons.rounded.VpnKey +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.lifecycle.asFlow +import com.celzero.bravedns.R +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.service.ProxyManager +import com.celzero.bravedns.service.TcpProxyHelper +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkAnimatedSection +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkTopBarLazyColumnScreen +import com.celzero.bravedns.ui.compose.theme.SectionHeaderWithSubtitle +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import com.celzero.bravedns.ui.dialog.WgIncludeAppsDialog +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.viewmodel.ProxyAppsMappingViewModel +import io.github.aakira.napier.Napier +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +private const val TAG = "TcpProxyMainScreen" + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun TcpProxyMainScreen( + appConfig: AppConfig, + mappingViewModel: ProxyAppsMappingViewModel, + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + + var tcpProxySwitchChecked by remember { mutableStateOf(false) } + var tcpProxyStatus by remember { mutableStateOf("") } + var tcpProxyDesc by remember { mutableStateOf("") } + var tcpErrorVisible by remember { mutableStateOf(false) } + var tcpErrorText by remember { mutableStateOf("") } + var enableUdpRelayChecked by remember { mutableStateOf(false) } + var warpSwitchChecked by remember { mutableStateOf(false) } + var showIncludeAppsDialog by remember { mutableStateOf(false) } + var includeAppsProxyId by remember { mutableStateOf("") } + var includeAppsProxyName by remember { mutableStateOf("") } + val tcpProxyDefaultDesc = stringResource(R.string.settings_https_desc) + val tcpProxyWarpActiveError = stringResource(R.string.tcp_proxy_warp_active_error) + val tcpProxyNoAppsError = stringResource(R.string.tcp_proxy_no_apps_error) + val tcpProxyDisabledDescription = stringResource(R.string.settings_https_desc) + val tcpProxyDisabledErrorTemplate = stringResource(R.string.settings_https_disabled_error) + val activeText = stringResource(R.string.lbl_active) + val inactiveText = stringResource(R.string.lbl_inactive) + val udpExperimentalDesc = stringResource(R.string.adv_set_experimental_desc) + val appsText = stringResource(R.string.lbl_apps) + + val appCount by mappingViewModel.getAppCountById(ProxyManager.ID_TCP_BASE) + .asFlow() + .collectAsState(initial = 0) + val appListSubtitleText = stringResource(R.string.add_remove_apps, appCount.toString()) + + LaunchedEffect(Unit) { + tcpProxyDesc = tcpProxyDefaultDesc + } + + LaunchedEffect(Unit) { + displayTcpProxyStatus( + onStatusUpdate = { status, switchChecked, errorVisible, errorText -> + tcpProxyStatus = status + tcpProxySwitchChecked = switchChecked + tcpErrorVisible = errorVisible + tcpErrorText = errorText + } + ) + } + + fun onTcpProxySwitchChanged(checked: Boolean) { + tcpProxySwitchChecked = checked + scope.launch(Dispatchers.IO) { + val isWarpActive = warpSwitchChecked + withContext(Dispatchers.Main) { + if (checked && isWarpActive) { + tcpProxySwitchChecked = false + Utilities.showToastUiCentered( + context, + tcpProxyWarpActiveError, + Toast.LENGTH_SHORT + ) + return@withContext + } + + val apps = ProxyManager.isAnyAppSelected(ProxyManager.ID_TCP_BASE) + + if (!apps) { + Utilities.showToastUiCentered( + context, + tcpProxyNoAppsError, + Toast.LENGTH_SHORT + ) + warpSwitchChecked = false + tcpProxySwitchChecked = false + return@withContext + } + + if (!checked) { + scope.launch(Dispatchers.IO) { TcpProxyHelper.disable() } + tcpProxyDesc = tcpProxyDisabledDescription + return@withContext + } + + if (appConfig.getBraveMode().isDnsMode()) { + tcpProxySwitchChecked = false + return@withContext + } + + if (!appConfig.canEnableTcpProxy()) { + val provider = appConfig.getProxyProvider().lowercase().replaceFirstChar(Char::titlecase) + Utilities.showToastUiCentered( + context, + String.format(tcpProxyDisabledErrorTemplate, provider), + Toast.LENGTH_SHORT + ) + tcpProxySwitchChecked = false + return@withContext + } + + scope.launch(Dispatchers.IO) { TcpProxyHelper.enable() } + } + } + } + + fun openAppsDialog() { + includeAppsProxyId = ProxyManager.ID_TCP_BASE + includeAppsProxyName = ProxyManager.TCP_PROXY_NAME + showIncludeAppsDialog = true + } + + if (showIncludeAppsDialog) { + WgIncludeAppsDialog( + viewModel = mappingViewModel, + proxyId = includeAppsProxyId, + proxyName = includeAppsProxyName, + onDismiss = { showIncludeAppsDialog = false } + ) + } + + val listState = rememberLazyListState() + val subtitle = if (tcpProxySwitchChecked) activeText else inactiveText + + RethinkTopBarLazyColumnScreen( + title = stringResource(id = R.string.settings_https_heading), + subtitle = subtitle, + onBackClick = onBackClick, + containerColor = MaterialTheme.colorScheme.surface, + listState = listState, + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingMd, + bottom = Dimensions.spacing3xl + ) + ) { + item { + RethinkAnimatedSection(index = 0) { + SectionHeaderWithSubtitle( + title = stringResource(id = R.string.tcp_proxy_rethink_proxy_title), + subtitle = stringResource(id = R.string.settings_https_desc) + ) + Column { + val entries = 3 + RethinkListItem( + headline = stringResource(id = R.string.tcp_proxy_rethink_proxy_title), + supporting = if (tcpErrorVisible) tcpErrorText else tcpProxyStatus.ifEmpty { tcpProxyDesc }, + leadingIcon = Icons.Rounded.VpnKey, + position = cardPositionFor(index = 0, lastIndex = entries - 1), + onClick = { onTcpProxySwitchChanged(!tcpProxySwitchChecked) }, + trailing = { + Switch( + checked = tcpProxySwitchChecked, + onCheckedChange = { onTcpProxySwitchChanged(it) } + ) + } + ) + + RethinkListItem( + headline = stringResource(id = R.string.tcp_proxy_enable_udp_relay), + supporting = udpExperimentalDesc, + leadingIcon = Icons.Rounded.Settings, + position = cardPositionFor(index = 1, lastIndex = entries - 1), + onClick = { enableUdpRelayChecked = !enableUdpRelayChecked }, + trailing = { + Switch( + checked = enableUdpRelayChecked, + onCheckedChange = { enableUdpRelayChecked = it } + ) + } + ) + + RethinkListItem( + headline = appsText, + supporting = appListSubtitleText, + leadingIcon = Icons.Rounded.Apps, + position = cardPositionFor(index = 2, lastIndex = entries - 1), + onClick = { openAppsDialog() } + ) + } + } + } + + item { + RethinkAnimatedSection(index = 1) { + SectionHeaderWithSubtitle( + title = stringResource(id = R.string.tcp_proxy_cloudflare_warp_title), + subtitle = stringResource(id = R.string.tcp_proxy_cloudflare_warp_desc) + ) + RethinkListItem( + headline = stringResource(id = R.string.tcp_proxy_cloudflare_warp_title), + supporting = stringResource(id = R.string.tcp_proxy_cloudflare_warp_desc), + leadingIcon = Icons.Rounded.VpnKey, + position = cardPositionFor(index = 0, lastIndex = 0), + onClick = { warpSwitchChecked = !warpSwitchChecked }, + trailing = { + Switch( + checked = warpSwitchChecked, + onCheckedChange = { warpSwitchChecked = it } + ) + } + ) + } + } + + item { + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + } + } +} + +private suspend fun displayTcpProxyStatus( + onStatusUpdate: (status: String, switchChecked: Boolean, errorVisible: Boolean, errorText: String) -> Unit +) { + withContext(Dispatchers.IO) { + val tcpProxies = TcpProxyHelper.getActiveTcpProxy() + withContext(Dispatchers.Main) { + if (tcpProxies == null || !tcpProxies.isActive) { + onStatusUpdate("Not active", false, true, "Something went wrong") + return@withContext + } + + Napier.i("$TAG displayTcpProxyUi: ${tcpProxies.name}, ${tcpProxies.url}") + onStatusUpdate("Active", true, false, "") + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/rpn/RpnAvailabilityScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/rpn/RpnAvailabilityScreen.kt new file mode 100644 index 000000000..7cf0dcf98 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/rpn/RpnAvailabilityScreen.kt @@ -0,0 +1,233 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.rpn + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.Card +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import io.github.aakira.napier.Napier +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RpnAvailabilityScreen(onBackClick: () -> Unit) { + var options by remember { mutableStateOf>(emptyList()) } + var items by remember { mutableStateOf>(emptyList()) } + var strength by remember { mutableStateOf(0) } + var maxStrength by remember { mutableStateOf(0) } + + LaunchedEffect(Unit) { + options = listOf("WIN-US", "WIN-UK", "WIN-IN", "WIN-DE", "WIN-CA") + maxStrength = options.size + items = options.map { RpnAvailabilityItem(it, RpnAvailabilityStatus.Loading) } + + options.forEach { option -> + items = + items.map { item -> + if (item.name == option) item.copy(status = RpnAvailabilityStatus.Loading) + else item + } + val res = withContext(Dispatchers.IO) { + false + } + if (res) { + strength += 1 + items = + items.map { item -> + if (item.name == option) item.copy(status = RpnAvailabilityStatus.Active) + else item + } + } else { + items = + items.map { item -> + if (item.name == option) item.copy(status = RpnAvailabilityStatus.Inactive) + else item + } + } + Napier.i("RpnAvailabilityScreen strength: $strength ($res)") + } + } + + val progress = if (maxStrength > 0) strength.toFloat() / maxStrength else 0f + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = stringResource(id = R.string.rpn_availability_title), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + Column( + modifier = + Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(paddingValues), + horizontalAlignment = Alignment.CenterHorizontally + ) { + androidx.compose.material3.Surface( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal, vertical = Dimensions.spacingSm), + shape = androidx.compose.foundation.shape.RoundedCornerShape(Dimensions.cardCornerRadiusLarge), + color = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 1.dp + ) { + Column(modifier = Modifier.padding(Dimensions.spacingLg)) { + Text( + text = stringResource(id = R.string.rpn_availability_title), + style = MaterialTheme.typography.titleMedium + ) + Text( + text = stringResource(id = R.string.rpn_availability_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal, vertical = Dimensions.spacingLg) + ) { + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + Box( + modifier = + Modifier + .fillMaxWidth() + .padding(vertical = 16.dp), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator( + progress = { progress }, + modifier = Modifier.size(120.dp), + strokeWidth = 8.dp + ) + Text( + text = "$strength/$maxStrength", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold + ) + } + Card(modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.fillMaxWidth()) { + items.forEachIndexed { index, item -> + AvailabilityRow(item) + if (index != items.lastIndex) { + HorizontalDivider() + } + } + } + } + } + } + } +} + +@Composable +private fun AvailabilityRow(item: RpnAvailabilityItem) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + Text( + text = item.name, + style = MaterialTheme.typography.bodyMedium + ) + when (item.status) { + RpnAvailabilityStatus.Loading -> { + CircularProgressIndicator( + modifier = Modifier.size(20.dp), + strokeWidth = 2.dp + ) + } + + RpnAvailabilityStatus.Active -> { + Text( + text = stringResource(id = R.string.lbl_active), + color = MaterialTheme.colorScheme.primary, + style = MaterialTheme.typography.bodyMedium + ) + } + + RpnAvailabilityStatus.Inactive -> { + Text( + text = stringResource(id = R.string.lbl_inactive), + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodyMedium + ) + } + } + } +} + +private data class RpnAvailabilityItem( + val name: String, + val status: RpnAvailabilityStatus +) + +private enum class RpnAvailabilityStatus { + Loading, + Active, + Inactive +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/rpn/RpnCountriesScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/rpn/RpnCountriesScreen.kt new file mode 100644 index 000000000..c879628a4 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/rpn/RpnCountriesScreen.kt @@ -0,0 +1,148 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.rpn + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.CountryRow +import com.celzero.bravedns.rpnproxy.RpnProxyManager +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RpnCountriesScreen(onBackClick: () -> Unit) { + var countries by remember { mutableStateOf>(emptyList()) } + var selectedCountries by remember { mutableStateOf>(emptySet()) } + var showNoCountriesDialog by remember { mutableStateOf(false) } + + LaunchedEffect(Unit) { + val result = + withContext(Dispatchers.IO) { + val servers = runCatching { RpnProxyManager.getWinServers() }.getOrDefault(emptyList()) + val selected = runCatching { RpnProxyManager.getSelectedCCs() }.getOrDefault(emptySet()) + val serverCountries = + servers + .map { it.countryCode.uppercase() } + .filter { it.isNotBlank() } + .distinct() + .sorted() + Pair(serverCountries, selected.map { it.uppercase() }.toSet()) + } + + countries = result.first + selectedCountries = result.second + if (countries.isEmpty()) { + showNoCountriesDialog = true + } + } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = stringResource(id = R.string.lbl_countries), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + Column( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues) + ) { + if (showNoCountriesDialog) { + RethinkConfirmDialog( + onDismissRequest = {}, + title = stringResource(id = R.string.rpn_no_countries_title), + message = stringResource(id = R.string.rpn_no_countries_desc), + confirmText = stringResource(id = R.string.dns_info_positive), + onConfirm = onBackClick + ) + } + androidx.compose.material3.Surface( + modifier = Modifier.padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingSm + ), + shape = androidx.compose.foundation.shape.RoundedCornerShape(Dimensions.cardCornerRadiusLarge), + color = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 1.dp + ) { + Column(modifier = Modifier.padding(Dimensions.spacingLg)) { + Text( + text = stringResource(id = R.string.lbl_countries), + style = MaterialTheme.typography.titleMedium + ) + Text( + text = stringResource(id = R.string.rpn_availability_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + CountriesList( + countries = countries, + selectedCountries = selectedCountries, + modifier = Modifier.padding(horizontal = Dimensions.screenPaddingHorizontal) + ) + } + } +} + +@Composable +private fun CountriesList( + countries: List, + selectedCountries: Set, + modifier: Modifier = Modifier +) { + LazyColumn(modifier = modifier.fillMaxSize()) { + items(countries.size) { index -> + val country = countries[index] + CountryRow(country, selectedCountries.contains(country)) + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AdvancedSettingsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AdvancedSettingsScreen.kt new file mode 100644 index 000000000..6bb2677cc --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AdvancedSettingsScreen.kt @@ -0,0 +1,165 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.settings + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Build +import androidx.compose.material.icons.filled.Tune +import androidx.compose.material.icons.filled.Warning +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Switch +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.res.stringResource +import com.celzero.bravedns.R +import com.celzero.bravedns.RethinkDnsApplication.Companion.DEBUG +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkAnimatedSection +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.cardPositionFor + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AdvancedSettingsScreen( + persistentState: PersistentState, + onBackClick: (() -> Unit)? = null +) { + if (!DEBUG) { + return + } + + var experimentalEnabled by remember { mutableStateOf(persistentState.nwEngExperimentalFeatures) } + var autoDialEnabled by remember { mutableStateOf(persistentState.autoDialsParallel) } + var panicEnabled by remember { mutableStateOf(persistentState.panicRandom) } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + containerColor = MaterialTheme.colorScheme.surface, + topBar = { + RethinkLargeTopBar( + title = stringResource(id = R.string.lbl_advanced), + subtitle = stringResource(id = R.string.adv_set_experimental_desc), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + } + ) { padding -> + LazyColumn( + modifier = + Modifier + .padding(padding) + .fillMaxSize(), + contentPadding = + PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingMd, + bottom = Dimensions.spacing3xl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + item { + RethinkAnimatedSection(index = 0) { + Column { + val entries = 3 + RethinkListItem( + headline = stringResource(id = R.string.adv_set_experimental_title), + leadingIcon = Icons.Filled.Build, + position = cardPositionFor(index = 0, lastIndex = entries - 1), + onClick = { + experimentalEnabled = !experimentalEnabled + persistentState.nwEngExperimentalFeatures = experimentalEnabled + }, + trailing = { + Switch( + checked = experimentalEnabled, + onCheckedChange = { + experimentalEnabled = it + persistentState.nwEngExperimentalFeatures = it + } + ) + } + ) + + RethinkListItem( + headline = stringResource(id = R.string.set_auto_dial_title), + supporting = stringResource(id = R.string.set_auto_dial_desc), + leadingIcon = Icons.Filled.Tune, + position = cardPositionFor(index = 1, lastIndex = entries - 1), + onClick = { + autoDialEnabled = !autoDialEnabled + persistentState.autoDialsParallel = autoDialEnabled + }, + trailing = { + Switch( + checked = autoDialEnabled, + onCheckedChange = { + autoDialEnabled = it + persistentState.autoDialsParallel = it + } + ) + } + ) + + RethinkListItem( + headline = "Random panic", + supporting = "Debug-only chaos mode for tunnel reliability testing.", + leadingIcon = Icons.Filled.Warning, + position = cardPositionFor(index = 2, lastIndex = entries - 1), + onClick = { + panicEnabled = !panicEnabled + persistentState.panicRandom = panicEnabled + }, + trailing = { + Switch( + checked = panicEnabled, + onCheckedChange = { + panicEnabled = it + persistentState.panicRandom = it + } + ) + } + ) + } + } + } + + item { + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AntiCensorshipScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AntiCensorshipScreen.kt new file mode 100644 index 000000000..e20ecc8b7 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AntiCensorshipScreen.kt @@ -0,0 +1,287 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.settings + +import android.widget.Toast +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.offset +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import com.celzero.bravedns.R +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkTopBarLazyColumnScreen +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.isOsVersionAbove412 +import com.celzero.firestack.settings.Settings + +private const val DESYNC_SUPPORTED_VERSION = "4.12" + +enum class DialStrategies(val mode: Int) { + SPLIT_AUTO(Settings.SplitAuto), + SPLIT_TCP(Settings.SplitTCP), + SPLIT_TCP_TLS(Settings.SplitTCPOrTLS), + DESYNC(Settings.SplitDesync), + NEVER_SPLIT(Settings.SplitNever), + TCP_PROXY(Settings.SplitAuto); + + companion object { + fun fromInt(value: Int): DialStrategies? = entries.firstOrNull { it.mode == value } + } +} + +enum class RetryStrategies(val mode: Int) { + RETRY_WITH_SPLIT(Settings.RetryWithSplit), + RETRY_NEVER(Settings.RetryNever), + RETRY_AFTER_SPLIT(Settings.RetryAfterSplit); + + companion object { + fun fromInt(value: Int): RetryStrategies? = entries.firstOrNull { it.mode == value } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AntiCensorshipScreen( + persistentState: PersistentState, + eventLogger: EventLogger, + onBackClick: (() -> Unit)? = null +) { + val desyncSupported = remember { isOsVersionAbove412(DESYNC_SUPPORTED_VERSION) } + + val initialDial = remember { + val base = DialStrategies.fromInt(persistentState.dialStrategy) ?: DialStrategies.SPLIT_AUTO + val resolved = if (base == DialStrategies.SPLIT_AUTO && persistentState.autoProxyEnabled) { + DialStrategies.TCP_PROXY + } else { + base + } + if (!desyncSupported && resolved == DialStrategies.DESYNC) { + persistentState.dialStrategy = DialStrategies.SPLIT_AUTO.mode + DialStrategies.SPLIT_AUTO + } else { + resolved + } + } + + val initialRetry = remember { + RetryStrategies.fromInt(persistentState.retryStrategy) ?: RetryStrategies.RETRY_WITH_SPLIT + } + + var dialSelection by remember { mutableStateOf(initialDial) } + var retrySelection by remember { mutableStateOf(initialRetry) } + val context = LocalContext.current + val retryDisabledToast = stringResource(id = R.string.ac_toast_retry_disabled) + + val selectedDialLabel = + stringResource( + when (dialSelection) { + DialStrategies.NEVER_SPLIT -> R.string.settings_app_list_default_app + DialStrategies.SPLIT_AUTO -> R.string.settings_ip_text_ipv46 + DialStrategies.SPLIT_TCP -> R.string.ac_split_tcp + DialStrategies.SPLIT_TCP_TLS -> R.string.ac_split_tls + DialStrategies.DESYNC -> R.string.ac_desync + DialStrategies.TCP_PROXY -> R.string.ac_tcp_proxy + } + ) + val selectedRetryLabel = + stringResource( + when (retrySelection) { + RetryStrategies.RETRY_NEVER -> R.string.settings_app_list_default_app + RetryStrategies.RETRY_WITH_SPLIT -> R.string.settings_ip_text_ipv46 + RetryStrategies.RETRY_AFTER_SPLIT -> R.string.lbl_always + } + ) + val topBarSubtitle = + "${stringResource(R.string.lbl_split)}: $selectedDialLabel · " + + "${stringResource(R.string.ac_retry_options_title)}: $selectedRetryLabel" + + RethinkTopBarLazyColumnScreen( + title = stringResource(R.string.anti_censorship_title), + subtitle = topBarSubtitle, + onBackClick = onBackClick, + containerColor = MaterialTheme.colorScheme.background, + topBarContainerColor = Color.Transparent, + topBarScrolledContainerColor = Color.Transparent + ) { + item { + RethinkListGroup { + val validStrategies = + DialStrategies.entries.filter { desyncSupported || it != DialStrategies.DESYNC } + validStrategies.forEachIndexed { index, strategy -> + val titleRes = when (strategy) { + DialStrategies.NEVER_SPLIT -> R.string.settings_app_list_default_app + DialStrategies.SPLIT_AUTO -> R.string.settings_ip_text_ipv46 + DialStrategies.SPLIT_TCP -> R.string.ac_split_tcp + DialStrategies.SPLIT_TCP_TLS -> R.string.ac_split_tls + DialStrategies.DESYNC -> R.string.ac_desync + DialStrategies.TCP_PROXY -> R.string.ac_tcp_proxy + } + val descRes = when (strategy) { + DialStrategies.NEVER_SPLIT -> R.string.ac_never_split_desc + DialStrategies.SPLIT_AUTO -> R.string.ac_split_auto_desc + DialStrategies.SPLIT_TCP -> R.string.ac_split_tcp_desc + DialStrategies.SPLIT_TCP_TLS -> R.string.ac_split_tls_desc + DialStrategies.DESYNC -> R.string.ac_desync_desc + DialStrategies.TCP_PROXY -> R.string.ac_tcp_proxy_desc + } + val position = when { + validStrategies.size == 1 -> CardPosition.Single + index == 0 -> CardPosition.First + index == validStrategies.size - 1 -> CardPosition.Last + else -> CardPosition.Middle + } + + RethinkListItem( + headline = stringResource(titleRes), + supporting = stringResource(descRes), + position = position, + contentOffset = Modifier.offset(x = (-Dimensions.spacingXs)), + onClick = { + if (dialSelection != strategy) { + dialSelection = strategy + persistentState.dialStrategy = strategy.mode + persistentState.autoProxyEnabled = strategy == DialStrategies.TCP_PROXY + val nextRetry = + when (strategy) { + DialStrategies.NEVER_SPLIT -> RetryStrategies.RETRY_NEVER + DialStrategies.SPLIT_AUTO, DialStrategies.TCP_PROXY -> RetryStrategies.RETRY_WITH_SPLIT + else -> RetryStrategies.fromInt(persistentState.retryStrategy) + ?: RetryStrategies.RETRY_WITH_SPLIT + } + persistentState.retryStrategy = nextRetry.mode + retrySelection = nextRetry + eventLogger.log( + EventType.UI_TOGGLE, + Severity.LOW, + "Anti-censorship UI", + EventSource.UI, + false, + "Anti-censorship dial strategy changed to ${strategy.mode}" + ) + } + }, + trailing = { + RadioButton( + selected = dialSelection == strategy, + onClick = null + ) + } + ) + } + } + } + + item { + SectionHeader(title = stringResource(R.string.ac_retry_options_title)) + Text( + text = stringResource(R.string.ac_retry_options_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(horizontal = Dimensions.spacingMd, vertical = Dimensions.spacingXs) + ) + + RethinkListGroup { + val strategies = RetryStrategies.entries + strategies.forEachIndexed { index, strategy -> + val titleRes = when (strategy) { + RetryStrategies.RETRY_NEVER -> R.string.settings_app_list_default_app + RetryStrategies.RETRY_WITH_SPLIT -> R.string.settings_ip_text_ipv46 + RetryStrategies.RETRY_AFTER_SPLIT -> R.string.lbl_always + } + val descRes = when (strategy) { + RetryStrategies.RETRY_NEVER -> R.string.ac_retry_options_never_desc + RetryStrategies.RETRY_WITH_SPLIT -> R.string.ac_retry_options_with_split_desc + RetryStrategies.RETRY_AFTER_SPLIT -> R.string.ac_retry_options_after_split_desc + } + val enabled = + dialSelection != DialStrategies.NEVER_SPLIT || + strategy == RetryStrategies.RETRY_NEVER + + val position = when { + strategies.size == 1 -> CardPosition.Single + index == 0 -> CardPosition.First + index == strategies.size - 1 -> CardPosition.Last + else -> CardPosition.Middle + } + + RethinkListItem( + headline = stringResource(titleRes), + supporting = stringResource(descRes), + position = position, + enabled = enabled, + contentOffset = Modifier.offset(x = (-Dimensions.spacingXs)), + onClick = { + if (!enabled) { + Utilities.showToastUiCentered( + context, + retryDisabledToast, + Toast.LENGTH_LONG + ) + return@RethinkListItem + } + if (retrySelection != strategy) { + var mode = strategy.mode + if ( + DialStrategies.NEVER_SPLIT.mode == persistentState.dialStrategy && + strategy != RetryStrategies.RETRY_NEVER + ) { + mode = RetryStrategies.RETRY_NEVER.mode + } + persistentState.retryStrategy = mode + retrySelection = strategy + eventLogger.log( + EventType.UI_TOGGLE, + Severity.LOW, + "Anti-censorship UI", + EventSource.UI, + false, + "Anti-censorship retry strategy changed to $mode" + ) + } + }, + trailing = { + RadioButton( + selected = retrySelection == strategy, + onClick = null, + enabled = enabled + ) + } + ) + } + } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AppLockScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AppLockScreen.kt new file mode 100644 index 000000000..c47c9eada --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AppLockScreen.kt @@ -0,0 +1,295 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.settings + +import android.app.UiModeManager +import android.content.Context +import android.content.res.Configuration +import android.os.SystemClock +import android.widget.Toast +import androidx.biometric.BiometricManager +import androidx.biometric.BiometricPrompt +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.core.content.ContextCompat +import androidx.fragment.app.FragmentActivity +import com.celzero.bravedns.R +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.util.BioMetricType +import com.celzero.bravedns.util.Utilities.showToastUiCentered +import io.github.aakira.napier.Napier +import java.util.concurrent.TimeUnit +import kotlin.math.abs + +private const val TAG = "AppLockScreen" + +/** + * Result of the app lock authentication check. + */ +sealed interface AppLockResult { + /** Authentication succeeded - proceed to home */ + data object Success : AppLockResult + /** Authentication failed or was cancelled - finish the app */ + data object Failure : AppLockResult + /** Biometric authentication is not needed (disabled, TV, or within timeout) */ + data object NotRequired : AppLockResult + /** Waiting for user to complete biometric prompt */ + data object Pending : AppLockResult +} + +/** + * App lock screen that handles biometric/PIN authentication before allowing access to the app. + * + * This screen displays the app logo while the biometric prompt is shown. It handles: + * - Checking if biometric authentication is enabled + * - Checking if the app is running on TV (biometric not supported) + * - Checking if the authentication timeout has not expired + * - Showing the biometric prompt and handling callbacks + * + * @param persistentState The persistent state containing biometric settings + * @param onAuthResult Callback invoked when authentication completes with the result + */ +@Composable +fun AppLockScreen( + persistentState: PersistentState, + onAuthResult: (AppLockResult) -> Unit +) { + val context = LocalContext.current + val appName = stringResource(R.string.app_name) + val biometricTitle = stringResource(R.string.hs_biometeric_title) + val biometricDesc = stringResource(R.string.hs_biometeric_desc) + + var authState by remember { mutableStateOf(AppLockResult.Pending) } + var biometricPrompt by remember { mutableStateOf(null) } + + // Check if authentication is required + LaunchedEffect(Unit) { + val isRequired = checkBiometricRequired(context, persistentState) + if (!isRequired) { + Napier.v("$TAG biometric authentication not required") + authState = AppLockResult.NotRequired + onAuthResult(AppLockResult.NotRequired) + } + } + + // Set up biometric prompt when the composable is first composed + DisposableEffect(context) { + val activity = context as? FragmentActivity + if (activity != null && authState == AppLockResult.Pending) { + val shouldShow = checkBiometricRequired(context, persistentState) + if (shouldShow) { + val executor = ContextCompat.getMainExecutor(context) + val callback = object : BiometricPrompt.AuthenticationCallback() { + override fun onAuthenticationError(errorCode: Int, errString: CharSequence) { + super.onAuthenticationError(errorCode, errString) + Napier.i("$TAG auth error(code: $errorCode): $errString") + showToastUiCentered(context, errString.toString(), Toast.LENGTH_SHORT) + authState = AppLockResult.Failure + onAuthResult(AppLockResult.Failure) + } + + override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) { + super.onAuthenticationSucceeded(result) + Napier.v("$TAG biometric authentication succeeded") + persistentState.biometricAuthTime = SystemClock.elapsedRealtime() + authState = AppLockResult.Success + onAuthResult(AppLockResult.Success) + } + + override fun onAuthenticationFailed() { + super.onAuthenticationFailed() + Napier.i("$TAG biometric authentication failed") + // Don't change state here - user can retry + } + } + + biometricPrompt = BiometricPrompt(activity, executor, callback) + + val promptInfo = BiometricPrompt.PromptInfo.Builder() + .setTitle(biometricTitle) + .setSubtitle(biometricDesc) + .setAllowedAuthenticators( + BiometricManager.Authenticators.BIOMETRIC_WEAK or + BiometricManager.Authenticators.DEVICE_CREDENTIAL + ) + .setConfirmationRequired(false) + .build() + + Napier.v("$TAG showing biometric prompt") + biometricPrompt?.authenticate(promptInfo) + } + } + + onDispose { + biometricPrompt?.cancelAuthentication() + } + } + + // UI: Simple screen with app logo + AppLockContent( + appName = appName, + title = biometricTitle, + subtitle = biometricDesc + ) +} + +/** + * The visual content of the app lock screen - displays the app logo centered on a background. + */ +@Composable +private fun AppLockContent( + appName: String, + title: String, + subtitle: String +) { + Box( + modifier = Modifier + .fillMaxSize() + .background(MaterialTheme.colorScheme.background), + ) { + Column(modifier = Modifier.fillMaxSize()) { + Text( + text = title, + style = MaterialTheme.typography.titleLarge, + modifier = Modifier + .padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingMd + ) + ) + Text( + text = subtitle, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier + .padding(horizontal = Dimensions.screenPaddingHorizontal) + ) + + Box( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + contentAlignment = Alignment.Center + ) { + Surface( + shape = androidx.compose.foundation.shape.RoundedCornerShape(Dimensions.cornerRadius5xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 1.dp + ) { + Column( + modifier = Modifier.padding(horizontal = Dimensions.spacing2xl, vertical = Dimensions.spacing2xl), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Image( + painter = painterResource(id = R.drawable.ic_launcher), + contentDescription = appName, + modifier = Modifier.size(120.dp) + ) + Spacer(modifier = Modifier.height(12.dp)) + Text( + text = appName, + style = MaterialTheme.typography.titleLarge + ) + } + } + } + } + } +} + +/** + * Checks if biometric authentication is required. + * + * Authentication is NOT required if: + * - Biometric is disabled in settings + * - App is running on TV + * - The configured timeout has not expired since last authentication + * + * @return true if biometric prompt should be shown, false otherwise + */ +private fun checkBiometricRequired( + context: Context, + persistentState: PersistentState +): Boolean { + // Check if biometric is enabled + val bioMetricType = BioMetricType.fromValue(persistentState.biometricAuthType) + if (!bioMetricType.enabled()) { + Napier.v("$TAG biometric authentication disabled") + return false + } + + // Check if running on TV + if (isAppRunningOnTv(context)) { + Napier.v("$TAG running on TV, biometric not supported") + return false + } + + // Check timeout + val lastAuthTime = persistentState.biometricAuthTime + var delay = bioMetricType.mins + + // Default to 15 minutes if delay is invalid + delay = if (delay == -1L) { + BioMetricType.FIFTEEN_MIN.mins + } else { + delay + } + + Napier.d("$TAG timeout: $delay, last auth: $lastAuthTime") + val timeSinceLastAuth = abs(SystemClock.elapsedRealtime() - lastAuthTime) + if (timeSinceLastAuth < TimeUnit.MINUTES.toMillis(delay)) { + Napier.i("$TAG biometric auth skipped, time since last auth: $timeSinceLastAuth") + return false + } + + return true +} + +/** + * Checks if the app is running on a TV device. + */ +private fun isAppRunningOnTv(context: Context): Boolean { + return try { + val uiModeManager = context.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager + uiModeManager.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION + } catch (_: Exception) { + false + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AppearanceSettingsCard.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AppearanceSettingsCard.kt new file mode 100644 index 000000000..133b67b8b --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/AppearanceSettingsCard.kt @@ -0,0 +1,437 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.settings + +import android.os.Build +import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.animation.core.tween +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.indication +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.rounded.BrightnessAuto +import androidx.compose.material.icons.rounded.DarkMode +import androidx.compose.material.icons.rounded.LightMode +import androidx.compose.material.icons.rounded.Palette +import androidx.compose.material3.ButtonGroupDefaults +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.ToggleButton +import androidx.compose.material3.ToggleButtonDefaults +import androidx.compose.material3.ripple +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.selected +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.RethinkColorPreset +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.ui.compose.theme.rememberReducedMotion +import com.celzero.bravedns.util.Themes + +enum class AppearanceMode { + AUTO, + LIGHT, + DARK; + + fun toThemePreference(): Int { + return when (this) { + AUTO -> Themes.SYSTEM_DEFAULT.id + LIGHT -> Themes.LIGHT_PLUS.id + DARK -> Themes.DARK_PLUS.id + } + } + + fun icon(): ImageVector { + return when (this) { + AUTO -> Icons.Rounded.BrightnessAuto + LIGHT -> Icons.Rounded.LightMode + DARK -> Icons.Rounded.DarkMode + } + } + + companion object { + fun fromThemePreference(preference: Int): AppearanceMode { + return when (preference) { + Themes.SYSTEM_DEFAULT.id -> AUTO + Themes.LIGHT.id, Themes.LIGHT_PLUS.id -> LIGHT + else -> DARK + } + } + } +} + +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +fun AppearanceSettingsCard( + themePreference: Int, + colorPresetId: Int, + onAppearanceModeSelected: (AppearanceMode) -> Unit, + onColorPresetSelected: (RethinkColorPreset) -> Unit, + sectionHeaderColor: Color = MaterialTheme.colorScheme.onSurfaceVariant, + showSectionHeader: Boolean = true +) { + var appearanceMode by remember(themePreference) { + mutableStateOf(AppearanceMode.fromThemePreference(themePreference)) + } + var colorPreset by remember(colorPresetId) { + mutableStateOf( + RethinkColorPreset.fromId(colorPresetId).let { + if (it == RethinkColorPreset.AUTO) RethinkColorPreset.DYNAMIC else it + } + ) + } + + val dynamicSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S + val context = LocalContext.current + val systemDarkMode = isSystemInDarkTheme() + val dynamicSwatchColor = remember(dynamicSupported, systemDarkMode, context) { + if (!dynamicSupported) { + Color(0xff7C8BFF) + } else { + if (systemDarkMode) androidx.compose.material3.dynamicDarkColorScheme(context).primary + else androidx.compose.material3.dynamicLightColorScheme(context).primary + } + } + val dynamicPreviewColor = dynamicSwatchColor + val selectableColorPresets = remember { + listOf( + RethinkColorPreset.DYNAMIC, + RethinkColorPreset.CORAL, + RethinkColorPreset.ROSE, + RethinkColorPreset.ORANGE, + RethinkColorPreset.AMBER, + RethinkColorPreset.GREEN, + RethinkColorPreset.TEAL, + RethinkColorPreset.CYAN, + RethinkColorPreset.BLUE, + RethinkColorPreset.INDIGO, + RethinkColorPreset.PURPLE + ) + } + + Column { + if (showSectionHeader) { + SectionHeader( + title = stringResource(R.string.settings_theme_heading), + color = sectionHeaderColor + ) + } + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 4.dp) + ) { + val modeOptions = listOf( + Triple(AppearanceMode.AUTO, AppearanceMode.AUTO.toDisplayName(), AppearanceMode.AUTO.icon()), + Triple(AppearanceMode.LIGHT, AppearanceMode.LIGHT.toDisplayName(), AppearanceMode.LIGHT.icon()), + Triple(AppearanceMode.DARK, AppearanceMode.DARK.toDisplayName(), AppearanceMode.DARK.icon()) + ) + val selectedIndex = modeOptions.indexOfFirst { it.first == appearanceMode } + + FlowRow( + modifier = Modifier + .fillMaxWidth() + .padding(top = 0.dp, bottom = 2.dp), + horizontalArrangement = + Arrangement.spacedBy(ButtonGroupDefaults.ConnectedSpaceBetween), + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + modeOptions.forEachIndexed { index, (mode, label, icon) -> + val selected = index == selectedIndex + ToggleButton( + checked = selected, + onCheckedChange = { isChecked -> + if (isChecked && appearanceMode != mode) { + appearanceMode = mode + onAppearanceModeSelected(mode) + } + }, + shapes = + when (index) { + 0 -> ButtonGroupDefaults.connectedLeadingButtonShapes() + modeOptions.lastIndex -> ButtonGroupDefaults.connectedTrailingButtonShapes() + else -> ButtonGroupDefaults.connectedMiddleButtonShapes() + }, + colors = ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.primaryContainer, + checkedContentColor = MaterialTheme.colorScheme.onPrimaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerLow, + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + modifier = Modifier.semantics { role = Role.RadioButton } + ) { + Icon( + imageVector = if (selected) Icons.Filled.Check else icon, + contentDescription = null, + modifier = Modifier.size(ToggleButtonDefaults.IconSize) + ) + Spacer(modifier = Modifier.size(ToggleButtonDefaults.IconSpacing)) + Text( + text = label, + style = MaterialTheme.typography.labelLarge + ) + } + } + } + } + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(start = 8.dp, end = 8.dp, top = 6.dp, bottom = 0.dp) + ) { + FlowRow( + modifier = Modifier + .fillMaxWidth() + .padding(top = 2.dp, bottom = 0.dp), + horizontalArrangement = Arrangement.spacedBy(0.dp, Alignment.CenterHorizontally), + verticalArrangement = Arrangement.spacedBy(0.dp) + ) { + selectableColorPresets.forEach { preset -> + ThemeColorSwatch( + preset = preset, + isSelected = preset == colorPreset, + isEnabled = preset != RethinkColorPreset.DYNAMIC || dynamicSupported, + dynamicColor = dynamicPreviewColor, + onClick = { + if (preset == colorPreset) return@ThemeColorSwatch + colorPreset = preset + onColorPresetSelected(preset) + } + ) + } + } + + if (!dynamicSupported) { + Text( + text = stringResource(id = R.string.settings_theme_color_dynamic_unavailable), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + modifier = Modifier + .fillMaxWidth() + .padding(top = 8.dp) + ) + } + } + } +} + +@Composable +private fun ThemeColorSwatch( + preset: RethinkColorPreset, + isSelected: Boolean, + isEnabled: Boolean, + dynamicColor: Color, + onClick: () -> Unit +) { + val reducedMotion = rememberReducedMotion() + val pickerPreset = preset.forPicker() + val baseColor = when (pickerPreset) { + RethinkColorPreset.DYNAMIC -> dynamicColor + else -> pickerPreset.seedColor ?: dynamicColor + } + val displayColor = if (isEnabled) baseColor else baseColor.copy(alpha = 0.42f) + val tokenSize = 50.dp + val glowSize = 56.dp + val orbSize = 40.dp + val overallAlpha = if (isEnabled) 1f else 0.52f + val interactionSource = remember { MutableInteractionSource() } + val swatchDescription = pickerPreset.toDisplayName() + + val cornerFraction by animateFloatAsState( + targetValue = if (isSelected) 0.5f else 0.26f, + animationSpec = if (reducedMotion) tween(durationMillis = 0) else spring(dampingRatio = 0.7f, stiffness = 520f), + label = "swatch_corner_${preset.id}" + ) + val orbScale by animateFloatAsState( + targetValue = if (isSelected) 1.02f else 0.86f, + animationSpec = if (reducedMotion) tween(durationMillis = 0) else spring(dampingRatio = 0.56f, stiffness = 600f), + label = "swatch_scale_${preset.id}" + ) + val orbRotation by animateFloatAsState( + targetValue = if (isSelected && !reducedMotion) 8f else 0f, + animationSpec = if (reducedMotion) tween(durationMillis = 0) else spring(dampingRatio = 0.66f, stiffness = 420f), + label = "swatch_rotation_${preset.id}" + ) + val glowAlpha by animateFloatAsState( + targetValue = if (isSelected) 1f else 0f, + animationSpec = if (reducedMotion) tween(durationMillis = 0) else tween(durationMillis = 240, easing = FastOutSlowInEasing), + label = "swatch_glow_${preset.id}" + ) + val iconAlpha by animateFloatAsState( + targetValue = if (isSelected) 1f else 0f, + animationSpec = if (reducedMotion) tween(durationMillis = 0) else tween(durationMillis = 180, easing = FastOutSlowInEasing), + label = "swatch_icon_${preset.id}" + ) + val orbShape = RoundedCornerShape(percent = (cornerFraction * 100).toInt()) + + Box( + modifier = Modifier + .size(tokenSize) + .graphicsLayer { alpha = overallAlpha } + .clickable( + enabled = isEnabled, + interactionSource = interactionSource, + indication = null, + onClick = onClick + ) + .semantics { + role = Role.RadioButton + selected = isSelected + contentDescription = swatchDescription + }, + contentAlignment = Alignment.Center + ) { + Box( + modifier = Modifier + .size(glowSize) + .graphicsLayer { alpha = glowAlpha } + .drawBehind { + drawCircle( + color = displayColor.copy(alpha = 0.44f), + radius = size.minDimension * 0.5f + ) + } + ) + + Box( + modifier = Modifier + .size(orbSize) + .graphicsLayer { + scaleX = orbScale + scaleY = orbScale + rotationZ = orbRotation + } + .clip(orbShape) + .indication( + interactionSource = interactionSource, + indication = ripple( + bounded = true, + radius = 18.dp, + color = Color.White.copy(alpha = 0.32f) + ) + ) + .background(displayColor), + contentAlignment = Alignment.Center + ) { + Box( + modifier = Modifier + .fillMaxSize() + .background( + brush = Brush.linearGradient( + colors = listOf(Color.White.copy(alpha = 0.28f), Color.Transparent), + start = Offset.Zero, + end = Offset(60f, 60f) + ) + ) + ) + + when { + isSelected -> { + Icon( + imageVector = Icons.Filled.Check, + contentDescription = null, + modifier = Modifier + .size(18.dp) + .graphicsLayer { + alpha = iconAlpha + rotationZ = -orbRotation + }, + tint = Color.White + ) + } + pickerPreset == RethinkColorPreset.DYNAMIC -> { + Icon( + imageVector = Icons.Rounded.Palette, + contentDescription = null, + modifier = Modifier.size(16.dp), + tint = Color.White.copy(alpha = 0.88f) + ) + } + } + } + } +} + +@Composable +private fun AppearanceMode.toDisplayName(): String { + return when (this) { + AppearanceMode.AUTO -> stringResource(id = R.string.settings_theme_dialog_themes_1) + AppearanceMode.LIGHT -> stringResource(id = R.string.settings_theme_dialog_themes_2) + AppearanceMode.DARK -> stringResource(id = R.string.settings_theme_dialog_themes_3) + } +} + +private fun RethinkColorPreset.forPicker(): RethinkColorPreset { + return if (this == RethinkColorPreset.AUTO) RethinkColorPreset.DYNAMIC else this +} + +@Composable +private fun RethinkColorPreset.toDisplayName(): String { + return when (forPicker()) { + RethinkColorPreset.DYNAMIC -> stringResource(id = R.string.settings_theme_color_dynamic) + RethinkColorPreset.CORAL -> stringResource(id = R.string.settings_theme_color_coral) + RethinkColorPreset.ROSE -> stringResource(id = R.string.settings_theme_color_rose) + RethinkColorPreset.TEAL -> stringResource(id = R.string.settings_theme_color_teal) + RethinkColorPreset.BLUE -> stringResource(id = R.string.settings_theme_color_blue) + RethinkColorPreset.PURPLE -> stringResource(id = R.string.settings_theme_color_purple) + RethinkColorPreset.ORANGE -> stringResource(id = R.string.settings_theme_color_orange) + RethinkColorPreset.GREEN -> stringResource(id = R.string.settings_theme_color_green) + RethinkColorPreset.AMBER -> stringResource(id = R.string.settings_theme_color_amber) + RethinkColorPreset.CYAN -> stringResource(id = R.string.settings_theme_color_cyan) + RethinkColorPreset.INDIGO -> stringResource(id = R.string.settings_theme_color_indigo) + else -> stringResource(id = R.string.settings_theme_color_dynamic) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/settings/CheckoutScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/CheckoutScreen.kt new file mode 100644 index 000000000..88d9b394d --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/CheckoutScreen.kt @@ -0,0 +1,368 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.settings + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.withStyle +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.service.TcpProxyHelper +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.RadioButtonChecked +import androidx.compose.material.icons.rounded.RadioButtonUnchecked +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.SectionHeader + +enum class CheckoutPlan(val titleRes: Int, val subtitleRes: Int) { + ONE_MONTH(R.string.checkout_plan_1m_title, R.string.checkout_plan_1m_subtitle), + THREE_MONTH(R.string.checkout_plan_3m_title, R.string.checkout_plan_3m_subtitle), + SIX_MONTH(R.string.checkout_plan_6m_title, R.string.checkout_plan_6m_subtitle) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CheckoutScreen( + paymentStatus: TcpProxyHelper.PaymentStatus, + onStartPayment: () -> Unit, + onNavigateToProxy: () -> Unit, + onBackClick: (() -> Unit)? = null +) { + var selectedPlan by remember { mutableStateOf(CheckoutPlan.SIX_MONTH) } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.checkout_app_name), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + .verticalScroll(rememberScrollState()) + .background(MaterialTheme.colorScheme.background) + ) { + when (paymentStatus) { + TcpProxyHelper.PaymentStatus.NOT_PAID -> PaymentContent( + selectedPlan = selectedPlan, + onPlanSelected = { selectedPlan = it }, + onStartPayment = onStartPayment, + onNavigateToProxy = onNavigateToProxy + ) + + TcpProxyHelper.PaymentStatus.INITIATED -> PaymentAwaiting() + TcpProxyHelper.PaymentStatus.PAID -> PaymentSuccess(onNavigateToProxy) + TcpProxyHelper.PaymentStatus.FAILED -> PaymentFailed(onNavigateToProxy) + else -> PaymentContent( + selectedPlan = selectedPlan, + onPlanSelected = { selectedPlan = it }, + onStartPayment = onStartPayment, + onNavigateToProxy = onNavigateToProxy + ) + } + } + } +} + +@Composable +private fun PaymentContent( + selectedPlan: CheckoutPlan, + onPlanSelected: (CheckoutPlan) -> Unit, + onStartPayment: () -> Unit, + onNavigateToProxy: () -> Unit +) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(bottom = Dimensions.spacingLg), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + shape = RoundedCornerShape(Dimensions.cardCornerRadiusLarge), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = androidx.compose.foundation.BorderStroke( + 1.dp, + MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f) + ), + tonalElevation = 1.dp + ) { + Column( + modifier = Modifier.padding(Dimensions.spacingLg), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + Text( + text = stringResource(R.string.checkout_app_name), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold + ) + Text( + text = stringResource(R.string.checkout_choose_plan), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + SectionHeader( + title = stringResource(R.string.checkout_choose_plan), + modifier = Modifier.padding(horizontal = Dimensions.spacingXs) + ) + + RethinkListGroup { + val plans = CheckoutPlan.entries + plans.forEachIndexed { index, plan -> + val isSelected = selectedPlan == plan + val position = when { + plans.size == 1 -> CardPosition.Single + index == 0 -> CardPosition.First + index == plans.size - 1 -> CardPosition.Last + else -> CardPosition.Middle + } + RethinkListItem( + headline = stringResource(plan.titleRes), + supporting = stringResource(plan.subtitleRes), + position = position, + leadingIcon = if (isSelected) Icons.Rounded.RadioButtonChecked else Icons.Rounded.RadioButtonUnchecked, + leadingIconTint = if (isSelected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant, + onClick = { onPlanSelected(plan) }, + trailing = { + RadioButton( + selected = isSelected, + onClick = null + ) + } + ) + } + } + + Column(verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd)) { + Button( + modifier = Modifier + .fillMaxWidth() + .height(50.dp), + onClick = onStartPayment, + shape = RoundedCornerShape(Dimensions.buttonCornerRadius) + ) { + Text( + text = stringResource(R.string.checkout_purchase), + style = MaterialTheme.typography.labelLarge + ) + } + + androidx.compose.material3.OutlinedButton( + modifier = Modifier + .fillMaxWidth() + .height(50.dp), + onClick = onNavigateToProxy, + shape = RoundedCornerShape(Dimensions.buttonCornerRadius), + border = androidx.compose.foundation.BorderStroke( + 1.dp, + MaterialTheme.colorScheme.primary.copy(alpha = 0.5f) + ) + ) { + Text(text = stringResource(R.string.checkout_restore)) + } + } + + Spacer(modifier = Modifier.height(Dimensions.spacingMd)) + + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadius2xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = 1.dp + ) { + Column( + modifier = Modifier.padding(horizontal = 16.dp, vertical = 14.dp), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs) + ) { + Text( + text = stringResource(R.string.checkout_terms_title), + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.onSurface + ) + Text( + text = stringResource(R.string.checkout_terms_body), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + Spacer(modifier = Modifier.height(Dimensions.spacingLg)) + } + } +} + +@Composable +private fun PaymentSuccess(onNavigateToProxy: () -> Unit) { + StatusScreen( + title = stringResource(R.string.checkout_payment_success_title), + message = stringResource(R.string.checkout_payment_success_message), + buttonLabel = stringResource(R.string.checkout_payment_success_button), + onButtonClick = onNavigateToProxy + ) +} + +@Composable +private fun PaymentFailed(onNavigateToProxy: () -> Unit) { + StatusScreen( + title = stringResource(R.string.checkout_payment_failed_title), + message = stringResource(R.string.checkout_payment_failed_message), + buttonLabel = stringResource(R.string.checkout_payment_failed_button), + onButtonClick = onNavigateToProxy + ) +} + +@Composable +private fun PaymentAwaiting() { + CheckoutStatusCard( + title = stringResource(R.string.checkout_payment_awaiting_title), + message = stringResource(R.string.checkout_payment_awaiting_message) + ) { + CircularProgressIndicator(color = MaterialTheme.colorScheme.primary) + } +} + +@Composable +private fun StatusScreen( + title: String, + message: String, + buttonLabel: String, + onButtonClick: () -> Unit +) { + CheckoutStatusCard( + title = title, + message = message + ) { + Button( + modifier = Modifier.fillMaxWidth(), + onClick = onButtonClick, + shape = RoundedCornerShape(Dimensions.buttonCornerRadius) + ) { + Text(text = buttonLabel) + } + } +} + +@Composable +private fun CheckoutStatusCard( + title: String, + message: String, + content: @Composable ColumnScope.() -> Unit +) { + Box( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal, vertical = Dimensions.spacingXl) + ) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadius4xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = androidx.compose.foundation.BorderStroke( + 1.dp, + MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.26f) + ), + tonalElevation = 1.dp + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp, vertical = 22.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + Text( + text = title, + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.SemiBold, + textAlign = TextAlign.Center + ) + Text( + text = message, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center + ) + Spacer(modifier = Modifier.height(Dimensions.spacingXs)) + content() + } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/settings/ConsoleLogScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/ConsoleLogScreen.kt new file mode 100644 index 000000000..5d3730ba7 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/ConsoleLogScreen.kt @@ -0,0 +1,330 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.settings + +import Logger +import Logger.LOG_TAG_BUG_REPORT +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExtendedFloatingActionButton +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.lifecycle.asFlow +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.ConsoleLogRow +import com.celzero.bravedns.database.ConsoleLogRepository +import com.celzero.bravedns.net.go.GoVpnAdapter +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.util.Constants +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.viewmodel.ConsoleLogViewModel +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.FlowPreview +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.distinctUntilChanged +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Delete +import androidx.compose.material.icons.rounded.FilterList +import androidx.compose.material.icons.rounded.Search +import androidx.compose.material.icons.rounded.Share +import kotlinx.coroutines.launch + +private const val QUERY_TEXT_DELAY: Long = 1000 + +@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class) +@Composable +fun ConsoleLogScreen( + viewModel: ConsoleLogViewModel, + consoleLogRepository: ConsoleLogRepository, + persistentState: PersistentState, + onShareClick: () -> Unit, + onDeleteComplete: () -> Unit, + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val consoleLogDesc = stringResource(R.string.console_log_desc) + val logsCardDuration = stringResource(R.string.logs_card_duration) + val twoArgumentSpace = stringResource(R.string.two_argument_space) + + var query by remember { mutableStateOf("") } + var infoText by remember { mutableStateOf("") } + var progressVisible by remember { mutableStateOf(false) } + var showFilterDialog by remember { mutableStateOf(false) } + var selectedLogLevel by remember { mutableIntStateOf(Logger.uiLogLevel.toInt()) } + + val filterOptions = listOf( + stringResource(R.string.settings_gologger_dialog_option_0), + stringResource(R.string.settings_gologger_dialog_option_1), + stringResource(R.string.settings_gologger_dialog_option_2), + stringResource(R.string.settings_gologger_dialog_option_3), + stringResource(R.string.settings_gologger_dialog_option_4), + stringResource(R.string.settings_gologger_dialog_option_5), + stringResource(R.string.settings_gologger_dialog_option_6), + stringResource(R.string.settings_gologger_dialog_option_7) + ) + + // Initialize info text + LaunchedEffect(Unit) { + scope.launch(Dispatchers.IO) { + val sinceTime = viewModel.sinceTime() + if (sinceTime != 0L) { + val since = Utilities.convertLongToTime(sinceTime, Constants.TIME_FORMAT_3) + val sinceTxt = String.format(logsCardDuration, since) + infoText = String.format(twoArgumentSpace, consoleLogDesc, sinceTxt) + } + } + } + + // Set up log level and query filtering + LaunchedEffect(Unit) { + viewModel.setLogLevel(Logger.uiLogLevel) + snapshotFlow { query } + .debounce(QUERY_TEXT_DELAY) + .distinctUntilChanged() + .collect { value -> + viewModel.setFilter(value) + } + } + + if (showFilterDialog) { + RethinkConfirmDialog( + onDismissRequest = { showFilterDialog = false }, + title = stringResource(R.string.console_log_title), + text = { + Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + filterOptions.forEachIndexed { index, label -> + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + RadioButton( + selected = selectedLogLevel == index, + onClick = { + selectedLogLevel = index + Logger.uiLogLevel = index.toLong() + GoVpnAdapter.setLogLevel( + persistentState.goLoggerLevel.toInt(), + Logger.uiLogLevel.toInt() + ) + viewModel.setLogLevel(index.toLong()) + if (index < Logger.LoggerLevel.ERROR.id) { + consoleLogRepository.setStartTimestamp(System.currentTimeMillis()) + } + Logger.i(LOG_TAG_BUG_REPORT, "Log level set to $label") + } + ) + Spacer(modifier = Modifier.width(8.dp)) + Text(text = label, style = MaterialTheme.typography.bodyMedium) + } + } + } + }, + confirmText = stringResource(R.string.fapps_info_dialog_positive_btn), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { showFilterDialog = false }, + onDismiss = { showFilterDialog = false } + ) + } + + val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() + + Scaffold( + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.console_log_title), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + }, + floatingActionButton = { + ExtendedFloatingActionButton( + text = { Text(text = stringResource(R.string.about_bug_report_desc)) }, + icon = { + Icon( + imageVector = Icons.Rounded.Share, + contentDescription = null + ) + }, + onClick = onShareClick + ) + } + ) { paddingValues -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { + SearchRow( + query = query, + onQueryChange = { query = it }, + onFilterClick = { + selectedLogLevel = Logger.uiLogLevel.toInt() + showFilterDialog = true + }, + onShareClick = onShareClick, + onDeleteClick = { + scope.launch(Dispatchers.IO) { + Logger.i(LOG_TAG_BUG_REPORT, "deleting all console logs") + consoleLogRepository.deleteAllLogs() + onDeleteComplete() + } + } + ) + + if (progressVisible) { + LinearProgressIndicator( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal, vertical = 4.dp) + ) + } + + Box(modifier = Modifier.weight(1f)) { + ConsoleLogList(viewModel = viewModel) + } + } + } +} + +@Composable +private fun SearchRow( + query: String, + onQueryChange: (String) -> Unit, + onFilterClick: () -> Unit, + onShareClick: () -> Unit, + onDeleteClick: () -> Unit +) { + androidx.compose.material3.Surface( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.screenPaddingHorizontal, vertical = Dimensions.spacingMd), + shape = RoundedCornerShape(Dimensions.cardCornerRadiusLarge), + color = MaterialTheme.colorScheme.surfaceContainerHigh, + ) { + Row( + modifier = Modifier + .padding(horizontal = Dimensions.spacingSm, vertical = 2.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = Icons.Rounded.Search, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier + .padding(start = Dimensions.spacingSm) + .size(Dimensions.iconSizeMd) + ) + + OutlinedTextField( + value = query, + onValueChange = onQueryChange, + modifier = Modifier.weight(1f), + singleLine = true, + placeholder = { + Text( + text = stringResource(R.string.lbl_search), + style = MaterialTheme.typography.bodyMedium + ) + }, + colors = androidx.compose.material3.OutlinedTextFieldDefaults.colors( + focusedBorderColor = androidx.compose.ui.graphics.Color.Transparent, + unfocusedBorderColor = androidx.compose.ui.graphics.Color.Transparent, + focusedContainerColor = androidx.compose.ui.graphics.Color.Transparent, + unfocusedContainerColor = androidx.compose.ui.graphics.Color.Transparent + ) + ) + + Row(horizontalArrangement = Arrangement.spacedBy(0.dp)) { + IconButton(onClick = onFilterClick) { + Icon( + imageVector = Icons.Rounded.FilterList, + contentDescription = stringResource(R.string.cd_filter), + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + + IconButton(onClick = onShareClick) { + Icon( + imageVector = Icons.Rounded.Share, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + + IconButton(onClick = onDeleteClick) { + Icon( + imageVector = Icons.Rounded.Delete, + contentDescription = stringResource(R.string.lbl_delete), + tint = MaterialTheme.colorScheme.error + ) + } + } + } + } +} + +@Composable +private fun ConsoleLogList(viewModel: ConsoleLogViewModel) { + val items = viewModel.logs.asFlow().collectAsLazyPagingItems() + + LazyColumn( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 2.dp, vertical = 2.dp) + ) { + items(count = items.itemCount) { index -> + val item = items[index] ?: return@items + ConsoleLogRow(item) + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/settings/MiscSettingsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/MiscSettingsScreen.kt new file mode 100644 index 000000000..a1cb4cebe --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/MiscSettingsScreen.kt @@ -0,0 +1,508 @@ +/* + * Copyright 2020 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.settings + +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.tween +import androidx.compose.foundation.gestures.animateScrollBy +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Backup +import androidx.compose.material.icons.rounded.BugReport +import androidx.compose.material.icons.rounded.Public +import androidx.compose.material.icons.rounded.Settings +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.Density +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.R +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.ui.bottomsheet.BackupRestoreSheet +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkActionListItem +import com.celzero.bravedns.ui.compose.theme.RethinkAnimatedSection +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkToggleListItem +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.util.UIUtils.openUrl +import com.celzero.bravedns.util.Utilities.isAtleastQ +import com.celzero.bravedns.util.Utilities.isFdroidFlavour +import kotlinx.coroutines.delay +import kotlin.math.abs +import kotlin.math.roundToInt + +private fun miscFocusTarget( + focusKey: String, + showFirewallBubble: Boolean, + isFdroidFlavor: Boolean +): Pair? { + val rowHeight = 76 + val cardRowStart = 54 + + fun rowOffset(row: Int): Int { + return cardRowStart + (rowHeight * row) + } + + val togglesRow = + when (focusKey) { + "general_logs" -> 0 + "general_autostart" -> 1 + "general_tombstone" -> 2 + "general_firewall_bubble" -> if (showFirewallBubble) 3 else null + "general_ip_info" -> if (showFirewallBubble) 4 else 3 + "general_app_updates" -> + if (isFdroidFlavor) { + null + } else if (showFirewallBubble) { + 5 + } else { + 4 + } + "general_crash_reports" -> + if (isFdroidFlavor) { + null + } else if (showFirewallBubble) { + 6 + } else { + 5 + } + "general_custom_downloader" -> + if (isFdroidFlavor) { + if (showFirewallBubble) 5 else 4 + } else if (showFirewallBubble) { + 7 + } else { + 6 + } + else -> null + } + + return when (focusKey) { + "general_appearance", + "general_theme_mode" -> 0 to 48 + "general_theme_color" -> 0 to 148 + "general_backup", + "general_backup_restore" -> 1 to rowOffset(0) + "general_about", + "general_website" -> 3 to rowOffset(0) + else -> { + togglesRow?.let { 2 to rowOffset(it) } + } + } +} + +private fun miscFocusIndex(focusKey: String): Int? { + return when (focusKey) { + "general_appearance", + "general_theme_mode", + "general_theme_color" -> 0 + "general_backup_restore", + "general_backup" -> 1 + "general_toggles", + "general_logs", + "general_autostart", + "general_tombstone", + "general_firewall_bubble", + "general_ip_info", + "general_app_updates", + "general_crash_reports", + "general_custom_downloader" -> 2 + "general_about", + "general_website" -> 3 + else -> null + } +} + +private suspend fun smartScrollToItem( + listState: LazyListState, + density: Density, + index: Int, + offsetDp: Int +) { + val offsetPx = with(density) { offsetDp.dp.toPx().roundToInt() } + listState.animateScrollToItem(index, 0) + repeat(3) { + val info = listState.layoutInfo.visibleItemsInfo.firstOrNull { it.index == index } ?: return + val desiredTop = -offsetPx + val delta = info.offset - desiredTop + if (abs(delta) <= 8) return + listState.animateScrollBy(delta.toFloat()) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MiscSettingsScreen( + persistentState: PersistentState, + eventLogger: EventLogger, + initialFocusKey: String? = null, + onBackClick: (() -> Unit)? = null, + onRefreshDatabase: (() -> Unit)? = null, + onThemeModeChanged: ((Int) -> Unit)? = null, + onThemeColorChanged: ((Int) -> Unit)? = null +) { + var logsEnabled by remember { mutableStateOf(persistentState.logsEnabled) } + var checkUpdatesEnabled by remember { mutableStateOf(persistentState.checkForAppUpdate) } + var firebaseEnabled by remember { mutableStateOf(persistentState.firebaseErrorReportingEnabled) } + var ipInfoEnabled by remember { mutableStateOf(persistentState.downloadIpInfo) } + var customDownloadEnabled by remember { mutableStateOf(persistentState.useCustomDownloadManager) } + var autoStartEnabled by remember { mutableStateOf(persistentState.prefAutoStartBootUp) } + var tombstoneEnabled by remember { mutableStateOf(persistentState.tombstoneApps) } + var firewallBubbleEnabled by remember { mutableStateOf(persistentState.firewallBubbleEnabled) } + var showBackupSheet by remember { mutableStateOf(false) } + val initialFocus = initialFocusKey?.trim().orEmpty() + var pendingFocusKey by rememberSaveable(initialFocus) { mutableStateOf(initialFocus) } + var activeFocusKey by rememberSaveable(initialFocus) { + mutableStateOf(initialFocus.ifBlank { null }) + } + + val context = LocalContext.current + val aboutWebsiteLink = stringResource(id = R.string.about_website_link) + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + val listState = rememberLazyListState() + val density = LocalDensity.current + val showFirewallBubble = isAtleastQ() + val isFdroidFlavor = isFdroidFlavour() + val generalToggleKeys = remember(showFirewallBubble, isFdroidFlavor) { + buildList { + add("general_logs") + add("general_autostart") + add("general_tombstone") + if (showFirewallBubble) add("general_firewall_bubble") + add("general_ip_info") + if (!isFdroidFlavor) { + add("general_app_updates") + add("general_crash_reports") + } + add("general_custom_downloader") + } + } + + LaunchedEffect(pendingFocusKey) { + val key = pendingFocusKey.trim() + if (key.isBlank()) return@LaunchedEffect + activeFocusKey = key + val target = + miscFocusTarget( + focusKey = key, + showFirewallBubble = showFirewallBubble, + isFdroidFlavor = isFdroidFlavor + ) + + if (target != null) { + val (index, offsetDp) = target + smartScrollToItem(listState, density, index, offsetDp) + delay(850) + if (activeFocusKey == key) { + activeFocusKey = null + } + pendingFocusKey = "" + return@LaunchedEffect + } + + val index = miscFocusIndex(key) + if (index != null) { + smartScrollToItem(listState, density, index, 0) + delay(700) + if (activeFocusKey == key) { + activeFocusKey = null + } + } + pendingFocusKey = "" + } + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + containerColor = MaterialTheme.colorScheme.surface, + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.settings_general_header).titlecaseFirst(), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + LazyColumn( + state = listState, + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = Dimensions.spacing3xl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + item { + RethinkAnimatedSection(index = 0) { + AppearanceSettingsCard( + themePreference = persistentState.theme, + colorPresetId = persistentState.themeColorPreset, + onAppearanceModeSelected = { mode -> + val themeId = mode.toThemePreference() + persistentState.theme = themeId + onThemeModeChanged?.invoke(themeId) + logEvent( + eventLogger = eventLogger, + msg = "Appearance", + details = "Theme set to ${mode.name.lowercase()}" + ) + }, + onColorPresetSelected = { preset -> + persistentState.themeColorPreset = preset.id + onThemeColorChanged?.invoke(preset.id) + logEvent( + eventLogger = eventLogger, + msg = "Appearance color", + details = "Color preset set to ${preset.name.lowercase()}" + ) + }, + showSectionHeader = true + ) + } + } + + item { + RethinkAnimatedSection(index = 1) { + SectionHeader( + title = stringResource(id = R.string.brbs_title) + ) + Column { + RethinkActionListItem( + title = stringResource(id = R.string.brbs_backup_title), + description = stringResource(id = R.string.brbs_backup_desc), + icon = Icons.Rounded.Backup, + accentColor = MaterialTheme.colorScheme.secondary, + highlighted = activeFocusKey == "general_backup", + position = CardPosition.Single, + onClick = { showBackupSheet = true } + ) + } + } + } + + item { + RethinkAnimatedSection(index = 2) { + SectionHeader( + title = stringResource(id = R.string.settings_general_header).titlecaseFirst() + ) + Column { + RethinkToggleListItem( + title = stringResource(id = R.string.settings_enable_logs), + description = stringResource(id = R.string.settings_enable_logs_desc), + iconRes = R.drawable.ic_logs_accent, + checked = logsEnabled, + accentColor = MaterialTheme.colorScheme.primary, + highlighted = activeFocusKey == "general_logs", + position = generalToggleKeys.positionFor("general_logs"), + onCheckedChange = { enabled -> + logsEnabled = enabled + persistentState.logsEnabled = enabled + logEvent(eventLogger, "Logs", "User ${if (enabled) "enabled" else "disabled"} logs") + } + ) + RethinkToggleListItem( + title = stringResource(id = R.string.settings_autostart_bootup_heading), + description = stringResource(id = R.string.settings_autostart_bootup_desc), + iconRes = R.drawable.ic_auto_start, + checked = autoStartEnabled, + accentColor = MaterialTheme.colorScheme.primary, + highlighted = activeFocusKey == "general_autostart", + position = generalToggleKeys.positionFor("general_autostart"), + onCheckedChange = { enabled -> + autoStartEnabled = enabled + persistentState.prefAutoStartBootUp = enabled + logEvent(eventLogger, "Auto-start", "Auto-start on power-up set to $enabled") + } + ) + RethinkToggleListItem( + title = stringResource(id = R.string.tombstone_app_title), + description = stringResource(id = R.string.tombstone_app_desc), + iconRes = R.drawable.ic_tombstone, + checked = tombstoneEnabled, + accentColor = MaterialTheme.colorScheme.primary, + highlighted = activeFocusKey == "general_tombstone", + position = generalToggleKeys.positionFor("general_tombstone"), + onCheckedChange = { enabled -> + tombstoneEnabled = enabled + persistentState.tombstoneApps = enabled + logEvent(eventLogger, "Tombstone apps", "Remember uninstalled apps set to $enabled") + } + ) + + if (showFirewallBubble) { + RethinkToggleListItem( + title = stringResource(id = R.string.firewall_bubble_title), + description = stringResource(id = R.string.firewall_bubble_desc), + iconRes = R.drawable.ic_firewall_bubble, + checked = firewallBubbleEnabled, + accentColor = MaterialTheme.colorScheme.primary, + highlighted = activeFocusKey == "general_firewall_bubble", + position = generalToggleKeys.positionFor("general_firewall_bubble"), + onCheckedChange = { enabled -> + firewallBubbleEnabled = enabled + persistentState.firewallBubbleEnabled = enabled + logEvent(eventLogger, "Firewall bubble", "Firewall bubble set to $enabled") + } + ) + } + + RethinkToggleListItem( + title = stringResource(id = R.string.download_ip_info_title), + description = stringResource( + id = R.string.download_ip_info_desc, + stringResource(id = R.string.lbl_ipinfo_inc) + ), + iconRes = R.drawable.ic_ip_info, + checked = ipInfoEnabled, + accentColor = MaterialTheme.colorScheme.primary, + highlighted = activeFocusKey == "general_ip_info", + position = generalToggleKeys.positionFor("general_ip_info"), + onCheckedChange = { enabled -> + ipInfoEnabled = enabled + persistentState.downloadIpInfo = enabled + } + ) + + if (!isFdroidFlavor) { + RethinkToggleListItem( + title = stringResource(id = R.string.settings_check_update_heading), + description = stringResource(id = R.string.settings_check_update_desc), + iconRes = R.drawable.ic_update, + checked = checkUpdatesEnabled, + accentColor = MaterialTheme.colorScheme.primary, + highlighted = activeFocusKey == "general_app_updates", + position = generalToggleKeys.positionFor("general_app_updates"), + onCheckedChange = { enabled -> + checkUpdatesEnabled = enabled + persistentState.checkForAppUpdate = enabled + } + ) + + RethinkToggleListItem( + title = stringResource(id = R.string.settings_firebase_error_reporting_heading), + description = stringResource(id = R.string.settings_firebase_error_reporting_desc), + icon = Icons.Rounded.BugReport, + checked = firebaseEnabled, + accentColor = MaterialTheme.colorScheme.primary, + highlighted = activeFocusKey == "general_crash_reports", + position = generalToggleKeys.positionFor("general_crash_reports"), + onCheckedChange = { enabled -> + firebaseEnabled = enabled + persistentState.firebaseErrorReportingEnabled = enabled + } + ) + } + + RethinkToggleListItem( + title = stringResource(id = R.string.settings_custom_downloader_heading), + description = stringResource(id = R.string.settings_custom_downloader_desc), + icon = Icons.Rounded.Settings, + checked = customDownloadEnabled, + accentColor = MaterialTheme.colorScheme.primary, + highlighted = activeFocusKey == "general_custom_downloader", + position = generalToggleKeys.positionFor("general_custom_downloader"), + onCheckedChange = { enabled -> + customDownloadEnabled = enabled + persistentState.useCustomDownloadManager = enabled + } + ) + } + } + } + + item { + RethinkAnimatedSection(index = 3) { + SectionHeader( + title = stringResource(id = R.string.title_about) + ) + Column { + RethinkListItem( + headline = stringResource(id = R.string.about_website), + supporting = stringResource(id = R.string.about_website_link), + leadingIcon = Icons.Rounded.Public, + leadingIconTint = MaterialTheme.colorScheme.tertiary, + leadingIconContainerColor = MaterialTheme.colorScheme.tertiary.copy(alpha = 0.14f), + position = CardPosition.Single, + highlighted = activeFocusKey == "general_website", + highlightContainerColor = MaterialTheme.colorScheme.tertiary.copy(alpha = 0.24f), + onClick = { openUrl(context, aboutWebsiteLink) } + ) + } + } + } + } + } + + if (showBackupSheet) { + BackupRestoreSheet(onDismiss = { showBackupSheet = false }) + } +} + +private fun logEvent(eventLogger: EventLogger, msg: String, details: String) { + eventLogger.log( + type = EventType.UI_SETTING_CHANGED, + severity = Severity.LOW, + message = msg, + source = EventSource.UI, + userAction = true, + details = details + ) +} + +private fun List.positionFor(key: String): CardPosition { + val index = indexOf(key) + if (index < 0) return CardPosition.Middle + return when { + size == 1 -> CardPosition.Single + index == 0 -> CardPosition.First + index == lastIndex -> CardPosition.Last + else -> CardPosition.Middle + } +} + +private fun String.titlecaseFirst(): String { + return replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/settings/PingTestScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/PingTestScreen.kt new file mode 100644 index 000000000..3e10f06b1 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/PingTestScreen.kt @@ -0,0 +1,385 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.settings + +import androidx.compose.foundation.layout.Arrangement +import com.celzero.bravedns.ui.compose.theme.Dimensions +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.service.VpnController +import com.celzero.firestack.backend.Backend +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import io.github.aakira.napier.Napier +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +private const val PING_IP1 = "1.1.1.1:53" +private const val PING_IP2 = "8.8.8.8:53" +private const val PING_IP3 = "216.239.32.27:443" +private const val PING_HOST1 = "cloudflare.com:443" +private const val PING_HOST2 = "google.com:443" +private const val PING_HOST3 = "brave.com:443" +private const val STRENGTH_MAX = 5 +private const val TAG = "PingUi" + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun PingTestScreen( + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + + var ip1 by remember { mutableStateOf(PING_IP1) } + var ip2 by remember { mutableStateOf(PING_IP2) } + var ip3 by remember { mutableStateOf(PING_IP3) } + var host1 by remember { mutableStateOf(PING_HOST1) } + var host2 by remember { mutableStateOf(PING_HOST2) } + var host3 by remember { mutableStateOf(PING_HOST3) } + + var ip1Status by remember { mutableStateOf(PingStatus.Idle) } + var ip2Status by remember { mutableStateOf(PingStatus.Idle) } + var ip3Status by remember { mutableStateOf(PingStatus.Idle) } + var host1Status by remember { mutableStateOf(PingStatus.Idle) } + var host2Status by remember { mutableStateOf(PingStatus.Idle) } + var host3Status by remember { mutableStateOf(PingStatus.Idle) } + + var strength by remember { mutableStateOf(null) } + val showStartVpnDialog = remember { !VpnController.hasTunnel() } + + // Cache for proxy status + val proxiesStatus = remember { mutableListOf() } + + suspend fun getProxiesStatus(csv: String): List { + if (proxiesStatus.isNotEmpty()) return proxiesStatus + + return withContext(Dispatchers.IO) { + val warp = VpnController.isProxyReachable(Backend.RpnWin, csv) + val amz = VpnController.isProxyReachable(Backend.RpnWin, csv) + val win = VpnController.isProxyReachable(Backend.RpnWin, csv) + val se = VpnController.isProxyReachable(Backend.RpnSE, csv) + val w64 = VpnController.isProxyReachable(Backend.Rpn64, csv) + Napier.d("$TAG proxies reachable: $warp, $amz $win, $se, $w64") + + val status = listOf(warp, amz, win, se, w64) + proxiesStatus.clear() + proxiesStatus.addAll(status) + status + } + } + + suspend fun isReachable(csv: String): Boolean { + val status = getProxiesStatus(csv) + // Check if any proxy is reachable + val reachable = status.any { it } + Napier.d("$TAG ip $csv reachable: $reachable") + return reachable + } + + suspend fun calculateStrength(csv: String): Int { + val status = getProxiesStatus(csv) + // Count how many are true + val strengthVal = status.count { it } + Napier.i("$TAG strength: $strengthVal ($status)") + return strengthVal + } + + fun performPing() { + scope.launch { + try { + proxiesStatus.clear() // Clear cache for new test + Napier.v("$TAG initiating ping test") + ip1Status = PingStatus.Loading + ip2Status = PingStatus.Loading + ip3Status = PingStatus.Loading + host1Status = PingStatus.Loading + host2Status = PingStatus.Loading + host3Status = PingStatus.Loading + strength = null + + val ip1Local = ip1 + val ip2Local = ip2 + val ip3Local = ip3 + val host1Local = host1 + val host2Local = host2 + val host3Local = host3 + + // Run reachable checks sequentially in IO as per original + val validI1 = isReachable(ip1Local) + val validI2 = isReachable(ip2Local) + val validI3 = isReachable(ip3Local) + val validH1 = isReachable(host1Local) + val validH2 = isReachable(host2Local) + val validH3 = isReachable(host3Local) + + ip1Status = PingStatus.Result(validI1) + ip2Status = PingStatus.Result(validI2) + ip3Status = PingStatus.Result(validI3) + host1Status = PingStatus.Result(validH1) + host2Status = PingStatus.Result(validH2) + host3Status = PingStatus.Result(validH3) + + val strengthValue = calculateStrength(ip3Local) + strength = strengthValue.coerceIn(1, STRENGTH_MAX) + } catch (e: Exception) { + Napier.e("$TAG err isReachable: ${e.message}", e) + ip1Status = PingStatus.Result(false) + ip2Status = PingStatus.Result(false) + ip3Status = PingStatus.Result(false) + host1Status = PingStatus.Result(false) + host2Status = PingStatus.Result(false) + host3Status = PingStatus.Result(false) + } + } + } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.settings_connectivity_checks), + subtitle = stringResource(R.string.settings_connectivity_checks_desc), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + if (showStartVpnDialog) { + RethinkConfirmDialog( + onDismissRequest = {}, + title = stringResource(R.string.vpn_not_active_dialog_title), + message = stringResource(R.string.vpn_not_active_dialog_desc), + confirmText = stringResource(R.string.lbl_dismiss), + onConfirm = { onBackClick?.invoke() } + ) + } + + LazyColumn( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = Dimensions.spacing3xl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + item { + SectionHeader(title = stringResource(R.string.ping_ip_port_title)) + RethinkListGroup { + Column( + modifier = Modifier.padding( + horizontal = Dimensions.cardPadding, + vertical = Dimensions.spacingSm + ) + ) { + PingField( + value = ip1, + readOnly = true, + status = ip1Status + ) + PingField( + value = ip2, + readOnly = true, + status = ip2Status + ) + PingField( + value = ip3, + readOnly = false, + status = ip3Status, + onValueChange = { ip3 = it } + ) + } + } + } + + item { + SectionHeader(title = stringResource(R.string.ping_host_port_title)) + RethinkListGroup { + Column( + modifier = Modifier.padding( + horizontal = Dimensions.cardPadding, + vertical = Dimensions.spacingSm + ) + ) { + PingField( + value = host1, + readOnly = true, + status = host1Status + ) + PingField( + value = host2, + readOnly = true, + status = host2Status + ) + PingField( + value = host3, + readOnly = false, + status = host3Status, + onValueChange = { host3 = it } + ) + } + } + } + + item { + RethinkListGroup { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.cardPadding, vertical = Dimensions.spacingSm), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + OutlinedButton( + modifier = Modifier.weight(1f), + onClick = { onBackClick?.invoke() } + ) { + Text(text = stringResource(R.string.lbl_cancel)) + } + Button( + modifier = Modifier.weight(1f), + onClick = { performPing() } + ) { + Text(text = stringResource(R.string.lbl_test)) + } + } + } + } + + strength?.let { value -> + val progress = value.toFloat() / STRENGTH_MAX.toFloat() + item { + SectionHeader(title = stringResource(R.string.ping_strength_title)) + RethinkListGroup { + Column( + modifier = Modifier.padding( + horizontal = Dimensions.cardPadding, + vertical = Dimensions.spacingLg + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + Text( + text = stringResource( + R.string.two_argument, + value.toString(), + STRENGTH_MAX.toString() + ), + style = MaterialTheme.typography.titleMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + LinearProgressIndicator( + progress = { progress }, + modifier = Modifier.fillMaxWidth() + ) + } + } + } + } + } + } +} + +@Composable +private fun PingField( + value: String, + readOnly: Boolean, + status: PingStatus, + onValueChange: (String) -> Unit = {} +) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 6.dp), + verticalAlignment = Alignment.CenterVertically + ) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + readOnly = readOnly, + modifier = Modifier.weight(1f), + singleLine = true + ) + Spacer(modifier = Modifier.width(8.dp)) + when (status) { + PingStatus.Loading -> { + CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp) + } + + is PingStatus.Result -> { + val icon = + if (status.success) R.drawable.ic_tick else R.drawable.ic_cross_accent + Icon( + painter = painterResource(icon), + contentDescription = null, + modifier = Modifier.size(20.dp) + ) + } + + PingStatus.Idle -> Unit + } + } +} + +private sealed class PingStatus { + data object Idle : PingStatus() + data object Loading : PingStatus() + data class Result(val success: Boolean) : PingStatus() +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/settings/ProxySettingsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/ProxySettingsScreen.kt new file mode 100644 index 000000000..74859f3ab --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/ProxySettingsScreen.kt @@ -0,0 +1,2333 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.settings + +import android.content.ActivityNotFoundException +import android.content.Intent +import android.graphics.drawable.Drawable +import android.text.format.DateUtils +import android.util.LruCache +import android.widget.Toast +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.clickable +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.verticalScroll +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowForward +import androidx.compose.material.icons.filled.KeyboardArrowDown +import androidx.compose.material.icons.rounded.Apps +import androidx.compose.material.icons.rounded.Info +import androidx.compose.material.icons.rounded.Refresh +import androidx.compose.material3.Card +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.positionInWindow +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.IntSize +import androidx.compose.ui.unit.IntOffset +import androidx.compose.ui.window.Popup +import androidx.compose.ui.window.PopupProperties +import androidx.core.net.toUri +import androidx.lifecycle.asFlow +import com.celzero.bravedns.R +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.ProxyEndpoint +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.net.doh.Transaction +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.service.ProxyManager +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.service.WireguardManager +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkMultiActionDialog +import com.celzero.bravedns.ui.compose.theme.RethinkToggleListItem +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import androidx.compose.ui.res.painterResource +import com.celzero.bravedns.util.OrbotHelper +import com.celzero.bravedns.util.UIUtils +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.getIcon +import com.celzero.bravedns.viewmodel.ProxyAppsMappingViewModel +import com.celzero.firestack.backend.Backend +import com.celzero.firestack.backend.RouterStats +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.util.Locale +import kotlin.math.roundToInt + +private const val REFRESH_TIMEOUT_MS = 4000L + +private data class ProxyScreenState( + val canEnableProxy: Boolean, + val socks5Enabled: Boolean, + val httpEnabled: Boolean, + val orbotEnabled: Boolean, + val wireguardDescription: String, + val socks5Description: String, + val httpDescription: String, + val orbotDescription: String +) + +private data class Socks5DialogState( + val host: String, + val port: String, + val username: String, + val password: String, + val selectedAppPackage: String, + val appOptions: List, + val udpBlocked: Boolean, + val includeProxyApps: Boolean, + val lockdown: Boolean, + val error: String? = null +) + +private data class HttpDialogState( + val host: String, + val selectedAppPackage: String, + val appOptions: List, + val includeProxyApps: Boolean, + val lockdown: Boolean, + val error: String? = null +) + +private data class ProxyDialogAppOption( + val packageName: String, + val label: String, + val iconLookupName: String = label +) + +private object ProxyDialogAppIconCache { + private const val CACHE_SIZE = 192 + private val cache = LruCache(CACHE_SIZE) + + fun get(key: String): Drawable? = cache.get(key) + + fun put(key: String, icon: Drawable?) { + if (key.isBlank() || icon == null) return + cache.put(key, icon) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ProxySettingsScreen( + appConfig: AppConfig, + persistentState: PersistentState, + eventLogger: EventLogger, + mappingViewModel: ProxyAppsMappingViewModel? = null, + initialFocusKey: String? = null, + onWireguardClick: (() -> Unit)? = null, + onOpenOrbotApps: (() -> Unit)? = null, + onNavigateToDns: (() -> Unit)? = null, + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val providerName = + persistentState.proxyProvider.lowercase().replaceFirstChar { + if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() + } + val lockDownProxyDesc = stringResource(R.string.settings_lock_down_proxy_desc) + val refreshToast = stringResource(R.string.dc_refresh_toast) + val socks5VpnDisabledError = stringResource(R.string.settings_socks5_vpn_disabled_error) + val socks5DisabledError = stringResource(R.string.settings_socks5_disabled_error, providerName) + val httpDisabledError = stringResource(R.string.settings_https_disabled_error, providerName) + val orbotDisabledError = stringResource(R.string.settings_orbot_disabled_error) + val orbotInstallError = stringResource(R.string.orbot_install_activity_error) + val orbotWebsiteLink = stringResource(R.string.orbot_website_link) + val orbotNoAppToast = stringResource(R.string.orbot_no_app_toast) + val httpProxyHostEmptyError = stringResource(R.string.settings_http_proxy_error_text3) + val httpProxyInvalidPortError = stringResource(R.string.settings_http_proxy_error_text2) + val httpProxyRangePortError = stringResource(R.string.settings_http_proxy_error_text1) + val httpProxyToastSuccess = stringResource(R.string.settings_http_proxy_toast_success) + val defaultAppLabel = stringResource(R.string.settings_app_list_default_app) + val orbotStopTitle = stringResource(R.string.orbot_stop_dialog_title) + val orbotStopMessage = stringResource(R.string.orbot_stop_dialog_message) + val orbotStopDnsMessage = stringResource(R.string.orbot_stop_dialog_dns_message) + val orbotStopMessageCombo = + stringResource( + R.string.orbot_stop_dialog_message_combo, + orbotStopMessage, + orbotStopDnsMessage + ) + val defaultWireguardDescription = stringResource(R.string.wireguard_description) + val defaultSocks5Description = stringResource(R.string.settings_socks_forwarding_default_desc) + val defaultHttpDescription = stringResource(R.string.settings_https_desc) + val defaultOrbotDescription = stringResource(R.string.orbot_bs_status_4) + val defaultSocks5NoAppTemplate = stringResource(R.string.settings_socks_forwarding_desc_no_app) + val defaultSocks5WithAppTemplate = stringResource(R.string.settings_socks_forwarding_desc) + val httpProxyDescriptionTemplate = stringResource(R.string.settings_http_proxy_desc) + val orbotStatus2Description = stringResource(R.string.orbot_bs_status_2) + val orbotStatus1Template = stringResource(R.string.orbot_bs_status_1) + val orbotStatus3Template = stringResource(R.string.orbot_bs_status_3) + val orbotStatusArgDns = stringResource(R.string.orbot_status_arg_3) + val orbotStatusArgProxy = stringResource(R.string.orbot_status_arg_2) + val wireguardStatusFailingText = stringResource(R.string.status_failing).replaceFirstChar(Char::titlecase) + val wireguardStatusWaitingText = stringResource(R.string.status_waiting) + val wireguardVersionTemplate = stringResource(R.string.about_version_install_source) + val wireguardIpLabelTemplate = stringResource(R.string.ci_ip_label) + val proxyStatusLabelById = mutableMapOf().apply { + for (status in UIUtils.ProxyStatus.entries) { + put( + status.id, + stringResource(UIUtils.getProxyStatusStringRes(status.id)).replaceFirstChar(Char::titlecase) + ) + } + } + + val orbotHelper = remember(context, persistentState, appConfig) { + OrbotHelper(context, persistentState, appConfig) + } + val listState = rememberLazyListState() + val density = LocalDensity.current + val initialFocus = initialFocusKey?.trim().orEmpty() + var pendingFocusKey by rememberSaveable(initialFocus) { mutableStateOf(initialFocus) } + var activeFocusKey by rememberSaveable(initialFocus) { + mutableStateOf(initialFocus.ifBlank { null }) + } + + var refreshTick by remember { mutableIntStateOf(0) } + var isRefreshing by remember { mutableStateOf(false) } + + var canEnableProxy by remember { mutableStateOf(appConfig.canEnableProxy()) } + var socks5Enabled by remember { mutableStateOf(appConfig.isCustomSocks5Enabled()) } + var httpEnabled by remember { mutableStateOf(appConfig.isCustomHttpProxyEnabled()) } + var orbotEnabled by remember { mutableStateOf(appConfig.isOrbotProxyEnabled()) } + val orbotConnecting = + remember { persistentState.orbotConnectionStatus.asFlow() }.collectAsState(initial = false).value + + var wireguardDescription by remember(defaultWireguardDescription) { mutableStateOf(defaultWireguardDescription) } + var socks5Description by remember(defaultSocks5Description) { mutableStateOf(defaultSocks5Description) } + var httpDescription by remember(defaultHttpDescription) { mutableStateOf(defaultHttpDescription) } + var orbotDescription by remember(defaultOrbotDescription) { mutableStateOf(defaultOrbotDescription) } + + var showOrbotInstallDialog by remember { mutableStateOf(false) } + var showOrbotModeDialog by remember { mutableStateOf(false) } + var showOrbotStopDialog by remember { mutableStateOf(false) } + var showOrbotInfoDialog by remember { mutableStateOf(false) } + var orbotStopHasDnsHint by remember { mutableStateOf(false) } + var selectedOrbotMode by remember { mutableStateOf(AppConfig.ProxyType.SOCKS5.name) } + + var socks5DialogState by remember { mutableStateOf(null) } + var httpDialogState by remember { mutableStateOf(null) } + val orbotAppCount = + if (mappingViewModel != null) { + mappingViewModel.getAppCountById(ProxyManager.ID_ORBOT_BASE) + .asFlow() + .collectAsState(initial = 0) + .value + } else { + 0 + } + + fun logEvent(details: String) { + eventLogger.log( + type = EventType.UI_SETTING_CHANGED, + severity = Severity.LOW, + message = "Proxy settings", + source = EventSource.UI, + userAction = true, + details = details + ) + } + + fun reloadUi() { + refreshTick++ + } + + fun showProxyDisabledToast() { + Utilities.showToastUiCentered( + context, + lockDownProxyDesc, + Toast.LENGTH_SHORT + ) + } + + fun refreshWireguard() { + if (isRefreshing) return + scope.launch { + isRefreshing = true + withContext(Dispatchers.IO) { + VpnController.refreshOrPauseOrResumeOrReAddProxies() + } + delay(REFRESH_TIMEOUT_MS) + Utilities.showToastUiCentered( + context, + refreshToast, + Toast.LENGTH_SHORT + ) + isRefreshing = false + reloadUi() + } + } + + fun openSocksDialog() { + scope.launch { + socks5DialogState = + withContext(Dispatchers.IO) { + buildSocks5DialogState( + context = context, + appConfig = appConfig, + persistentState = persistentState, + defaultApp = defaultAppLabel + ) + } + } + } + + fun openHttpDialog() { + scope.launch { + httpDialogState = + withContext(Dispatchers.IO) { + buildHttpDialogState( + context = context, + appConfig = appConfig, + persistentState = persistentState, + defaultApp = defaultAppLabel + ) + } + } + } + + fun tryOpenCustomProxyDialog( + canEnableSpecificProxy: () -> Boolean, + disabledError: String, + openDialog: () -> Unit + ) { + if (!canEnableProxy) { + showProxyDisabledToast() + reloadUi() + return + } + + if (appConfig.getBraveMode().isDnsMode()) { + Utilities.showToastUiCentered(context, socks5VpnDisabledError, Toast.LENGTH_SHORT) + reloadUi() + return + } + + if (!canEnableSpecificProxy()) { + Utilities.showToastUiCentered(context, disabledError, Toast.LENGTH_SHORT) + reloadUi() + return + } + + openDialog() + } + + fun disableCustomProxy(type: AppConfig.ProxyType, logMessage: String) { + scope.launch { + withContext(Dispatchers.IO) { + appConfig.removeProxy(type, AppConfig.ProxyProvider.CUSTOM) + } + logEvent(logMessage) + reloadUi() + } + } + + fun enableOrbotFlow() { + scope.launch { + if (!canEnableProxy) { + showProxyDisabledToast() + reloadUi() + return@launch + } + + val isInstalled = withContext(Dispatchers.IO) { FirewallManager.isOrbotInstalled() } + if (!isInstalled) { + showOrbotInstallDialog = true + return@launch + } + + if (!appConfig.canEnableOrbotProxy()) { + val msg = + if (providerName.equals(AppConfig.ProxyProvider.CUSTOM.name, ignoreCase = true)) { + orbotDisabledError + } else { + socks5DisabledError + } + Utilities.showToastUiCentered(context, msg, Toast.LENGTH_SHORT) + reloadUi() + return@launch + } + + if (!VpnController.hasTunnel()) { + Utilities.showToastUiCentered( + context, + socks5VpnDisabledError, + Toast.LENGTH_SHORT + ) + reloadUi() + return@launch + } + + selectedOrbotMode = + if (orbotEnabled) appConfig.getProxyType() else AppConfig.ProxyType.SOCKS5.name + showOrbotModeDialog = true + } + } + + fun stopOrbotForwarding(showDialog: Boolean) { + scope.launch { + val hasDnsHint = + withContext(Dispatchers.IO) { + val isOrbotDns = appConfig.isOrbotDns() + appConfig.removeAllProxies() + orbotHelper.stopOrbot(isInteractive = true) + isOrbotDns + } + if (showDialog) { + orbotStopHasDnsHint = hasDnsHint + showOrbotStopDialog = true + } + logEvent("Orbot proxy disabled") + reloadUi() + } + } + + LaunchedEffect(refreshTick) { + val state = + withContext(Dispatchers.IO) { + buildProxyScreenState( + context = context, + appConfig = appConfig, + defaultSocks5Description = defaultSocks5Description, + defaultHttpDescription = defaultHttpDescription, + httpProxyDescriptionTemplate = httpProxyDescriptionTemplate, + defaultSocks5DescriptionNoApp = defaultSocks5NoAppTemplate, + defaultSocks5DescriptionWithApp = defaultSocks5WithAppTemplate, + orbotDisabledDescription = defaultOrbotDescription, + orbotStatus2Description = orbotStatus2Description, + orbotStatus1Template = orbotStatus1Template, + orbotStatus3Template = orbotStatus3Template, + orbotStatusArgDns = orbotStatusArgDns, + orbotStatusArgProxy = orbotStatusArgProxy, + defaultWireguardDescription = defaultWireguardDescription, + statusTextById = proxyStatusLabelById, + statusFailingText = wireguardStatusFailingText, + statusWaitingText = wireguardStatusWaitingText, + wireguardVersionTemplate = wireguardVersionTemplate, + ciIpLabelTemplate = wireguardIpLabelTemplate + ) + } + + canEnableProxy = state.canEnableProxy + socks5Enabled = state.socks5Enabled + httpEnabled = state.httpEnabled + orbotEnabled = state.orbotEnabled + wireguardDescription = state.wireguardDescription + socks5Description = state.socks5Description + httpDescription = state.httpDescription + orbotDescription = state.orbotDescription + } + + LaunchedEffect(pendingFocusKey, canEnableProxy, onWireguardClick != null) { + val key = pendingFocusKey.trim() + if (key.isBlank()) return@LaunchedEffect + activeFocusKey = key + + val showWarning = !canEnableProxy + var index = 0 + if (showWarning && key == "proxy_warning") { + listState.animateScrollToItem(0) + delay(900) + if (activeFocusKey == key) { + activeFocusKey = null + } + pendingFocusKey = "" + return@LaunchedEffect + } + if (showWarning) index++ + + val hasWireguard = onWireguardClick != null + if (hasWireguard && key == "proxy_wireguard") { + listState.animateScrollToItem(index) + delay(900) + if (activeFocusKey == key) { + activeFocusKey = null + } + pendingFocusKey = "" + return@LaunchedEffect + } + if (hasWireguard) index++ + + if (key == "proxy_socks") { + listState.animateScrollToItem(index) + delay(900) + if (activeFocusKey == key) { + activeFocusKey = null + } + pendingFocusKey = "" + return@LaunchedEffect + } + index++ + + if (key == "proxy_http") { + listState.animateScrollToItem(index) + delay(900) + if (activeFocusKey == key) { + activeFocusKey = null + } + pendingFocusKey = "" + return@LaunchedEffect + } + index++ + + val orbotOffsetDp = + when (key) { + "proxy_orbot" -> 0 + "proxy_orbot_apps" -> 70 + "proxy_orbot_open_app", + "proxy_orbot_notification" -> 70 + "proxy_orbot_info" -> if (mappingViewModel != null) 132 else 70 + else -> null + } + + if (orbotOffsetDp != null) { + val offsetPx = with(density) { orbotOffsetDp.dp.toPx().roundToInt() } + listState.animateScrollToItem(index, offsetPx) + delay(900) + if (activeFocusKey == key) { + activeFocusKey = null + } + } + pendingFocusKey = "" + } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.settings_proxy_header), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior, + titleStartPadding = Dimensions.spacingSm, + actions = { + if (canEnableProxy) { + IconButton( + onClick = { refreshWireguard() }, + enabled = !isRefreshing + ) { + if (isRefreshing) { + CircularProgressIndicator( + modifier = Modifier.padding(Dimensions.spacingSm), + strokeWidth = 2.dp + ) + } else { + Icon( + imageVector = Icons.Rounded.Refresh, + contentDescription = stringResource(R.string.dc_refresh_toast) + ) + } + } + } + } + ) + }, + containerColor = MaterialTheme.colorScheme.background + ) { padding -> + LazyColumn( + state = listState, + modifier = Modifier + .fillMaxSize() + .padding(padding), + contentPadding = + PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingMd, + bottom = Dimensions.spacing3xl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + if (!canEnableProxy) { + item { + val warningFocused = activeFocusKey == "proxy_warning" + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusXl), + color = + if (warningFocused) { + MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.72f) + } else { + MaterialTheme.colorScheme.errorContainer + } + ) { + Text( + text = stringResource(R.string.settings_lock_down_proxy_desc), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onErrorContainer, + modifier = + Modifier.padding( + horizontal = Dimensions.spacingMd, + vertical = Dimensions.spacingSmMd + ) + ) + } + } + } + + // Network Proxy (WireGuard) + if (onWireguardClick != null) { + item { + SectionHeader(title = stringResource(R.string.setup_wireguard)) + RethinkListGroup { + RethinkListItem( + headline = stringResource(R.string.setup_wireguard), + supporting = wireguardDescription, + leadingIconPainter = painterResource(id = R.drawable.ic_wireguard_icon), + position = CardPosition.Single, + highlighted = activeFocusKey == "proxy_wireguard", + onClick = { + if (!canEnableProxy) { + showProxyDisabledToast() + } else { + onWireguardClick() + } + } + ) + } + } + } + + // SOCKS5 + item { + SectionHeader(title = stringResource(R.string.settings_socks5_heading)) + RethinkListGroup { + RethinkToggleListItem( + title = stringResource(R.string.settings_socks5_heading), + description = socks5Description, + iconRes = R.drawable.ic_socks5, + checked = socks5Enabled, + position = CardPosition.Single, + highlighted = activeFocusKey == "proxy_socks", + onRowClick = { + if (canEnableProxy && socks5Enabled) { + openSocksDialog() + } else if (!socks5Enabled) { + tryOpenCustomProxyDialog( + canEnableSpecificProxy = { appConfig.canEnableSocks5Proxy() }, + disabledError = socks5DisabledError, + openDialog = ::openSocksDialog + ) + } + }, + onCheckedChange = { enabled -> + if (enabled) { + tryOpenCustomProxyDialog( + canEnableSpecificProxy = { appConfig.canEnableSocks5Proxy() }, + disabledError = socks5DisabledError, + openDialog = ::openSocksDialog + ) + } else { + disableCustomProxy( + type = AppConfig.ProxyType.SOCKS5, + logMessage = "Custom SOCKS5 disabled" + ) + } + } + ) + } + } + + // HTTP + item { + SectionHeader(title = stringResource(R.string.settings_https_heading)) + RethinkListGroup { + RethinkToggleListItem( + title = stringResource(R.string.settings_https_heading), + description = httpDescription, + iconRes = R.drawable.ic_http, + checked = httpEnabled, + position = CardPosition.Single, + highlighted = activeFocusKey == "proxy_http", + onRowClick = { + if (canEnableProxy && httpEnabled) { + openHttpDialog() + } else if (!httpEnabled) { + tryOpenCustomProxyDialog( + canEnableSpecificProxy = { appConfig.canEnableHttpProxy() }, + disabledError = httpDisabledError, + openDialog = ::openHttpDialog + ) + } + }, + onCheckedChange = { enabled -> + if (enabled) { + tryOpenCustomProxyDialog( + canEnableSpecificProxy = { appConfig.canEnableHttpProxy() }, + disabledError = httpDisabledError, + openDialog = ::openHttpDialog + ) + } else { + disableCustomProxy( + type = AppConfig.ProxyType.HTTP, + logMessage = "Custom HTTP disabled" + ) + } + } + ) + } + } + + // Orbot + item { + SectionHeader(title = stringResource(R.string.orbot)) + val isOrbotInteractive = canEnableProxy && !orbotConnecting + OrbotSettingsPanel( + title = stringResource(R.string.orbot), + description = + if (orbotConnecting) { + stringResource(R.string.orbot_bs_status_trying_connect) + } else { + orbotDescription + }, + checked = orbotEnabled, + connecting = orbotConnecting, + enabled = isOrbotInteractive, + appCount = if (mappingViewModel != null) orbotAppCount else null, + highlightedKey = activeFocusKey, + onMainClick = { + if (isOrbotInteractive) { + enableOrbotFlow() + } + }, + onCheckedChange = { checked -> + if (checked) { + enableOrbotFlow() + } else { + stopOrbotForwarding(showDialog = true) + } + }, + onAppsClick = + if (mappingViewModel != null && onOpenOrbotApps != null) { + { onOpenOrbotApps() } + } else { + null + }, + onOpenAppClick = { orbotHelper.openOrbotApp() }, + onInfoClick = { showOrbotInfoDialog = true } + ) + } + } + } + + if (showOrbotInfoDialog) { + RethinkConfirmDialog( + onDismissRequest = { showOrbotInfoDialog = false }, + title = stringResource(R.string.orbot_title), + message = stringResource(R.string.orbot_explanation), + confirmText = stringResource(R.string.lbl_dismiss), + onConfirm = { showOrbotInfoDialog = false } + ) + } + + if (showOrbotInstallDialog) { + RethinkMultiActionDialog( + onDismissRequest = { showOrbotInstallDialog = false }, + title = stringResource(R.string.orbot_install_dialog_title), + message = stringResource(R.string.orbot_install_dialog_message), + primaryText = stringResource(R.string.orbot_install_dialog_positive), + onPrimary = { + showOrbotInstallDialog = false + val installIntent = orbotHelper.getIntentForDownload() + if (installIntent == null) { + Utilities.showToastUiCentered( + context, + orbotInstallError, + Toast.LENGTH_SHORT + ) + return@RethinkMultiActionDialog + } + + try { + context.startActivity(installIntent) + } catch (_: ActivityNotFoundException) { + Utilities.showToastUiCentered( + context, + orbotInstallError, + Toast.LENGTH_SHORT + ) + } + }, + secondaryText = stringResource(R.string.orbot_install_dialog_neutral), + onSecondary = { + showOrbotInstallDialog = false + try { + context.startActivity( + Intent( + Intent.ACTION_VIEW, + orbotWebsiteLink.toUri() + ) + ) + } catch (_: ActivityNotFoundException) { + Utilities.showToastUiCentered( + context, + orbotInstallError, + Toast.LENGTH_SHORT + ) + } + }, + tertiaryText = stringResource(R.string.lbl_dismiss), + onTertiary = { showOrbotInstallDialog = false } + ) + } + + if (showOrbotModeDialog) { + OrbotModeDialog( + supportsHttp = Utilities.isAtleastQ(), + selectedMode = selectedOrbotMode, + onSelectedMode = { selectedOrbotMode = it }, + onDismiss = { showOrbotModeDialog = false }, + onConfirm = { + scope.launch { + showOrbotModeDialog = false + + if (selectedOrbotMode == AppConfig.ProxyType.NONE.name) { + stopOrbotForwarding(showDialog = true) + return@launch + } + + if (!ProxyManager.isAnyAppSelected(ProxyManager.ID_ORBOT_BASE)) { + Utilities.showToastUiCentered( + context, + orbotNoAppToast, + Toast.LENGTH_SHORT + ) + reloadUi() + return@launch + } + + if (!VpnController.hasTunnel()) { + Utilities.showToastUiCentered( + context, + socks5VpnDisabledError, + Toast.LENGTH_SHORT + ) + reloadUi() + return@launch + } + + withContext(Dispatchers.IO) { + persistentState.orbotConnectionStatus.postValue(true) + orbotHelper.startOrbot(selectedOrbotMode) + } + logEvent("Orbot mode updated: $selectedOrbotMode") + reloadUi() + } + } + ) + } + + if (showOrbotStopDialog) { + RethinkMultiActionDialog( + onDismissRequest = { showOrbotStopDialog = false }, + title = orbotStopTitle, + text = { + Text( + text = if (orbotStopHasDnsHint) orbotStopMessageCombo else orbotStopMessage + ) + }, + primaryText = stringResource(R.string.lbl_dismiss), + onPrimary = { showOrbotStopDialog = false }, + secondaryText = if (orbotStopHasDnsHint && onNavigateToDns != null) stringResource(R.string.orbot_stop_dialog_neutral) else null, + onSecondary = if (orbotStopHasDnsHint && onNavigateToDns != null) { + { + showOrbotStopDialog = false + onNavigateToDns() + } + } else { + null + }, + tertiaryText = stringResource(R.string.orbot_stop_dialog_negative), + onTertiary = { + showOrbotStopDialog = false + orbotHelper.openOrbotApp() + } + ) + } + + socks5DialogState?.let { state -> + Socks5Dialog( + state = state, + onStateChange = { socks5DialogState = it }, + onCancel = { + scope.launch { + withContext(Dispatchers.IO) { + appConfig.removeProxy( + AppConfig.ProxyType.SOCKS5, + AppConfig.ProxyProvider.CUSTOM + ) + } + socks5DialogState = null + reloadUi() + } + }, + onConfirm = { + val current = socks5DialogState ?: return@Socks5Dialog + scope.launch { + val validationError = + validateSocks5Input( + current.host, + current.port, + httpProxyHostEmptyError, + httpProxyInvalidPortError, + httpProxyRangePortError + ) + if (validationError != null) { + socks5DialogState = current.copy(error = validationError) + return@launch + } + + withContext(Dispatchers.IO) { + var endpoint = appConfig.getSocks5ProxyDetails() + if (endpoint == null) { + appConfig.addProxy( + AppConfig.ProxyType.SOCKS5, + AppConfig.ProxyProvider.CUSTOM + ) + endpoint = appConfig.getSocks5ProxyDetails() + } + + endpoint?.let { + it.proxyIP = current.host.trim() + it.proxyPort = current.port.toInt() + it.userName = current.username.ifBlank { null } + it.password = current.password.ifBlank { null } + it.proxyAppName = current.selectedAppPackage + it.isUDP = current.udpBlocked + appConfig.updateCustomSocks5Proxy(it) + } + + persistentState.setUdpBlocked(current.udpBlocked) + persistentState.excludeAppsInProxy = !current.includeProxyApps + } + + logEvent( + "Custom SOCKS5 updated: ${current.host}:${current.port}, app=${current.selectedAppLabel()}, udp=${current.udpBlocked}" + ) + socks5DialogState = null + reloadUi() + } + } + ) + } + + httpDialogState?.let { state -> + HttpDialog( + state = state, + onStateChange = { httpDialogState = it }, + onCancel = { + scope.launch { + withContext(Dispatchers.IO) { + appConfig.removeProxy( + AppConfig.ProxyType.HTTP, + AppConfig.ProxyProvider.CUSTOM + ) + } + httpDialogState = null + reloadUi() + } + }, + onConfirm = { + val current = httpDialogState ?: return@HttpDialog + scope.launch { + if (current.host.isBlank()) { + httpDialogState = + current.copy( + error = httpProxyHostEmptyError + ) + return@launch + } + + withContext(Dispatchers.IO) { + var endpoint = appConfig.getHttpProxyDetails() + if (endpoint == null) { + appConfig.addProxy( + AppConfig.ProxyType.HTTP, + AppConfig.ProxyProvider.CUSTOM + ) + endpoint = appConfig.getHttpProxyDetails() + } + + endpoint?.let { + it.proxyIP = current.host.trim() + it.proxyPort = 0 + it.userName = null + it.password = null + it.proxyAppName = current.selectedAppPackage + appConfig.updateCustomHttpProxy(it) + } + + persistentState.excludeAppsInProxy = !current.includeProxyApps + } + + Utilities.showToastUiCentered( + context, + httpProxyToastSuccess, + Toast.LENGTH_SHORT + ) + logEvent( + "Custom HTTP updated: ${current.host}, app=${current.selectedAppLabel()}" + ) + httpDialogState = null + reloadUi() + } + } + ) + } +} + +@OptIn(ExperimentalLayoutApi::class) +@Composable +private fun OrbotSettingsPanel( + title: String, + description: String, + checked: Boolean, + connecting: Boolean, + enabled: Boolean, + appCount: Int?, + highlightedKey: String?, + onMainClick: () -> Unit, + onCheckedChange: (Boolean) -> Unit, + onAppsClick: (() -> Unit)?, + onOpenAppClick: () -> Unit, + onInfoClick: () -> Unit +) { + val mainHighlighted = highlightedKey == "proxy_orbot" + val cardColor = + if (mainHighlighted) { + MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.32f) + } else { + MaterialTheme.colorScheme.surfaceContainerLow + } + + val statusText: String + val statusColor: Color + val statusBackground: Color + if (connecting) { + statusText = stringResource(R.string.status_waiting) + statusColor = MaterialTheme.colorScheme.primary + statusBackground = MaterialTheme.colorScheme.primary.copy(alpha = 0.12f) + } else if (checked) { + statusText = stringResource(R.string.lbl_active) + statusColor = MaterialTheme.colorScheme.tertiary + statusBackground = MaterialTheme.colorScheme.tertiary.copy(alpha = 0.14f) + } else { + statusText = stringResource(R.string.lbl_inactive) + statusColor = MaterialTheme.colorScheme.onSurfaceVariant + statusBackground = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.14f) + } + + val iconTint = if (connecting || checked) statusColor else MaterialTheme.colorScheme.onSurfaceVariant + val showActions = enabled + + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadius3xl), + color = cardColor, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.22f)) + ) { + Column( + modifier = + Modifier.padding( + horizontal = Dimensions.spacingMd, + vertical = Dimensions.spacingSmMd + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .clickable(enabled = enabled, onClick = onMainClick), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSmMd), + verticalAlignment = Alignment.CenterVertically + ) { + Surface( + shape = RoundedCornerShape(12.dp), + color = statusBackground, + modifier = Modifier.size(34.dp) + ) { + Row( + modifier = Modifier.fillMaxSize(), + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + painter = painterResource(id = R.drawable.ic_orbot), + contentDescription = null, + tint = iconTint, + modifier = Modifier.size(18.dp) + ) + } + } + + Column( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(2.dp) + ) { + Text( + text = title, + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold + ) + Surface( + shape = RoundedCornerShape(Dimensions.buttonCornerRadius), + color = statusBackground + ) { + Text( + text = statusText, + style = MaterialTheme.typography.labelSmall, + fontWeight = FontWeight.SemiBold, + color = statusColor, + modifier = + Modifier.padding( + horizontal = 8.dp, + vertical = 2.dp + ) + ) + } + } + + Switch( + checked = checked, + enabled = enabled, + onCheckedChange = onCheckedChange + ) + } + + Text( + text = description, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 3, + overflow = TextOverflow.Ellipsis + ) + + if (showActions) { + HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.34f)) + FlowRow( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + if (appCount != null && onAppsClick != null) { + OrbotAppsActionChip( + appCount = appCount, + highlighted = highlightedKey == "proxy_orbot_apps", + onClick = onAppsClick + ) + } + OrbotActionChip( + label = stringResource(R.string.settings_orbot_notification_action), + icon = Icons.AutoMirrored.Filled.ArrowForward, + highlighted = + highlightedKey == "proxy_orbot_open_app" || + highlightedKey == "proxy_orbot_notification", + onClick = onOpenAppClick + ) + OrbotActionChip( + label = stringResource(R.string.lbl_info), + icon = Icons.Rounded.Info, + highlighted = highlightedKey == "proxy_orbot_info", + onClick = onInfoClick + ) + } + } + } + } +} + +@Composable +private fun OrbotAppsActionChip( + appCount: Int, + highlighted: Boolean, + onClick: () -> Unit +) { + val containerColor = + if (highlighted) { + MaterialTheme.colorScheme.primaryContainer + } else { + MaterialTheme.colorScheme.surface + } + val contentColor = + if (highlighted) { + MaterialTheme.colorScheme.onPrimaryContainer + } else { + MaterialTheme.colorScheme.onSurface + } + val badgeColor = + if (highlighted) { + MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.12f) + } else { + MaterialTheme.colorScheme.primary.copy(alpha = 0.14f) + } + + Surface( + modifier = + Modifier + .heightIn(min = Dimensions.touchTargetSm) + .clickable(onClick = onClick), + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + color = containerColor, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.28f)) + ) { + Row( + modifier = + Modifier.padding( + horizontal = Dimensions.spacingMd, + vertical = Dimensions.spacingXs + ), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingXs), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = Icons.Rounded.Apps, + contentDescription = null, + tint = contentColor, + modifier = Modifier.size(16.dp) + ) + Text( + text = stringResource(R.string.lbl_apps), + style = MaterialTheme.typography.labelMedium, + fontWeight = FontWeight.Medium, + color = contentColor + ) + Surface( + shape = RoundedCornerShape(Dimensions.buttonCornerRadius), + color = badgeColor + ) { + Text( + text = appCount.toString(), + style = MaterialTheme.typography.labelSmall, + fontWeight = FontWeight.SemiBold, + color = contentColor, + modifier = Modifier.padding(horizontal = 7.dp, vertical = 1.dp) + ) + } + } + } +} + +@Composable +private fun OrbotActionChip( + label: String, + icon: androidx.compose.ui.graphics.vector.ImageVector, + highlighted: Boolean, + onClick: () -> Unit +) { + val containerColor = + if (highlighted) { + MaterialTheme.colorScheme.primaryContainer + } else { + MaterialTheme.colorScheme.surface + } + val contentColor = + if (highlighted) { + MaterialTheme.colorScheme.onPrimaryContainer + } else { + MaterialTheme.colorScheme.onSurface + } + + Surface( + modifier = + Modifier + .heightIn(min = Dimensions.touchTargetSm) + .clickable(onClick = onClick), + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + color = containerColor, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.28f)) + ) { + Row( + modifier = + Modifier.padding( + horizontal = Dimensions.spacingMd, + vertical = Dimensions.spacingXs + ), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingXs), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + imageVector = icon, + contentDescription = null, + tint = contentColor, + modifier = Modifier.size(16.dp) + ) + Text( + text = label, + style = MaterialTheme.typography.labelMedium, + fontWeight = FontWeight.Medium, + color = contentColor, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + } +} + +@Composable +private fun ProxyOverviewCard( + canEnableProxy: Boolean, + socks5Enabled: Boolean, + httpEnabled: Boolean, + orbotEnabled: Boolean +) { + val activeCount = listOf(socks5Enabled, httpEnabled, orbotEnabled).count { it } + + Surface( + shape = RoundedCornerShape(Dimensions.cardCornerRadiusLarge), + color = MaterialTheme.colorScheme.surfaceContainerLow, + tonalElevation = Dimensions.Elevation.low, + border = + androidx.compose.foundation.BorderStroke( + Dimensions.dividerThicknessBold, + MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f) + ) + ) { + Column( + modifier = Modifier.padding(Dimensions.spacingXl), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + Text( + text = stringResource(R.string.settings_proxy_header), + style = MaterialTheme.typography.titleMedium, + fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold + ) + Text( + text = stringResource(R.string.settings_exclude_proxy_apps_desc), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Text( + text = "Active: $activeCount / 3", + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.primary + ) + if (!canEnableProxy) { + Text( + text = stringResource(R.string.settings_lock_down_proxy_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error + ) + } + } + } +} + +@Composable +private fun WireguardEntryCard( + title: String, + description: String, + enabled: Boolean, + onClick: () -> Unit +) { + Card( + modifier = + Modifier + .fillMaxWidth() + .clickable(enabled = enabled, onClick = onClick) + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(Dimensions.spacingLg), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium + ) + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + Text( + text = description, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = if (enabled) 0.75f else 0.45f) + ) + } + Icon( + imageVector = Icons.AutoMirrored.Filled.ArrowForward, + contentDescription = null + ) + } + } +} + +@Composable +private fun ProxyCard( + title: String, + description: String, + enabled: Boolean, + cardEnabled: Boolean, + onEnabledChange: (Boolean) -> Unit, + onConfigureClick: (() -> Unit)? +) { + Card(modifier = Modifier.fillMaxWidth()) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(Dimensions.spacingLg) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = title, + style = MaterialTheme.typography.titleMedium + ) + Switch( + checked = enabled, + enabled = cardEnabled, + onCheckedChange = onEnabledChange + ) + } + + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + + Text( + text = description, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = if (cardEnabled) 0.75f else 0.45f) + ) + + if (onConfigureClick != null && cardEnabled) { + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + TextButton(onClick = onConfigureClick) { + Text(text = stringResource(R.string.lbl_configure)) + } + } + } + } +} + +@Composable +private fun OrbotModeDialog( + supportsHttp: Boolean, + selectedMode: String, + onSelectedMode: (String) -> Unit, + onDismiss: () -> Unit, + onConfirm: () -> Unit +) { + val options = + buildList { + add(AppConfig.ProxyType.SOCKS5.name to R.string.orbot_socks5) + if (supportsHttp) { + add(AppConfig.ProxyType.HTTP.name to R.string.orbot_http) + add(AppConfig.ProxyType.HTTP_SOCKS5.name to R.string.orbot_both) + } + add(AppConfig.ProxyType.NONE.name to R.string.orbot_none) + } + + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = stringResource(R.string.orbot_title), + text = { + Column(verticalArrangement = Arrangement.spacedBy(Dimensions.spacingXs)) { + options.forEach { (value, labelRes) -> + Row( + modifier = + Modifier + .fillMaxWidth() + .clickable { onSelectedMode(value) } + .padding(vertical = Dimensions.spacingXs), + verticalAlignment = Alignment.CenterVertically + ) { + RadioButton( + selected = selectedMode == value, + onClick = { onSelectedMode(value) } + ) + Text( + text = stringResource(labelRes), + style = MaterialTheme.typography.bodyLarge + ) + } + } + } + }, + confirmText = stringResource(R.string.lbl_save), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = onConfirm, + onDismiss = onDismiss + ) +} + +@Composable +private fun Socks5Dialog( + state: Socks5DialogState, + onStateChange: (Socks5DialogState) -> Unit, + onCancel: () -> Unit, + onConfirm: () -> Unit +) { + val context = LocalContext.current + + RethinkConfirmDialog( + onDismissRequest = {}, + title = stringResource(R.string.settings_dns_proxy_dialog_header), + text = { + Column( + modifier = Modifier.verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + OutlinedTextField( + value = state.host, + onValueChange = { onStateChange(state.copy(host = it, error = null)) }, + label = { Text(text = stringResource(R.string.proxy_host_label)) }, + singleLine = true, + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = state.port, + onValueChange = { onStateChange(state.copy(port = it, error = null)) }, + label = { Text(text = stringResource(R.string.proxy_port_label)) }, + singleLine = true, + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = state.username, + onValueChange = { onStateChange(state.copy(username = it, error = null)) }, + label = { Text(text = stringResource(R.string.proxy_username_optional_label)) }, + singleLine = true, + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = state.password, + onValueChange = { onStateChange(state.copy(password = it, error = null)) }, + label = { Text(text = stringResource(R.string.proxy_password_optional_label)) }, + singleLine = true, + modifier = Modifier.fillMaxWidth() + ) + + Text( + text = stringResource(R.string.settings_dns_proxy_dialog_app_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + + ProxyAppSelectorField( + selectedPackageName = state.selectedAppPackage, + options = state.appOptions, + onOptionSelected = { packageName -> + onStateChange(state.copy(selectedAppPackage = packageName, error = null)) + } + ) + + Row( + modifier = + Modifier + .fillMaxWidth() + .clickable { + onStateChange( + state.copy(udpBlocked = !state.udpBlocked, error = null) + ) + }, + verticalAlignment = Alignment.CenterVertically + ) { + Switch( + checked = state.udpBlocked, + onCheckedChange = { + onStateChange(state.copy(udpBlocked = it, error = null)) + } + ) + Text( + text = stringResource(R.string.settings_udp_block), + modifier = Modifier.padding(start = Dimensions.spacingSm) + ) + } + + Row( + modifier = + Modifier + .fillMaxWidth() + .clickable(enabled = !state.lockdown) { + onStateChange( + state.copy( + includeProxyApps = !state.includeProxyApps, + error = null + ) + ) + }, + verticalAlignment = Alignment.CenterVertically + ) { + Switch( + checked = state.includeProxyApps, + enabled = !state.lockdown, + onCheckedChange = { + onStateChange(state.copy(includeProxyApps = it, error = null)) + } + ) + Text( + text = stringResource(R.string.settings_exclude_proxy_apps_heading), + modifier = Modifier.padding(start = Dimensions.spacingSm) + ) + } + + if (state.lockdown) { + Text( + text = stringResource(R.string.settings_lock_down_mode_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + modifier = Modifier.clickable { UIUtils.openVpnProfile(context) } + ) + } + + if (!state.error.isNullOrBlank()) { + Text( + text = state.error, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error + ) + } + } + }, + confirmText = stringResource(R.string.lbl_save), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = onConfirm, + onDismiss = onCancel + ) +} + +@Composable +private fun HttpDialog( + state: HttpDialogState, + onStateChange: (HttpDialogState) -> Unit, + onCancel: () -> Unit, + onConfirm: () -> Unit +) { + val context = LocalContext.current + + RethinkConfirmDialog( + onDismissRequest = {}, + title = stringResource(R.string.http_proxy_dialog_heading), + text = { + Column( + modifier = Modifier.verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + Text( + text = stringResource(R.string.http_proxy_dialog_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + OutlinedTextField( + value = state.host, + onValueChange = { onStateChange(state.copy(host = it, error = null)) }, + label = { Text(text = stringResource(R.string.proxy_host_label)) }, + singleLine = true, + modifier = Modifier.fillMaxWidth() + ) + + Text( + text = stringResource(R.string.settings_dns_proxy_dialog_app_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + ProxyAppSelectorField( + selectedPackageName = state.selectedAppPackage, + options = state.appOptions, + onOptionSelected = { packageName -> + onStateChange(state.copy(selectedAppPackage = packageName, error = null)) + } + ) + + Row( + modifier = + Modifier + .fillMaxWidth() + .clickable(enabled = !state.lockdown) { + onStateChange( + state.copy( + includeProxyApps = !state.includeProxyApps, + error = null + ) + ) + }, + verticalAlignment = Alignment.CenterVertically + ) { + Switch( + checked = state.includeProxyApps, + enabled = !state.lockdown, + onCheckedChange = { + onStateChange(state.copy(includeProxyApps = it, error = null)) + } + ) + Text( + text = stringResource(R.string.settings_exclude_proxy_apps_heading), + modifier = Modifier.padding(start = Dimensions.spacingSm) + ) + } + + if (state.lockdown) { + Text( + text = stringResource(R.string.settings_lock_down_mode_desc), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + modifier = Modifier.clickable { UIUtils.openVpnProfile(context) } + ) + } + + if (!state.error.isNullOrBlank()) { + Text( + text = state.error, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error + ) + } + } + }, + confirmText = stringResource(R.string.lbl_save), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = onConfirm, + onDismiss = onCancel + ) +} + +private fun Socks5DialogState.selectedAppLabel(): String { + return selectedProxyAppLabel(selectedAppPackage, appOptions) +} + +private fun HttpDialogState.selectedAppLabel(): String { + return selectedProxyAppLabel(selectedAppPackage, appOptions) +} + +private fun selectedProxyAppLabel(selectedPackageName: String, options: List): String { + return options.firstOrNull { it.packageName == selectedPackageName }?.label + ?: options.firstOrNull()?.label + ?: "" +} + +@Composable +private fun ProxyAppSelectorField( + selectedPackageName: String, + options: List, + onOptionSelected: (String) -> Unit, + modifier: Modifier = Modifier, + enabled: Boolean = true +) { + var expanded by remember { mutableStateOf(false) } + var anchorSize by remember { mutableStateOf(IntSize.Zero) } + var anchorOffset by remember { mutableStateOf(IntOffset.Zero) } + val density = LocalDensity.current + val selectorShape = RoundedCornerShape(Dimensions.cornerRadiusMdLg) + val selectedOption = + options.firstOrNull { it.packageName == selectedPackageName } ?: options.firstOrNull() + val containerColor = + if (enabled) { + MaterialTheme.colorScheme.surfaceContainerLow + } else { + MaterialTheme.colorScheme.surfaceVariant + } + + Box(modifier = modifier.fillMaxWidth()) { + Surface( + shape = selectorShape, + color = containerColor, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f)), + modifier = + Modifier + .fillMaxWidth() + .onGloballyPositioned { coordinates -> + anchorSize = coordinates.size + val windowPos = coordinates.positionInWindow() + anchorOffset = IntOffset(windowPos.x.roundToInt(), windowPos.y.roundToInt()) + } + .clip(selectorShape) + .clickable(enabled = enabled) { expanded = true } + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = Dimensions.spacingMd, vertical = Dimensions.spacingSm), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + ProxyDialogAppIcon(option = selectedOption, size = 24.dp) + Text( + text = selectedOption?.label.orEmpty(), + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onSurface, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f) + ) + Icon( + imageVector = Icons.Filled.KeyboardArrowDown, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + if (expanded && enabled && anchorSize.width > 0) { + Popup( + alignment = Alignment.TopStart, + offset = IntOffset(anchorOffset.x, anchorOffset.y + anchorSize.height), + onDismissRequest = { expanded = false }, + properties = PopupProperties(focusable = true, clippingEnabled = true) + ) { + Surface( + shape = selectorShape, + color = MaterialTheme.colorScheme.surfaceContainerHigh, + shadowElevation = 8.dp, + tonalElevation = 6.dp, + modifier = + Modifier + .width(with(density) { anchorSize.width.toDp() }) + .heightIn(max = 360.dp) + .clip(selectorShape) + ) { + LazyColumn(modifier = Modifier.fillMaxWidth()) { + items(items = options) { option -> + DropdownMenuItem( + leadingIcon = { ProxyDialogAppIcon(option = option, size = 20.dp) }, + text = { + Text( + text = option.label, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + }, + onClick = { + expanded = false + onOptionSelected(option.packageName) + } + ) + } + } + } + } + } + } +} + +@Composable +private fun ProxyDialogAppIcon( + option: ProxyDialogAppOption?, + size: androidx.compose.ui.unit.Dp +) { + if (option == null || option.packageName.isBlank()) { + ProxyDialogIconPlaceholder(size = size) + return + } + + val context = LocalContext.current + val cacheKey = option.packageName.ifBlank { option.iconLookupName } + var iconDrawable by + remember(cacheKey) { + mutableStateOf( + if (cacheKey.isBlank()) { + null + } else { + ProxyDialogAppIconCache.get(cacheKey) + } + ) + } + + LaunchedEffect(cacheKey, option.packageName, option.iconLookupName) { + if (iconDrawable != null || option.packageName.isBlank()) return@LaunchedEffect + val icon = + withContext(Dispatchers.IO) { + getIcon(context, option.packageName, option.iconLookupName) + } + iconDrawable = icon + ProxyDialogAppIconCache.put(cacheKey, icon) + } + + val painter = rememberDrawablePainter(iconDrawable) + if (painter != null) { + Image( + painter = painter, + contentDescription = null, + modifier = + Modifier + .size(size) + .clip(RoundedCornerShape(8.dp)) + ) + } else { + ProxyDialogIconPlaceholder(size = size) + } +} + +@Composable +private fun ProxyDialogIconPlaceholder(size: androidx.compose.ui.unit.Dp) { + Surface( + shape = RoundedCornerShape(8.dp), + color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.72f), + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.28f)), + modifier = Modifier.size(size) + ) {} +} + +private suspend fun buildProxyScreenState( + context: android.content.Context, + appConfig: AppConfig, + defaultSocks5Description: String, + defaultHttpDescription: String, + httpProxyDescriptionTemplate: String, + defaultSocks5DescriptionNoApp: String, + defaultSocks5DescriptionWithApp: String, + orbotDisabledDescription: String, + orbotStatus2Description: String, + orbotStatus1Template: String, + orbotStatus3Template: String, + orbotStatusArgDns: String, + orbotStatusArgProxy: String, + defaultWireguardDescription: String, + statusTextById: Map, + statusFailingText: String, + statusWaitingText: String, + wireguardVersionTemplate: String, + ciIpLabelTemplate: String +): ProxyScreenState { + val canEnableProxy = appConfig.canEnableProxy() + val socks5Enabled = appConfig.isCustomSocks5Enabled() + val httpEnabled = appConfig.isCustomHttpProxyEnabled() + val orbotEnabled = appConfig.isOrbotProxyEnabled() + + val socks5Description = + if (!socks5Enabled) { + defaultSocks5Description + } else { + formatSocks5Description( + context, + runCatching { appConfig.getSocks5ProxyDetails() }.getOrNull(), + defaultSocks5Description, + defaultSocks5DescriptionNoApp, + defaultSocks5DescriptionWithApp + ) + } + + val httpDescription = + if (!httpEnabled) { + defaultHttpDescription + } else { + val endpoint = runCatching { appConfig.getHttpProxyDetails() }.getOrNull() + val host = endpoint?.proxyIP ?: "" + if (host.isBlank()) { + defaultHttpDescription + } else { + String.format(httpProxyDescriptionTemplate, host) + } + } + + val orbotDescription = + formatOrbotDescription( + context, + appConfig, + orbotDisabledDescription, + orbotStatus2Description, + orbotStatus1Template, + orbotStatus3Template, + orbotStatusArgDns, + orbotStatusArgProxy + ) + val wireguardDescription = + formatWireguardDescription( + defaultWireguardDescription, + statusTextById, + statusWaitingText, + statusFailingText, + wireguardVersionTemplate, + ciIpLabelTemplate + ) + + return ProxyScreenState( + canEnableProxy = canEnableProxy, + socks5Enabled = socks5Enabled, + httpEnabled = httpEnabled, + orbotEnabled = orbotEnabled, + wireguardDescription = wireguardDescription, + socks5Description = socks5Description, + httpDescription = httpDescription, + orbotDescription = orbotDescription + ) +} + +private suspend fun formatSocks5Description( + context: android.content.Context, + endpoint: ProxyEndpoint?, + defaultDescription: String, + defaultDescriptionNoAppTemplate: String, + defaultDescriptionWithAppTemplate: String +): String { + val endpointValue = endpoint ?: return defaultDescription + if (endpointValue.proxyIP.isNullOrBlank()) { + return defaultDescription + } + + val ip = endpointValue.proxyIP ?: return defaultDescription + val port = endpointValue.proxyPort.toString() + val packageName = endpointValue.proxyAppName + if (packageName.isNullOrBlank()) { + return String.format(defaultDescriptionNoAppTemplate, ip, port) + } + + val appName = FirewallManager.getAppInfoByPackage(packageName)?.appName + return if (appName.isNullOrBlank()) { + String.format(defaultDescriptionNoAppTemplate, ip, port) + } else { + String.format(defaultDescriptionWithAppTemplate, ip, port, appName) + } +} + +private suspend fun formatOrbotDescription( + context: android.content.Context, + appConfig: AppConfig, + orbotDisabledDescription: String, + orbotStatus2Description: String, + orbotStatus1Template: String, + orbotStatus3Template: String, + orbotStatusArgDns: String, + orbotStatusArgProxy: String +): String { + val isInstalled = FirewallManager.isOrbotInstalled() + if (!isInstalled) { + return orbotDisabledDescription + } + + if (!appConfig.isOrbotProxyEnabled()) { + return orbotDisabledDescription + } + + val isOrbotDns = appConfig.isOrbotDns() + return when (appConfig.getProxyType()) { + AppConfig.ProxyType.HTTP.name -> { + orbotStatus2Description + } + + AppConfig.ProxyType.SOCKS5.name -> { + if (isOrbotDns) { + String.format(orbotStatus1Template, orbotStatusArgDns) + } else { + String.format(orbotStatus1Template, orbotStatusArgProxy) + } + } + + AppConfig.ProxyType.HTTP_SOCKS5.name -> { + if (isOrbotDns) { + String.format(orbotStatus3Template, orbotStatusArgDns) + } else { + String.format(orbotStatus3Template, orbotStatusArgProxy) + } + } + + else -> orbotDisabledDescription + } +} + +private suspend fun formatWireguardDescription( + defaultDescription: String, + statusTextById: Map, + statusWaitingText: String, + statusFailingText: String, + wireguardVersionTemplate: String, + ciIpLabelTemplate: String +): String { + val activeWgs = WireguardManager.getActiveConfigs() + if (activeWgs.isEmpty()) { + return defaultDescription + } + + val details = StringBuilder() + activeWgs.forEach { + val id = ProxyManager.ID_WG_BASE + it.getId() + val statusPair = VpnController.getProxyStatusById(id) + val stats = VpnController.getProxyStats(id) + val dnsStatusId = VpnController.getDnsStatus(id) + + val statusText = + if (statusPair.first == Backend.TPU) { + statusTextById[UIUtils.ProxyStatus.TPU.id] ?: statusFailingText + } else if (isDnsError(dnsStatusId)) { + statusFailingText + } else { + getProxyStatusText( + statusPair = statusPair, + stats = stats, + statusTextById = statusTextById, + statusWaitingText = statusWaitingText, + statusFailingText = statusFailingText, + wireguardVersionTemplate = wireguardVersionTemplate + ) + } + + details.append( + String.format( + ciIpLabelTemplate, + it.getName(), + statusText.padStart(1, ' ') + ) + ) + details.append('\n') + } + + return details.toString().trimEnd() +} + +private fun isDnsError(statusId: Long?): Boolean { + if (statusId == null) return true + + val s = Transaction.Status.fromId(statusId) + return s == Transaction.Status.BAD_QUERY || + s == Transaction.Status.BAD_RESPONSE || + s == Transaction.Status.NO_RESPONSE || + s == Transaction.Status.SEND_FAIL || + s == Transaction.Status.CLIENT_ERROR || + s == Transaction.Status.INTERNAL_ERROR || + s == Transaction.Status.TRANSPORT_ERROR +} + +private fun getProxyStatusText( + statusPair: Pair, + stats: RouterStats?, + statusTextById: Map, + statusWaitingText: String, + statusFailingText: String, + wireguardVersionTemplate: String +): String { + val status = UIUtils.ProxyStatus.entries.find { it.id == statusPair.first } + if (status == null) { + val txt = + if (!statusPair.second.isNullOrBlank()) { + "$statusWaitingText (${statusPair.second})" + } else { + statusWaitingText + } + return txt.replaceFirstChar(Char::titlecase) + } + + val now = System.currentTimeMillis() + val lastOk = stats?.lastOK ?: 0L + val since = stats?.since ?: 0L + if (now - since > WireguardManager.WG_UPTIME_THRESHOLD && lastOk == 0L) { + return statusFailingText + } + + val baseText = + statusTextById.getValue(status.id) + val handshakeTime = + if (stats != null && stats.lastOK > 0L) { + DateUtils.getRelativeTimeSpanString( + stats.lastOK, + now, + DateUtils.MINUTE_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE + ) + .toString() + } else { + null + } + + return if (stats?.lastOK != 0L && handshakeTime != null) { + String.format(wireguardVersionTemplate, baseText, handshakeTime) + } else { + baseText + } +} + +private suspend fun buildSocks5DialogState( + context: android.content.Context, + appConfig: AppConfig, + persistentState: PersistentState, + defaultApp: String +): Socks5DialogState { + val endpoint = runCatching { appConfig.getSocks5ProxyDetails() }.getOrNull() + val appOptions = buildProxyDialogAppOptions(context, defaultApp) + val selectedPackage = endpoint?.proxyAppName.orEmpty() + val normalizedSelectedPackage = + if (appOptions.any { it.packageName == selectedPackage }) { + selectedPackage + } else { + "" + } + + return Socks5DialogState( + host = endpoint?.proxyIP ?: com.celzero.bravedns.util.Constants.SOCKS_DEFAULT_IP, + port = + if ((endpoint?.proxyPort ?: 0) > 0) { + endpoint?.proxyPort?.toString() ?: com.celzero.bravedns.util.Constants.SOCKS_DEFAULT_PORT.toString() + } else { + com.celzero.bravedns.util.Constants.SOCKS_DEFAULT_PORT.toString() + }, + username = endpoint?.userName.orEmpty(), + password = endpoint?.password.orEmpty(), + selectedAppPackage = normalizedSelectedPackage, + appOptions = appOptions, + udpBlocked = persistentState.getUdpBlocked(), + includeProxyApps = !persistentState.excludeAppsInProxy, + lockdown = VpnController.isVpnLockdown() + ) +} + +private suspend fun buildHttpDialogState( + context: android.content.Context, + appConfig: AppConfig, + persistentState: PersistentState, + defaultApp: String +): HttpDialogState { + val endpoint = runCatching { appConfig.getHttpProxyDetails() }.getOrNull() + val appOptions = buildProxyDialogAppOptions(context, defaultApp) + + val selectedPackage = endpoint?.proxyAppName.orEmpty() + val normalizedSelectedPackage = + if (appOptions.any { it.packageName == selectedPackage }) { + selectedPackage + } else { + "" + } + + return HttpDialogState( + host = endpoint?.proxyIP ?: "http://127.0.0.1:8118", + selectedAppPackage = normalizedSelectedPackage, + appOptions = appOptions, + includeProxyApps = !persistentState.excludeAppsInProxy, + lockdown = VpnController.isVpnLockdown() + ) +} + +private suspend fun buildProxyDialogAppOptions( + context: android.content.Context, + defaultApp: String +): List { + val sortedApps = FirewallManager.getAllAppsSortedByVpnPermission(context) + val duplicateCountByName = sortedApps.groupingBy { it.appName }.eachCount() + + return buildList { + add(ProxyDialogAppOption(packageName = "", label = defaultApp)) + sortedApps.forEach { appInfo -> + val appName = appInfo.appName + val packageName = appInfo.packageName.orEmpty() + val label = + if (duplicateCountByName[appName] ?: 0 > 1 && packageName.isNotBlank()) { + "$appName ($packageName)" + } else { + appName + } + add( + ProxyDialogAppOption( + packageName = packageName, + label = label, + iconLookupName = appName + ) + ) + } + } +} + +private fun validateSocks5Input( + host: String, + portText: String, + emptyHostError: String, + invalidPortError: String, + portRangeError: String +): String? { + if (host.isBlank()) { + return emptyHostError + } + + val port = + try { + portText.toInt() + } catch (_: NumberFormatException) { + return invalidPortError + } + + val valid = + if (Utilities.isLanIpv4(host)) { + Utilities.isValidLocalPort(port) + } else { + Utilities.isValidPort(port) + } + if (!valid) { + return portRangeError + } + + return null +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/settings/TunnelSettingsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/TunnelSettingsScreen.kt new file mode 100644 index 000000000..e33e5ee52 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/settings/TunnelSettingsScreen.kt @@ -0,0 +1,1168 @@ +/* + * Copyright 2023 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.settings + +import android.content.Context +import android.widget.Toast +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.NetworkCheck +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.filled.Tune +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Slider +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkActionListItem +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkToggleListItem +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.ui.dialog.CustomLanIpSheet +import com.celzero.bravedns.ui.dialog.NetworkReachabilitySheet +import com.celzero.bravedns.util.Constants +import com.celzero.bravedns.util.InternetProtocol +import com.celzero.bravedns.util.NewSettingsManager +import com.celzero.bravedns.util.UIUtils +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.isAtleastQ +import com.celzero.bravedns.util.Utilities.showToastUiCentered +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlin.math.roundToInt + +private const val SECONDS_PER_MINUTE = 60 +private const val SECONDS_PER_HOUR = 3600 +private const val POLICY_AUTO = 0 +private const val POLICY_SENSITIVE = 1 +private const val POLICY_RELAXED = 2 +private const val POLICY_FIXED = 3 +private const val IP_DIALOG_POS_IPV4 = 0 +private const val IP_DIALOG_POS_IPV6 = 1 +private const val IP_DIALOG_POS_ALWAYS_V46 = 2 +private const val IP_DIALOG_POS_V46 = 3 + +private data class NetworkPolicyOption(val title: String, val description: String) + +private fun tunnelFocusTarget( + focusKey: String, + isLockdown: Boolean, + showConnectivityChecksOption: Boolean, + showPingIps: Boolean, + showAllowIncoming: Boolean, + showVpnMetered: Boolean +): Pair? { + val networkIndex = if (isLockdown) 2 else 1 + val advancedIndex = if (isLockdown) 3 else 2 + val timeoutIndex = if (isLockdown) 4 else 3 + val rowHeight = 82 + val groupStart = 62 + + fun groupOffset(row: Int): Int = groupStart + (rowHeight * row) + + val networkRow = + when (focusKey) { + "network_allow_bypass" -> 0 + "network_fail_open" -> 1 + "network_allow_lan" -> 2 + "network_all_networks" -> 3 + "network_exclude_apps_proxy" -> 4 + "network_protocol_translation" -> 5 + else -> null + } + + val advancedRows = mutableMapOf() + var row = 0 + fun addAdvancedRow(key: String, visible: Boolean = true) { + if (!visible) return + advancedRows[key] = row + row++ + } + + addAdvancedRow("network_default_dns") + addAdvancedRow("network_vpn_policy") + addAdvancedRow("network_ip_protocol") + addAdvancedRow("network_connectivity_checks", showConnectivityChecksOption) + addAdvancedRow("network_ping_ips", showPingIps) + addAdvancedRow("network_mobile_metered") + addAdvancedRow("network_wg_listen_port") + addAdvancedRow("network_wg_lockdown") + addAdvancedRow("network_endpoint_independence") + addAdvancedRow("network_allow_incoming_wg", showAllowIncoming) + addAdvancedRow("network_tcp_keep_alive") + addAdvancedRow("network_jumbo_packets") + addAdvancedRow("network_vpn_metered", showVpnMetered) + addAdvancedRow("network_custom_lan_ip") + val advancedRow = advancedRows[focusKey] + + return when (focusKey) { + "network_core" -> networkIndex to 0 + "network_advanced" -> advancedIndex to 0 + "network_dial_timeout" -> timeoutIndex to 0 + else -> { + when { + networkRow != null -> networkIndex to groupOffset(networkRow) + advancedRow != null -> advancedIndex to groupOffset(advancedRow) + else -> null + } + } + } +} + +private fun tunnelFocusIndex(focusKey: String, isLockdown: Boolean): Int? { + val networkIndex = if (isLockdown) 2 else 1 + val advancedIndex = if (isLockdown) 3 else 2 + val timeoutIndex = if (isLockdown) 4 else 3 + return when (focusKey) { + "network_core", + "network_allow_bypass", + "network_fail_open", + "network_allow_lan", + "network_all_networks", + "network_exclude_apps_proxy", + "network_protocol_translation" -> networkIndex + "network_advanced", + "network_default_dns", + "network_vpn_policy", + "network_ip_protocol", + "network_connectivity_checks", + "network_ping_ips", + "network_mobile_metered", + "network_wg_listen_port", + "network_wg_lockdown", + "network_endpoint_independence", + "network_allow_incoming_wg", + "network_tcp_keep_alive", + "network_jumbo_packets", + "network_vpn_metered", + "network_custom_lan_ip" -> advancedIndex + "network_dial_timeout" -> timeoutIndex + else -> null + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun TunnelSettingsScreen( + persistentState: PersistentState, + appConfig: AppConfig, + eventLogger: EventLogger, + onOpenVpnProfile: () -> Unit, + initialFocusKey: String? = null, + onBackClick: (() -> Unit)? = null +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val disabledText = stringResource(R.string.lbl_disabled) + val protocolTranslationInactiveText = stringResource(R.string.settings_protocol_translation_dns_inactive) + val socks5VpnDisabledErrorText = stringResource(R.string.settings_socks5_vpn_disabled_error) + + var isLockdown by remember { mutableStateOf(VpnController.isVpnLockdown()) } + var allowBypass by remember { mutableStateOf(persistentState.allowBypass) } + var allowBypassLoading by remember { mutableStateOf(false) } + var useMultipleNetworks by remember { mutableStateOf(persistentState.useMultipleNetworks) } + var routeLan by remember { mutableStateOf(persistentState.privateIps) } + var excludeApps by remember { mutableStateOf(!persistentState.excludeAppsInProxy) } + var stallNoNetwork by remember { mutableStateOf(persistentState.stallOnNoNetwork) } + var protocolTranslation by remember { mutableStateOf(persistentState.protocolTranslationType) } + var meteredOnlyMobile by remember { mutableStateOf(persistentState.treatOnlyMobileNetworkAsMetered) } + var listenPortFixed by remember { mutableStateOf(!persistentState.randomizeListenPort) } + var wgLockdown by remember { mutableStateOf(persistentState.wgGlobalLockdown) } + var endpointIndependence by remember { mutableStateOf(persistentState.endpointIndependence) } + var allowIncoming by remember { mutableStateOf(persistentState.nwEngExperimentalFeatures) } + var tcpKeepAlive by remember { mutableStateOf(persistentState.tcpKeepAlive) } + var useMaxMtu by remember { mutableStateOf(persistentState.useMaxMtu) } + var tunnelMetered by remember { mutableStateOf(persistentState.setVpnBuilderToMetered) } + var dialTimeoutMin by remember { mutableIntStateOf(persistentState.dialTimeoutSec / SECONDS_PER_MINUTE) } + var internetProtocol by remember { mutableIntStateOf(persistentState.internetProtocolType) } + var vpnPolicy by remember { mutableIntStateOf(persistentState.vpnBuilderPolicy) } + var connectivityChecks by remember { mutableStateOf(persistentState.connectivityChecks) } + var showCustomLanIpSheet by remember { mutableStateOf(false) } + var showReachabilitySheet by remember { mutableStateOf(false) } + var showDefaultDnsDialog by remember { mutableStateOf(false) } + var showVpnPolicyDialog by remember { mutableStateOf(false) } + var showIpDialog by remember { mutableStateOf(false) } + var showConnectivityChecksDialog by remember { mutableStateOf(false) } + val listState = rememberLazyListState() + val density = LocalDensity.current + val initialFocus = initialFocusKey?.trim().orEmpty() + var pendingFocusKey by rememberSaveable(initialFocus) { mutableStateOf(initialFocus) } + var activeFocusKey by rememberSaveable(initialFocus) { + mutableStateOf(initialFocus.ifBlank { null }) + } + + val canModify = !isLockdown + val showPtrans = internetProtocol == InternetProtocol.IPv6.id + val showConnectivityChecksOption = internetProtocol == InternetProtocol.IPv46.id + val showPingIps = showConnectivityChecksOption && connectivityChecks + + fun logEvent(msg: String, details: String) { + eventLogger.log(EventType.TUN_ESTABLISHED, Severity.LOW, msg, EventSource.UI, false, details) + } + + fun formatTimeShort(totalSeconds: Int, disabledText: String): String { + val hours = totalSeconds / SECONDS_PER_HOUR + val minutes = (totalSeconds % SECONDS_PER_HOUR) / SECONDS_PER_MINUTE + val seconds = totalSeconds % SECONDS_PER_MINUTE + val parts = mutableListOf() + if (hours > 0) parts.add("${hours}h") + if (minutes > 0) parts.add("${minutes}m") + if (seconds > 0) parts.add("${seconds}s") + return if (parts.isEmpty()) disabledText else parts.joinToString(" ") + } + + val ipDesc = when (internetProtocol) { + InternetProtocol.IPv4.id -> stringResource(R.string.settings_ip_text_ipv4) + InternetProtocol.IPv6.id -> stringResource(R.string.settings_ip_text_ipv6) + InternetProtocol.IPv46.id -> stringResource(R.string.settings_ip_text_ipv46) + InternetProtocol.ALWAYSv46.id -> stringResource(R.string.settings_ip_text_ipv4) + " & " + stringResource(R.string.settings_ip_text_ipv6) + else -> stringResource(R.string.settings_ip_text_ipv4) + } + + val vpnPolicyDesc = when (vpnPolicy) { + POLICY_AUTO -> stringResource(R.string.settings_ip_text_ipv46) + POLICY_SENSITIVE -> stringResource(R.string.vpn_policy_sensitive) + POLICY_RELAXED -> stringResource(R.string.vpn_policy_relaxed) + POLICY_FIXED -> stringResource(R.string.vpn_policy_fixed) + else -> stringResource(R.string.settings_ip_text_ipv46) + } + + val dialTimeoutDesc = formatTimeShort(dialTimeoutMin * SECONDS_PER_MINUTE, disabledText) + val topBarSubtitle = + stringResource( + R.string.two_argument_colon, + stringResource(R.string.vpn_policy_title), + vpnPolicyDesc + ) + + // Default DNS Dialog + if (showDefaultDnsDialog) { + DefaultDnsDialog( + persistentState = persistentState, + onDismiss = { showDefaultDnsDialog = false }, + onConfirm = { logEvent("default dns changed", "Default DNS changed") } + ) + } + + // VPN Policy Dialog + if (showVpnPolicyDialog) { + VpnPolicyDialog( + persistentState = persistentState, + onDismiss = { showVpnPolicyDialog = false }, + onConfirm = { selectedIndex -> + if (selectedIndex == POLICY_FIXED) { + persistentState.enableStabilityDependentSettings(context) + persistentState.useMaxMtu = true + useMaxMtu = true + persistentState.internetProtocolType = InternetProtocol.ALWAYSv46.id + internetProtocol = InternetProtocol.ALWAYSv46.id + } + persistentState.vpnBuilderPolicy = selectedIndex + vpnPolicy = selectedIndex + logEvent("vpn policy changed", "VPN builder network policy changed to: $selectedIndex") + } + ) + } + + // IP Dialog + if (showIpDialog) { + IpProtocolDialog( + persistentState = persistentState, + context = context, + onDismiss = { showIpDialog = false }, + onConfirm = { selectedProtocol -> + internetProtocol = selectedProtocol + logEvent("ip protocol changed", "Internet protocol changed to: $selectedProtocol") + } + ) + } + + // Connectivity Checks Dialog + if (showConnectivityChecksDialog) { + ConnectivityChecksDialog( + persistentState = persistentState, + onDismiss = { showConnectivityChecksDialog = false }, + onConfirm = { enabled -> + connectivityChecks = enabled + logEvent("connectivity checks", "Connectivity checks changed") + } + ) + } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + LaunchedEffect( + pendingFocusKey, + isLockdown, + showConnectivityChecksOption, + showPingIps, + endpointIndependence + ) { + val key = pendingFocusKey.trim() + if (key.isBlank()) return@LaunchedEffect + activeFocusKey = key + val target = + tunnelFocusTarget( + focusKey = key, + isLockdown = isLockdown, + showConnectivityChecksOption = showConnectivityChecksOption, + showPingIps = showPingIps, + showAllowIncoming = endpointIndependence, + showVpnMetered = isAtleastQ() + ) + if (target != null) { + val (index, offsetDp) = target + val offsetPx = with(density) { offsetDp.dp.toPx().roundToInt() } + listState.animateScrollToItem(index, offsetPx) + delay(900) + if (activeFocusKey == key) { + activeFocusKey = null + } + pendingFocusKey = "" + return@LaunchedEffect + } + + val index = tunnelFocusIndex(key, isLockdown) + if (index != null) { + listState.animateScrollToItem(index, 0) + delay(750) + if (activeFocusKey == key) { + activeFocusKey = null + } + } + pendingFocusKey = "" + } + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.lbl_network), + subtitle = topBarSubtitle, + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + }, + containerColor = MaterialTheme.colorScheme.background + ) { padding -> + LazyColumn( + state = listState, + modifier = Modifier + .fillMaxSize() + .padding(padding), + contentPadding = + PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = Dimensions.spacing3xl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingLg) + ) { + if (isLockdown) { + item { + RethinkListGroup { + RethinkActionListItem( + title = stringResource(R.string.settings_lock_down_mode_desc), + iconPainter = painterResource(id = R.drawable.ic_firewall_lockdown_on), + position = CardPosition.Single, + onClick = { onOpenVpnProfile() } + ) + } + } + } + + item { + RethinkListGroup { + RethinkToggleListItem( + title = stringResource(R.string.settings_allow_bypass_heading), + description = stringResource(R.string.settings_allow_bypass_desc), + icon = Icons.Filled.Settings, + position = CardPosition.First, + highlighted = activeFocusKey == "network_allow_bypass", + checked = allowBypass, + enabled = canModify && !Utilities.isPlayStoreFlavour(), + onRowClick = { + if (Utilities.isPlayStoreFlavour()) return@RethinkToggleListItem + val checked = !allowBypass + allowBypass = checked + persistentState.allowBypass = checked + allowBypassLoading = true + scope.launch { + delay(1000L) + allowBypassLoading = false + } + logEvent("allow bypass", "Allow bypass VPN: $checked") + }, + onCheckedChange = { checked -> + if (Utilities.isPlayStoreFlavour()) return@RethinkToggleListItem + allowBypass = checked + persistentState.allowBypass = checked + allowBypassLoading = true + scope.launch { + delay(1000L) + allowBypassLoading = false + } + logEvent("allow bypass", "Allow bypass VPN: $checked") + } + ) + + RethinkToggleListItem( + title = stringResource(R.string.fail_open_network_title), + description = stringResource(R.string.fail_open_network_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_fail_open", + checked = stallNoNetwork, + onRowClick = { + val checked = !stallNoNetwork + stallNoNetwork = checked + persistentState.stallOnNoNetwork = checked + logEvent("stall on no network", "Stall on no network: $checked") + }, + onCheckedChange = { checked -> + stallNoNetwork = checked + persistentState.stallOnNoNetwork = checked + logEvent("stall on no network", "Stall on no network: $checked") + } + ) + + RethinkToggleListItem( + title = stringResource(R.string.settings_allow_lan_heading), + description = stringResource(R.string.settings_allow_lan_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_allow_lan", + checked = routeLan, + enabled = canModify, + onRowClick = { + if (canModify) { + val checked = !routeLan + routeLan = checked + persistentState.privateIps = checked + if (checked) persistentState.enableStabilityDependentSettings(context) + logEvent("route lan traffic", "Route LAN traffic: $checked") + } + }, + onCheckedChange = { checked -> + routeLan = checked + persistentState.privateIps = checked + if (checked) persistentState.enableStabilityDependentSettings(context) + logEvent("route lan traffic", "Route LAN traffic: $checked") + } + ) + + RethinkToggleListItem( + title = stringResource(R.string.settings_network_all_networks), + description = stringResource(R.string.settings_network_all_networks_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_all_networks", + checked = useMultipleNetworks, + enabled = canModify, + onRowClick = { + if (canModify) { + val checked = !useMultipleNetworks + useMultipleNetworks = checked + persistentState.useMultipleNetworks = checked + if (checked) persistentState.enableStabilityDependentSettings(context) + if (!checked && persistentState.routeRethinkInRethink) { + persistentState.routeRethinkInRethink = false + } + logEvent("use all networks", "Use all networks for VPN: $checked") + } + }, + onCheckedChange = { checked -> + useMultipleNetworks = checked + persistentState.useMultipleNetworks = checked + if (checked) persistentState.enableStabilityDependentSettings(context) + if (!checked && persistentState.routeRethinkInRethink) { + persistentState.routeRethinkInRethink = false + } + logEvent("use all networks", "Use all networks for VPN: $checked") + } + ) + + RethinkToggleListItem( + title = stringResource(R.string.settings_exclude_apps_in_proxy), + description = stringResource(R.string.settings_exclude_apps_in_proxy_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_exclude_apps_proxy", + checked = excludeApps, + enabled = canModify, + onRowClick = { + if (canModify) { + val checked = !excludeApps + excludeApps = checked + persistentState.excludeAppsInProxy = !checked + logEvent("exclude apps in proxy", "Exclude apps in proxy: ${!checked}") + } + }, + onCheckedChange = { checked -> + excludeApps = checked + persistentState.excludeAppsInProxy = !checked + logEvent("exclude apps in proxy", "Exclude apps in proxy: ${!checked}") + } + ) + + RethinkToggleListItem( + title = stringResource(R.string.settings_protocol_translation), + description = stringResource(R.string.settings_protocol_translation_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Last, + highlighted = activeFocusKey == "network_protocol_translation", + checked = protocolTranslation, + enabled = showPtrans, + onRowClick = { + if (showPtrans) { + val checked = !protocolTranslation + if (appConfig.getBraveMode().isDnsActive()) { + protocolTranslation = checked + persistentState.protocolTranslationType = checked + } else { + protocolTranslation = false + showToastUiCentered( + context, + protocolTranslationInactiveText, + Toast.LENGTH_SHORT + ) + } + logEvent("protocol translation", "Protocol translation: $checked") + } + }, + onCheckedChange = { checked -> + if (appConfig.getBraveMode().isDnsActive()) { + protocolTranslation = checked + persistentState.protocolTranslationType = checked + } else { + protocolTranslation = false + showToastUiCentered( + context, + protocolTranslationInactiveText, + Toast.LENGTH_SHORT + ) + } + logEvent("protocol translation", "Protocol translation: $checked") + } + ) + } + } + + item { + SectionHeader(title = stringResource(R.string.lbl_advanced)) + RethinkListGroup { + RethinkActionListItem( + title = stringResource(R.string.settings_default_dns_heading), + description = stringResource(R.string.settings_default_dns_desc), + icon = Icons.Filled.Settings, + position = CardPosition.First, + highlighted = activeFocusKey == "network_default_dns", + onClick = { showDefaultDnsDialog = true } + ) + + RethinkActionListItem( + title = stringResource(R.string.vpn_policy_title), + description = vpnPolicyDesc, + icon = Icons.Filled.Settings, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_vpn_policy", + onClick = { showVpnPolicyDialog = true } + ) + + RethinkActionListItem( + title = stringResource(R.string.settings_ip_dialog_title), + description = stringResource(R.string.settings_selected_ip_desc, ipDesc), + icon = Icons.Filled.Settings, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_ip_protocol", + onClick = { if (vpnPolicy != POLICY_FIXED) showIpDialog = true } + ) + + if (showConnectivityChecksOption) { + RethinkActionListItem( + title = stringResource(R.string.settings_connectivity_checks), + description = stringResource(R.string.settings_connectivity_checks_desc), + icon = Icons.Filled.Settings, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_connectivity_checks", + onClick = { showConnectivityChecksDialog = true } + ) + } + + if (showPingIps) { + RethinkActionListItem( + title = stringResource(R.string.settings_ping_ips), + icon = Icons.Filled.NetworkCheck, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_ping_ips", + onClick = { + if (!VpnController.hasTunnel()) { + showToastUiCentered( + context, + socks5VpnDisabledErrorText, + Toast.LENGTH_SHORT + ) + } else { + showReachabilitySheet = true + } + } + ) + } + + RethinkToggleListItem( + title = stringResource(R.string.settings_treat_mobile_metered), + description = stringResource(R.string.settings_treat_mobile_metered_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_mobile_metered", + checked = meteredOnlyMobile, + onRowClick = { + val checked = !meteredOnlyMobile + meteredOnlyMobile = checked + persistentState.treatOnlyMobileNetworkAsMetered = checked + logEvent("mobile metered", "Treat mobile as metered: $checked") + }, + onCheckedChange = { checked -> + meteredOnlyMobile = checked + persistentState.treatOnlyMobileNetworkAsMetered = checked + logEvent("mobile metered", "Treat mobile as metered: $checked") + } + ) + + RethinkToggleListItem( + title = stringResource(R.string.settings_wg_listen_port), + description = stringResource(R.string.settings_wg_listen_port_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_wg_listen_port", + checked = listenPortFixed, + onRowClick = { + val checked = !listenPortFixed + listenPortFixed = checked + persistentState.randomizeListenPort = !checked + logEvent("listen port", "Randomize listen port: ${!checked}") + }, + onCheckedChange = { checked -> + listenPortFixed = checked + persistentState.randomizeListenPort = !checked + logEvent("listen port", "Randomize listen port: ${!checked}") + } + ) + + RethinkToggleListItem( + title = stringResource(R.string.settings_wg_lockdown), + description = stringResource(R.string.settings_wg_lockdown_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_wg_lockdown", + checked = wgLockdown, + onRowClick = { + val checked = !wgLockdown + wgLockdown = checked + persistentState.wgGlobalLockdown = checked + NewSettingsManager.markSettingSeen(NewSettingsManager.WG_GLOBAL_LOCKDOWN_MODE_SETTING) + logEvent("wg lockdown", "WG global lockdown: $checked") + }, + onCheckedChange = { checked -> + wgLockdown = checked + persistentState.wgGlobalLockdown = checked + NewSettingsManager.markSettingSeen(NewSettingsManager.WG_GLOBAL_LOCKDOWN_MODE_SETTING) + logEvent("wg lockdown", "WG global lockdown: $checked") + } + ) + + RethinkToggleListItem( + title = stringResource(R.string.settings_endpoint_independence), + description = stringResource(R.string.settings_endpoint_independence_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_endpoint_independence", + checked = endpointIndependence, + onRowClick = { + val checked = !endpointIndependence + endpointIndependence = checked + persistentState.endpointIndependence = checked + if (!checked) { + allowIncoming = false + persistentState.nwEngExperimentalFeatures = false + } else { + allowIncoming = persistentState.nwEngExperimentalFeatures + } + logEvent("endpoint independence", "Endpoint independence: $checked") + }, + onCheckedChange = { checked -> + endpointIndependence = checked + persistentState.endpointIndependence = checked + if (!checked) { + allowIncoming = false + persistentState.nwEngExperimentalFeatures = false + } else { + allowIncoming = persistentState.nwEngExperimentalFeatures + } + logEvent("endpoint independence", "Endpoint independence: $checked") + } + ) + + if (endpointIndependence) { + RethinkToggleListItem( + title = stringResource(R.string.settings_allow_incoming_wg_packets), + description = stringResource(R.string.settings_allow_incoming_wg_packets_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_allow_incoming_wg", + checked = allowIncoming, + onRowClick = { + val checked = !allowIncoming + allowIncoming = checked + persistentState.nwEngExperimentalFeatures = checked + logEvent("allow incoming", "Allow incoming WG packets: $checked") + }, + onCheckedChange = { checked -> + allowIncoming = checked + persistentState.nwEngExperimentalFeatures = checked + logEvent("allow incoming", "Allow incoming WG packets: $checked") + } + ) + } + + RethinkToggleListItem( + title = stringResource(R.string.settings_tcp_keep_alive), + description = stringResource(R.string.settings_tcp_keep_alive_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_tcp_keep_alive", + checked = tcpKeepAlive, + onRowClick = { + val checked = !tcpKeepAlive + tcpKeepAlive = checked + persistentState.tcpKeepAlive = checked + logEvent("tcp keep alive", "TCP keep alive: $checked") + }, + onCheckedChange = { checked -> + tcpKeepAlive = checked + persistentState.tcpKeepAlive = checked + logEvent("tcp keep alive", "TCP keep alive: $checked") + } + ) + + RethinkToggleListItem( + title = stringResource(R.string.settings_jumbo_packets), + description = stringResource(R.string.settings_jumbo_packets_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_jumbo_packets", + checked = useMaxMtu, + enabled = vpnPolicy != POLICY_FIXED && !persistentState.routeRethinkInRethink, + onRowClick = { + if (vpnPolicy != POLICY_FIXED && !persistentState.routeRethinkInRethink) { + val checked = !useMaxMtu + useMaxMtu = checked + persistentState.useMaxMtu = checked + logEvent("jumbo packets", "Use jumbo packets: $checked") + } + }, + onCheckedChange = { checked -> + useMaxMtu = checked + persistentState.useMaxMtu = checked + logEvent("jumbo packets", "Use jumbo packets: $checked") + } + ) + + if (isAtleastQ()) { + RethinkToggleListItem( + title = stringResource(R.string.settings_vpn_builder_metered), + description = stringResource(R.string.settings_vpn_builder_metered_desc), + icon = Icons.Filled.Tune, + position = CardPosition.Middle, + highlighted = activeFocusKey == "network_vpn_metered", + checked = tunnelMetered, + onRowClick = { + val checked = !tunnelMetered + tunnelMetered = checked + persistentState.setVpnBuilderToMetered = checked + logEvent("vpn metered", "VPN builder metered: $checked") + }, + onCheckedChange = { checked -> + tunnelMetered = checked + persistentState.setVpnBuilderToMetered = checked + logEvent("vpn metered", "VPN builder metered: $checked") + } + ) + } + + RethinkActionListItem( + title = stringResource(R.string.custom_lan_ip_title), + description = stringResource(R.string.custom_lan_ip_desc), + icon = Icons.Filled.Settings, + position = CardPosition.Last, + highlighted = activeFocusKey == "network_custom_lan_ip", + onClick = { showCustomLanIpSheet = true } + ) + } + } + + // Dial Timeout Slider + item { + RethinkListGroup { + Surface( + modifier = Modifier.fillMaxWidth(), + color = if (activeFocusKey == "network_dial_timeout") { + MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.3f) + } else { + Color.Transparent + }, + shape = RoundedCornerShape(Dimensions.cornerRadiusLg) + ) { + Column(modifier = Modifier.fillMaxWidth().padding(Dimensions.cardPadding)) { + Text( + text = stringResource(R.string.settings_dial_timeout), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold + ) + Text( + text = dialTimeoutDesc, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Spacer(modifier = Modifier.height(Dimensions.spacingSm)) + Slider( + value = dialTimeoutMin.toFloat(), + onValueChange = { value -> + dialTimeoutMin = value.toInt() + persistentState.dialTimeoutSec = dialTimeoutMin * SECONDS_PER_MINUTE + }, + valueRange = 0f..60f, + colors = androidx.compose.material3.SliderDefaults.colors( + thumbColor = MaterialTheme.colorScheme.primary, + activeTrackColor = MaterialTheme.colorScheme.primary, + inactiveTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest + ) + ) + } + } + } + } + } + } + + if (showCustomLanIpSheet) { + CustomLanIpSheet( + persistentState = persistentState, + onDismiss = { showCustomLanIpSheet = false } + ) + } + if (showReachabilitySheet) { + NetworkReachabilitySheet( + persistentState = persistentState, + onDismiss = { showReachabilitySheet = false } + ) + } +} + +@Composable +private fun DefaultDnsDialog( + persistentState: PersistentState, + onDismiss: () -> Unit, + onConfirm: () -> Unit +) { + val options = Constants.DEFAULT_DNS_LIST + val checkedItem = options.firstOrNull { it.url == persistentState.defaultDnsUrl }?.let { options.indexOf(it) } ?: 0 + var selectedIndex by remember { mutableIntStateOf(checkedItem) } + + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = stringResource(R.string.settings_default_dns_heading), + text = { + Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + options.forEachIndexed { index, item -> + DialogRadioOptionRow( + title = item.name, + selected = selectedIndex == index, + onClick = { selectedIndex = index } + ) + } + } + }, + confirmText = stringResource(R.string.fapps_info_dialog_positive_btn), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + persistentState.defaultDnsUrl = options[selectedIndex].url + onConfirm() + onDismiss() + }, + onDismiss = onDismiss + ) +} + +@Composable +private fun VpnPolicyDialog( + persistentState: PersistentState, + onDismiss: () -> Unit, + onConfirm: (Int) -> Unit +) { + val conservativeTxt = stringResource(R.string.vpn_policy_fixed) + " " + stringResource(R.string.lbl_experimental) + val options = listOf( + NetworkPolicyOption( + stringResource(R.string.settings_ip_text_ipv46), + stringResource(R.string.vpn_policy_auto_desc) + ), + NetworkPolicyOption( + stringResource(R.string.vpn_policy_sensitive), + stringResource(R.string.vpn_policy_sensitive_desc) + ), + NetworkPolicyOption( + stringResource(R.string.vpn_policy_relaxed), + stringResource(R.string.vpn_policy_relaxed_desc) + ), + NetworkPolicyOption(conservativeTxt, stringResource(R.string.vpn_policy_fixed_desc)) + ) + var selectedIndex by remember { mutableIntStateOf(persistentState.vpnBuilderPolicy) } + + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = stringResource(R.string.vpn_policy_title), + text = { + Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + options.forEachIndexed { index, option -> + DialogRadioOptionRow( + title = option.title, + description = option.description, + selected = selectedIndex == index, + onClick = { selectedIndex = index } + ) + } + } + }, + confirmText = stringResource(R.string.fapps_info_dialog_positive_btn), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + onConfirm(selectedIndex) + onDismiss() + }, + onDismiss = onDismiss + ) +} + +@Composable +private fun IpProtocolDialog( + persistentState: PersistentState, + context: Context, + onDismiss: () -> Unit, + onConfirm: (Int) -> Unit +) { + val alwaysv46Txt = + stringResource(R.string.settings_ip_text_ipv4) + " & " + stringResource(R.string.settings_ip_text_ipv6) + " " + stringResource( + R.string.lbl_experimental + ) + val items = listOf( + stringResource(R.string.settings_ip_dialog_ipv4), + stringResource(R.string.settings_ip_dialog_ipv6), + alwaysv46Txt, + stringResource(R.string.settings_ip_dialog_ipv46) + ) + val chosenProtocol = persistentState.internetProtocolType + val checkedItem = when (chosenProtocol) { + InternetProtocol.ALWAYSv46.id -> IP_DIALOG_POS_ALWAYS_V46 + InternetProtocol.IPv46.id -> IP_DIALOG_POS_V46 + InternetProtocol.IPv4.id -> IP_DIALOG_POS_IPV4 + InternetProtocol.IPv6.id -> IP_DIALOG_POS_IPV6 + else -> IP_DIALOG_POS_IPV4 + } + var selectedIndex by remember { mutableIntStateOf(checkedItem) } + + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = stringResource(R.string.settings_ip_dialog_title), + text = { + Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + items.forEachIndexed { index, label -> + DialogRadioOptionRow( + title = label, + selected = selectedIndex == index, + onClick = { selectedIndex = index } + ) + } + } + }, + confirmText = stringResource(R.string.fapps_info_dialog_positive_btn), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + val selectedItem = when (selectedIndex) { + IP_DIALOG_POS_V46 -> InternetProtocol.IPv46.id + IP_DIALOG_POS_ALWAYS_V46 -> InternetProtocol.ALWAYSv46.id + else -> selectedIndex + } + if (persistentState.internetProtocolType != selectedItem) { + val protocolType = InternetProtocol.getInternetProtocol(selectedItem) + persistentState.internetProtocolType = protocolType.id + if (protocolType.id == InternetProtocol.IPv6.id || + protocolType.id == InternetProtocol.IPv46.id || + protocolType.id == InternetProtocol.ALWAYSv46.id + ) { + persistentState.enableStabilityDependentSettings(context) + } + onConfirm(protocolType.id) + } + onDismiss() + }, + onDismiss = onDismiss + ) +} + +@Composable +private fun ConnectivityChecksDialog( + persistentState: PersistentState, + onDismiss: () -> Unit, + onConfirm: (Boolean) -> Unit +) { + val items = listOf( + stringResource(R.string.settings_app_list_default_app), + stringResource(R.string.settings_ip_text_ipv46), + stringResource(R.string.lbl_manual) + ) + val type = persistentState.performAutoNetworkConnectivityChecks + val enabled = persistentState.connectivityChecks + val checkedItem = if (!enabled) 0 else if (type) 1 else 2 + var selectedIndex by remember { mutableIntStateOf(checkedItem) } + + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = stringResource(R.string.settings_connectivity_checks), + text = { + Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + items.forEachIndexed { index, label -> + DialogRadioOptionRow( + title = label, + selected = selectedIndex == index, + onClick = { selectedIndex = index } + ) + } + } + }, + confirmText = stringResource(R.string.fapps_info_dialog_positive_btn), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + when (selectedIndex) { + 0 -> { + persistentState.performAutoNetworkConnectivityChecks = true + persistentState.connectivityChecks = false + onConfirm(false) + } + + 1 -> { + persistentState.performAutoNetworkConnectivityChecks = true + persistentState.connectivityChecks = true + onConfirm(true) + } + + 2 -> { + persistentState.performAutoNetworkConnectivityChecks = false + persistentState.connectivityChecks = true + onConfirm(true) + } + } + onDismiss() + }, + onDismiss = onDismiss + ) +} + +@Composable +private fun DialogRadioOptionRow( + title: String, + selected: Boolean, + onClick: () -> Unit, + description: String? = null +) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .fillMaxWidth() + .heightIn(min = 48.dp) + .clickable(onClick = onClick) + .padding(horizontal = 4.dp, vertical = 2.dp) + ) { + RadioButton( + selected = selected, + onClick = onClick + ) + Spacer(modifier = Modifier.width(8.dp)) + Column { + Text(title, style = MaterialTheme.typography.bodyMedium) + if (!description.isNullOrBlank()) { + Text( + text = description, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/DetailedStatisticsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/DetailedStatisticsScreen.kt new file mode 100644 index 000000000..b9ab4e5ed --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/DetailedStatisticsScreen.kt @@ -0,0 +1,304 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.statistics + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Info +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.TopAppBarScrollBehavior +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.paging.LoadState +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.data.AppConnection +import com.celzero.bravedns.data.SummaryStatisticsType +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.CompactEmptyState +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import com.celzero.bravedns.util.UIUtils.formatBytes +import com.celzero.bravedns.viewmodel.DetailedStatisticsViewModel +import com.celzero.bravedns.viewmodel.SummaryStatisticsViewModel.TimeCategory + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DetailedStatisticsScreen( + viewModel: DetailedStatisticsViewModel, + type: SummaryStatisticsType, + timeCategory: TimeCategory, + onBackClick: () -> Unit +) { + val pagingItems = when (type) { + SummaryStatisticsType.TOP_ACTIVE_CONNS -> viewModel.getAllActiveConns + SummaryStatisticsType.MOST_CONNECTED_APPS -> viewModel.getAllAllowedAppNetworkActivity + SummaryStatisticsType.MOST_BLOCKED_APPS -> viewModel.getAllBlockedAppNetworkActivity + SummaryStatisticsType.MOST_CONNECTED_ASN -> viewModel.getAllAllowedAsn + SummaryStatisticsType.MOST_BLOCKED_ASN -> viewModel.getAllBlockedAsn + SummaryStatisticsType.MOST_CONTACTED_DOMAINS -> viewModel.getAllContactedDomains + SummaryStatisticsType.MOST_BLOCKED_DOMAINS -> viewModel.getAllBlockedDomains + SummaryStatisticsType.MOST_CONTACTED_IPS -> viewModel.getAllContactedIps + SummaryStatisticsType.MOST_BLOCKED_IPS -> viewModel.getAllBlockedIps + SummaryStatisticsType.MOST_CONTACTED_COUNTRIES -> viewModel.getAllContactedCountries + }.collectAsLazyPagingItems() + + LaunchedEffect(type, timeCategory) { + viewModel.setData(type) + viewModel.timeCategoryChanged(timeCategory) + } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + val timeSubtitle = if (type == SummaryStatisticsType.TOP_ACTIVE_CONNS) null else getTimeCategoryText(timeCategory) + val density = LocalDensity.current + val bottomInset = with(density) { WindowInsets.navigationBars.getBottom(density).toDp() } + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + DetailedStatisticsTopBar( + type = type, + subtitle = timeSubtitle, + itemCount = pagingItems.itemCount, + scrollBehavior = scrollBehavior, + onBackClick = onBackClick + ) + } + ) { paddingValues -> + Box( + modifier = Modifier + .padding(paddingValues) + .fillMaxSize() + ) { + when { + pagingItems.loadState.refresh is LoadState.Loading -> { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } + + pagingItems.itemCount == 0 -> { + CompactEmptyState( + message = stringResource(R.string.blocklist_update_check_failure), + icon = Icons.Default.Info, + modifier = Modifier.align(Alignment.Center) + ) + } + + else -> { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = Dimensions.spacingLg + bottomInset + ), + verticalArrangement = Arrangement.spacedBy(0.dp) + ) { + items(pagingItems.itemCount) { index -> + pagingItems[index]?.let { item -> + DetailedStatListItem( + item = item, + type = type, + position = cardPositionFor(index, pagingItems.itemCount - 1) + ) + } + } + + if (pagingItems.loadState.append is LoadState.Loading) { + item { + Box( + modifier = Modifier + .fillMaxWidth() + .padding(Dimensions.spacingLg), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator( + modifier = Modifier.size(Dimensions.iconSizeMd) + ) + } + } + } + } + } + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun DetailedStatisticsTopBar( + type: SummaryStatisticsType, + subtitle: String?, + itemCount: Int, + scrollBehavior: TopAppBarScrollBehavior, + onBackClick: () -> Unit +) { + RethinkLargeTopBar( + title = stringResource(id = getTitleResId(type)), + subtitle = subtitle, + onBackClick = onBackClick, + scrollBehavior = scrollBehavior, + titleTextStyle = MaterialTheme.typography.headlineMedium, + actions = { + if (itemCount > 0) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusFull), + color = MaterialTheme.colorScheme.primaryContainer, + modifier = Modifier.padding(end = Dimensions.spacingSm) + ) { + Text( + text = itemCount.toString(), + style = MaterialTheme.typography.labelLarge, + color = MaterialTheme.colorScheme.onPrimaryContainer, + fontWeight = FontWeight.SemiBold, + modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp) + ) + } + } + } + ) +} + +@Composable +private fun DetailedStatListItem( + item: AppConnection, + type: SummaryStatisticsType, + position: CardPosition +) { + val isCountryType = type == SummaryStatisticsType.MOST_CONTACTED_COUNTRIES + val appIconPainter = if (type.supportsAppIcon()) rememberStatisticsAppIconPainter(item.uid) else null + val hasTrueAppIcon = appIconPainter != null + val countryName = if (isCountryType) countryNameFromFlag(item.flag) else null + + val titleText = when { + item.appOrDnsName?.isNotBlank() == true -> item.appOrDnsName + item.ipAddress.isNotBlank() -> item.ipAddress + else -> stringResource(id = R.string.network_log_app_name_unknown) + } + + val metricText = buildString { + append(stringResource(id = R.string.summary_connections_count, item.count)) + item.totalBytes?.takeIf { it > 0L }?.let { + append(" \u00b7 ") + append(formatBytes(it)) + } + } + + val leadingContent: (@Composable () -> Unit)? = when { + isCountryType && item.flag.isNotBlank() -> { + { + Text( + text = item.flag, + style = MaterialTheme.typography.headlineSmall + ) + } + } + hasTrueAppIcon && appIconPainter != null -> { + { + androidx.compose.material3.Icon( + painter = appIconPainter, + contentDescription = null, + tint = Color.Unspecified, + modifier = Modifier.size(24.dp) + ) + } + } + else -> null + } + + RethinkListItem( + headline = if (isCountryType) metricText else titleText, + supporting = if (isCountryType) (countryName ?: titleText) else metricText, + leadingContent = leadingContent, + leadingIconPainter = if (leadingContent == null) { + if (isCountryType) { + painterResource(id = R.drawable.ic_flag_placeholder) + } else { + painterResource(id = R.drawable.ic_app_info) + } + } else { + null + }, + leadingIconTint = + when { + hasTrueAppIcon -> Color.Unspecified + isCountryType -> MaterialTheme.colorScheme.tertiary + else -> MaterialTheme.colorScheme.onSurfaceVariant + }, + leadingIconContainerColor = + when { + leadingContent != null -> Color.Transparent + isCountryType -> MaterialTheme.colorScheme.tertiaryContainer.copy(alpha = 0.32f) + else -> MaterialTheme.colorScheme.surfaceContainerHighest + }, + position = position, + showTrailingChevron = false, + onClick = null + ) +} + +private fun getTitleResId(type: SummaryStatisticsType): Int { + return when (type) { + SummaryStatisticsType.TOP_ACTIVE_CONNS -> R.string.top_active_conns + SummaryStatisticsType.MOST_CONNECTED_APPS -> R.string.ssv_app_network_activity_heading + SummaryStatisticsType.MOST_BLOCKED_APPS -> R.string.ssv_app_blocked_heading + SummaryStatisticsType.MOST_CONNECTED_ASN -> R.string.most_contacted_asn + SummaryStatisticsType.MOST_BLOCKED_ASN -> R.string.most_blocked_asn + SummaryStatisticsType.MOST_CONTACTED_DOMAINS -> R.string.ssv_most_contacted_domain_heading + SummaryStatisticsType.MOST_BLOCKED_DOMAINS -> R.string.ssv_most_blocked_domain_heading + SummaryStatisticsType.MOST_CONTACTED_IPS -> R.string.ssv_most_contacted_ips_heading + SummaryStatisticsType.MOST_BLOCKED_IPS -> R.string.ssv_most_blocked_ips_heading + SummaryStatisticsType.MOST_CONTACTED_COUNTRIES -> R.string.ssv_most_contacted_countries_heading + } +} + +@Composable +private fun getTimeCategoryText(timeCategory: TimeCategory): String { + val window = when (timeCategory) { + TimeCategory.ONE_HOUR -> stringResource(id = R.string.time_window_one_hour_short) + TimeCategory.TWENTY_FOUR_HOUR -> stringResource(id = R.string.time_window_twenty_four_hours_short) + TimeCategory.SEVEN_DAYS -> stringResource(id = R.string.time_window_seven_days_short) + } + return "${stringResource(id = R.string.lbl_last)} $window" +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/StatisticsCountryUtils.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/StatisticsCountryUtils.kt new file mode 100644 index 000000000..91aeeeac8 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/StatisticsCountryUtils.kt @@ -0,0 +1,41 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.statistics + +import java.util.Locale + +private const val REGIONAL_INDICATOR_A = 0x1F1E6 +private const val LATIN_CAPITAL_A = 0x41 +private const val LATIN_CAPITAL_Z = 0x5A + +internal fun countryNameFromFlag(flag: String?): String? { + if (flag.isNullOrBlank()) return null + + val codepoints = flag.codePoints().toArray() + if (codepoints.size != 2) return null + + val first = codepoints[0] - REGIONAL_INDICATOR_A + LATIN_CAPITAL_A + val second = codepoints[1] - REGIONAL_INDICATOR_A + LATIN_CAPITAL_A + if (first !in LATIN_CAPITAL_A..LATIN_CAPITAL_Z || second !in LATIN_CAPITAL_A..LATIN_CAPITAL_Z) { + return null + } + + val countryCode = "${first.toChar()}${second.toChar()}" + val countryLocale = + runCatching { Locale.Builder().setRegion(countryCode).build() }.getOrNull() ?: return null + val displayName = countryLocale.getDisplayCountry(Locale.getDefault()) + return displayName.takeIf { it.isNotBlank() && !it.equals(countryCode, ignoreCase = true) } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/StatisticsIconUtils.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/StatisticsIconUtils.kt new file mode 100644 index 000000000..3bf22b1a6 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/StatisticsIconUtils.kt @@ -0,0 +1,68 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.statistics + +import android.content.pm.PackageManager +import android.graphics.drawable.Drawable +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.produceState +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.platform.LocalContext +import com.celzero.bravedns.data.SummaryStatisticsType +import com.celzero.bravedns.service.FirewallManager +import com.celzero.bravedns.ui.compose.rememberDrawablePainter +import com.celzero.bravedns.util.Utilities +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +internal fun SummaryStatisticsType.supportsAppIcon(): Boolean { + return this == SummaryStatisticsType.MOST_CONNECTED_APPS || + this == SummaryStatisticsType.MOST_BLOCKED_APPS +} + +@Composable +internal fun rememberStatisticsAppIconPainter(uid: Int): Painter? { + val context = LocalContext.current + val drawable by produceState(initialValue = null, uid) { + value = + withContext(Dispatchers.IO) { + val normalizedUid = FirewallManager.appId(uid, mainUserOnly = true) + val candidateUids = listOf(uid, normalizedUid).distinct() + + val packageName = + candidateUids.firstNotNullOfOrNull { candidate -> + FirewallManager.getPackageNameByUid(candidate) + } ?: candidateUids.firstNotNullOfOrNull { candidate -> + Utilities.getPackageInfoForUid(context, candidate)?.firstOrNull() + } + + if (packageName.isNullOrBlank()) { + null + } else { + try { + context.packageManager.getApplicationIcon(packageName) + } catch (_: PackageManager.NameNotFoundException) { + null + } catch (_: SecurityException) { + null + } + } + } + } + + return rememberDrawablePainter(drawable) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/StatisticsSummaryItem.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/StatisticsSummaryItem.kt new file mode 100644 index 000000000..0f659b1b8 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/StatisticsSummaryItem.kt @@ -0,0 +1,131 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.statistics + +import android.graphics.drawable.Drawable +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.rememberDrawablePainter + +@Composable +fun StatisticsSummaryItem( + title: String, + subtitle: String?, + countText: String, + iconDrawable: Drawable?, + flagText: String?, + showProgress: Boolean, + progress: Float, + progressColor: Color, + showIndicator: Boolean, + onClick: (() -> Unit)? +) { + Column( + modifier = Modifier + .fillMaxWidth() + .clickable(enabled = onClick != null) { onClick?.invoke() } + .padding(horizontal = 8.dp, vertical = 6.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + Box( + modifier = Modifier.size(32.dp), + contentAlignment = Alignment.Center + ) { + if (!flagText.isNullOrEmpty()) { + Text(text = flagText, fontSize = 22.sp) + } else { + val painter = rememberDrawablePainter(iconDrawable) + painter?.let { + Image( + painter = it, + contentDescription = null, + modifier = Modifier.size(32.dp) + ) + } + } + } + + Spacer(modifier = Modifier.width(12.dp)) + + Column(modifier = Modifier.weight(1f)) { + Text( + text = title, + style = MaterialTheme.typography.bodyLarge, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + if (!subtitle.isNullOrEmpty()) { + Text( + text = subtitle, + style = MaterialTheme.typography.bodySmall, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + if (showProgress) { + LinearProgressIndicator( + progress = { progress.coerceIn(0f, 1f) }, + modifier = Modifier.fillMaxWidth().padding(top = 6.dp), + color = progressColor, + trackColor = MaterialTheme.colorScheme.surface + ) + } + } + + Spacer(modifier = Modifier.width(8.dp)) + + Text( + text = countText, + style = MaterialTheme.typography.titleMedium + ) + + if (showIndicator) { + Spacer(modifier = Modifier.width(8.dp)) + Image( + imageVector = ImageVector.vectorResource(id = R.drawable.ic_right_arrow_white), + contentDescription = null, + modifier = Modifier.size(16.dp) + ) + } + } + + HorizontalDivider( + modifier = Modifier.padding(top = 8.dp), + thickness = 0.5.dp, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.2f) + ) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/SummaryStatisticsScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/SummaryStatisticsScreen.kt new file mode 100644 index 000000000..a912ea48c --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/statistics/SummaryStatisticsScreen.kt @@ -0,0 +1,769 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.statistics + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.MutableTransitionState +import androidx.compose.animation.core.FastOutSlowInEasing +import androidx.compose.animation.core.tween +import androidx.compose.animation.expandVertically +import androidx.compose.animation.shrinkVertically +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.FilledTonalButton +import androidx.compose.material3.ButtonGroupDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.ToggleButton +import androidx.compose.material3.ToggleButtonDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.produceState +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.rotate +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Color.Companion.Unspecified +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.IntSize +import androidx.compose.ui.unit.dp +import androidx.paging.LoadState +import androidx.paging.compose.LazyPagingItems +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.data.AppConnection +import com.celzero.bravedns.data.DataUsageSummary +import com.celzero.bravedns.data.SummaryStatisticsType +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.ui.compose.theme.CompactEmptyState +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkAnimatedSection +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkListItem +import com.celzero.bravedns.ui.compose.theme.RethinkTopBarLazyColumnScreen +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.ui.compose.theme.cardPositionFor +import com.celzero.bravedns.util.UIUtils.formatBytes +import com.celzero.bravedns.viewmodel.SummaryStatisticsViewModel +import com.celzero.bravedns.viewmodel.SummaryStatisticsViewModel.TimeCategory + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SummaryStatisticsScreen( + viewModel: SummaryStatisticsViewModel, + persistentState: PersistentState, + onSeeMoreClick: (SummaryStatisticsType) -> Unit +) { + val uiState by viewModel.uiState.collectAsState() + val listState = rememberLazyListState() + + val topActiveConns = viewModel.getTopActiveConns.collectAsLazyPagingItems() + val mostConnectedApps = viewModel.getAllowedAppNetworkActivity.collectAsLazyPagingItems() + val mostBlockedApps = viewModel.getBlockedAppNetworkActivity.collectAsLazyPagingItems() + val mostConnectedAsn = viewModel.getMostConnectedASN.collectAsLazyPagingItems() + val mostBlockedAsn = viewModel.getMostBlockedASN.collectAsLazyPagingItems() + val mostContactedDomains = viewModel.mcd.collectAsLazyPagingItems() + val mostBlockedDomains = viewModel.mbd.collectAsLazyPagingItems() + val mostContactedCountries = viewModel.getMostContactedCountries.collectAsLazyPagingItems() + val mostContactedIps = viewModel.getMostContactedIps.collectAsLazyPagingItems() + val mostBlockedIps = viewModel.getMostBlockedIps.collectAsLazyPagingItems() + + RethinkTopBarLazyColumnScreen( + title = stringResource(id = R.string.title_statistics), + containerColor = MaterialTheme.colorScheme.surface, + topBarTitleTextStyle = MaterialTheme.typography.headlineMedium, + listState = listState, + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingMd, + bottom = Dimensions.spacing3xl + ), + topBarActions = { + TimeCategorySelector( + selectedCategory = uiState.timeCategory, + onCategorySelected = { viewModel.timeCategoryChanged(it) } + ) + } + ) { + item { + RethinkAnimatedSection(index = 0) { + UsageOverviewCard(dataUsage = uiState.dataUsage) + } + } + + item { + RethinkAnimatedSection(index = 1) { + SummaryStatSection( + title = stringResource(id = R.string.ssv_app_network_activity_heading), + type = SummaryStatisticsType.MOST_CONNECTED_APPS, + pagingItems = mostConnectedApps, + accentColor = MaterialTheme.colorScheme.primary, + onSeeMoreClick = onSeeMoreClick, + viewModel = viewModel, + refreshToken = uiState.timeCategory + ) + } + } + + item { + RethinkAnimatedSection(index = 2) { + SummaryStatSection( + title = stringResource(id = R.string.ssv_app_blocked_heading), + type = SummaryStatisticsType.MOST_BLOCKED_APPS, + pagingItems = mostBlockedApps, + accentColor = MaterialTheme.colorScheme.error, + onSeeMoreClick = onSeeMoreClick, + viewModel = viewModel, + refreshToken = uiState.timeCategory + ) + } + } + + item { + RethinkAnimatedSection(index = 3) { + SummaryStatSection( + title = stringResource(id = R.string.ssv_most_contacted_countries_heading), + type = SummaryStatisticsType.MOST_CONTACTED_COUNTRIES, + pagingItems = mostContactedCountries, + accentColor = MaterialTheme.colorScheme.tertiary, + onSeeMoreClick = onSeeMoreClick, + viewModel = viewModel, + refreshToken = uiState.timeCategory + ) + } + } + + if (persistentState.downloadIpInfo) { + if (shouldShowOptionalSection(mostConnectedAsn)) { + item { + SummaryStatSection( + title = stringResource(id = R.string.most_contacted_asn), + type = SummaryStatisticsType.MOST_CONNECTED_ASN, + pagingItems = mostConnectedAsn, + accentColor = MaterialTheme.colorScheme.secondary, + onSeeMoreClick = onSeeMoreClick, + viewModel = viewModel, + refreshToken = uiState.timeCategory + ) + } + } + + if (shouldShowOptionalSection(mostBlockedAsn)) { + item { + SummaryStatSection( + title = stringResource(id = R.string.most_blocked_asn), + type = SummaryStatisticsType.MOST_BLOCKED_ASN, + pagingItems = mostBlockedAsn, + accentColor = MaterialTheme.colorScheme.error, + onSeeMoreClick = onSeeMoreClick, + viewModel = viewModel, + refreshToken = uiState.timeCategory + ) + } + } + } + + item { + SummaryStatSection( + title = stringResource(id = R.string.ssv_most_contacted_domain_heading), + type = SummaryStatisticsType.MOST_CONTACTED_DOMAINS, + pagingItems = mostContactedDomains, + accentColor = MaterialTheme.colorScheme.secondary, + onSeeMoreClick = onSeeMoreClick, + viewModel = viewModel, + refreshToken = uiState.timeCategory + ) + } + + item { + SummaryStatSection( + title = stringResource(id = R.string.ssv_most_blocked_domain_heading), + type = SummaryStatisticsType.MOST_BLOCKED_DOMAINS, + pagingItems = mostBlockedDomains, + accentColor = MaterialTheme.colorScheme.error, + onSeeMoreClick = onSeeMoreClick, + viewModel = viewModel, + refreshToken = uiState.timeCategory + ) + } + + item { + SummaryStatSection( + title = stringResource(id = R.string.ssv_most_contacted_ips_heading), + type = SummaryStatisticsType.MOST_CONTACTED_IPS, + pagingItems = mostContactedIps, + accentColor = MaterialTheme.colorScheme.secondary, + onSeeMoreClick = onSeeMoreClick, + viewModel = viewModel, + refreshToken = uiState.timeCategory + ) + } + + item { + SummaryStatSection( + title = stringResource(id = R.string.ssv_most_blocked_ips_heading), + type = SummaryStatisticsType.MOST_BLOCKED_IPS, + pagingItems = mostBlockedIps, + accentColor = MaterialTheme.colorScheme.error, + onSeeMoreClick = onSeeMoreClick, + viewModel = viewModel, + refreshToken = uiState.timeCategory + ) + } + + if (shouldShowOptionalSection(topActiveConns)) { + item { + SummaryStatSection( + title = stringResource(id = R.string.top_active_conns), + type = SummaryStatisticsType.TOP_ACTIVE_CONNS, + pagingItems = topActiveConns, + accentColor = MaterialTheme.colorScheme.primary, + onSeeMoreClick = onSeeMoreClick, + viewModel = viewModel, + refreshToken = uiState.timeCategory + ) + } + } + } +} + +@Composable +private fun UsageOverviewCard(dataUsage: DataUsageSummary) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadius4xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f)) + ) { + Column( + modifier = Modifier.padding(horizontal = 14.dp, vertical = 14.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + Text( + text = stringResource(id = R.string.lbl_overall), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold + ) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + UsageStatPill( + label = stringResource(id = R.string.lbl_download), + value = formatBytes(dataUsage.totalDownload), + modifier = Modifier.weight(1f), + containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.44f), + valueColor = MaterialTheme.colorScheme.primary + ) + UsageStatPill( + label = stringResource(id = R.string.lbl_upload), + value = formatBytes(dataUsage.totalUpload), + modifier = Modifier.weight(1f), + containerColor = MaterialTheme.colorScheme.tertiaryContainer.copy(alpha = 0.42f), + valueColor = MaterialTheme.colorScheme.tertiary + ) + UsageStatPill( + label = stringResource(id = R.string.lbl_connections), + value = dataUsage.connectionsCount.toString(), + modifier = Modifier.weight(1f), + containerColor = MaterialTheme.colorScheme.surfaceContainerHighest, + valueColor = MaterialTheme.colorScheme.onSurface + ) + } + } + } +} + +@Composable +private fun UsageStatPill( + label: String, + value: String, + modifier: Modifier = Modifier, + containerColor: Color, + valueColor: Color +) { + Surface( + modifier = modifier, + shape = RoundedCornerShape(Dimensions.cornerRadiusLg), + color = containerColor + ) { + Column( + modifier = Modifier.padding(horizontal = 10.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(2.dp) + ) { + Text( + text = value, + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + color = valueColor + ) + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } +} + +@Composable +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +private fun TimeCategorySelector( + selectedCategory: TimeCategory, + onCategorySelected: (TimeCategory) -> Unit, + modifier: Modifier = Modifier +) { + val options = listOf( + TimeCategory.ONE_HOUR to timeCategoryShortLabel(TimeCategory.ONE_HOUR), + TimeCategory.TWENTY_FOUR_HOUR to timeCategoryShortLabel(TimeCategory.TWENTY_FOUR_HOUR), + TimeCategory.SEVEN_DAYS to timeCategoryShortLabel(TimeCategory.SEVEN_DAYS) + ) + val selectedIndex = options.indexOfFirst { it.first == selectedCategory } + + FlowRow( + modifier = modifier, + horizontalArrangement = Arrangement.spacedBy(ButtonGroupDefaults.ConnectedSpaceBetween), + verticalArrangement = Arrangement.spacedBy(6.dp) + ) { + options.forEachIndexed { index, (category, label) -> + val selected = index == selectedIndex + ToggleButton( + checked = selected, + onCheckedChange = { isChecked -> + if (isChecked && selectedCategory != category) { + onCategorySelected(category) + } + }, + shapes = when (index) { + 0 -> ButtonGroupDefaults.connectedLeadingButtonShapes() + options.lastIndex -> ButtonGroupDefaults.connectedTrailingButtonShapes() + else -> ButtonGroupDefaults.connectedMiddleButtonShapes() + }, + colors = ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.primaryContainer, + checkedContentColor = MaterialTheme.colorScheme.onPrimaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerLow, + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + modifier = Modifier.semantics { role = Role.RadioButton } + ) { + Text( + text = label, + style = MaterialTheme.typography.labelLarge, + fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Medium + ) + } + } + } +} + +@Composable +private fun timeCategoryShortLabel(category: TimeCategory): String { + return when (category) { + TimeCategory.ONE_HOUR -> stringResource(id = R.string.time_window_one_hour_short) + TimeCategory.TWENTY_FOUR_HOUR -> stringResource(id = R.string.time_window_twenty_four_hours_short) + TimeCategory.SEVEN_DAYS -> stringResource(id = R.string.time_window_seven_days_short) + } +} + +@Composable +private fun SummaryStatSection( + title: String, + type: SummaryStatisticsType, + pagingItems: LazyPagingItems, + accentColor: Color, + onSeeMoreClick: (SummaryStatisticsType) -> Unit, + viewModel: SummaryStatisticsViewModel, + refreshToken: TimeCategory +) { + val isCountrySection = type == SummaryStatisticsType.MOST_CONTACTED_COUNTRIES + val refreshState = pagingItems.loadState.refresh + val isLoading = refreshState is LoadState.Loading && pagingItems.itemCount == 0 + val hasData = pagingItems.itemCount > 0 + val isEmpty = !hasData && !isLoading + var showAllInlineCountries by remember(type) { mutableStateOf(false) } + val showAllVisibilityState = remember(type) { MutableTransitionState(false) } + val snapshotItems: List = pagingItems.itemSnapshotList.items.filterNotNull() + val visibleItems = if (isCountrySection) snapshotItems.take(5) else snapshotItems + var expandedCountryFlag by remember(type) { mutableStateOf(null) } + + LaunchedEffect(showAllInlineCountries) { + showAllVisibilityState.targetState = showAllInlineCountries + } + + Column { + SectionHeader( + title = title, + color = accentColor, + actionLabel = null, + onAction = null + ) + + if (isLoading) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadius4xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f)) + ) { + Box( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = Dimensions.spacingLg), + contentAlignment = androidx.compose.ui.Alignment.Center + ) { + CircularProgressIndicator(modifier = Modifier.size(Dimensions.iconSizeMd)) + } + } + } else if (isEmpty) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cornerRadius4xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f)) + ) { + CompactEmptyState( + message = stringResource(id = R.string.lbl_no_logs), + modifier = Modifier.padding(vertical = Dimensions.spacingSm) + ) + } + } else { + val sizeSpec = tween(durationMillis = 220, easing = FastOutSlowInEasing) + RethinkListGroup { + val baseItems = if (isCountrySection) snapshotItems.take(5) else visibleItems + val extraCountryItems = if (isCountrySection) snapshotItems.drop(5) else emptyList() + val isExtraBlockPresent = + isCountrySection && extraCountryItems.isNotEmpty() && + (showAllVisibilityState.currentState || showAllVisibilityState.targetState) + val visibleLastIndex = + if (isExtraBlockPresent) snapshotItems.lastIndex else baseItems.lastIndex + + val renderRow: @Composable (index: Int, item: AppConnection) -> Unit = { index, item -> + val metricText = item.totalBytes?.takeIf { it > 0L }?.let { formatBytes(it) } ?: item.count.toString() + val countryName = if (isCountrySection) countryNameFromFlag(item.flag) else null + val countryHeadline = when { + item.appOrDnsName?.isNotBlank() == true && item.flag.isNotBlank() -> + "${item.flag} ${item.appOrDnsName}" + item.appOrDnsName?.isNotBlank() == true -> item.appOrDnsName + item.flag.isNotBlank() -> item.flag + else -> stringResource(id = R.string.network_log_app_name_unknown) + } + val headline = if (isCountrySection) { + countryName ?: countryHeadline + } else { + item.appOrDnsName?.takeIf { it.isNotBlank() } ?: item.ipAddress + } + val supporting = buildString { + append(stringResource(id = R.string.summary_connections_count, item.count)) + item.totalBytes?.takeIf { it > 0L }?.let { + append(" \u00b7 ") + append(formatBytes(it)) + } + } + val appIconPainter = + if (type.supportsAppIcon()) { + rememberStatisticsAppIconPainter(item.uid) + } else { + null + } + val hasTrueAppIcon = appIconPainter != null + val fallbackPainter = + if (isCountrySection && item.flag.isBlank()) { + painterResource(id = R.drawable.ic_flag_placeholder) + } else if (isCountrySection) { + null + } else { + painterResource(id = R.drawable.ic_app_info) + } + val customLeadingContent: (@Composable () -> Unit)? = + when { + isCountrySection && item.flag.isNotBlank() -> { + { + Text( + text = item.flag, + style = MaterialTheme.typography.headlineMedium + ) + } + } + hasTrueAppIcon && appIconPainter != null -> { + { + Icon( + painter = appIconPainter, + contentDescription = null, + tint = Unspecified, + modifier = Modifier.size(24.dp) + ) + } + } + else -> null + } + val isExpanded = isCountrySection && expandedCountryFlag == item.flag + + RethinkListItem( + headline = headline.ifBlank { "-" }, + supporting = if (isCountrySection) null else supporting, + leadingContent = customLeadingContent, + leadingIconPainter = if (customLeadingContent == null) appIconPainter ?: fallbackPainter else null, + leadingIconTint = when { + hasTrueAppIcon -> Unspecified + isCountrySection -> MaterialTheme.colorScheme.tertiary + else -> accentColor + }, + leadingIconContainerColor = if (isCountrySection) { + MaterialTheme.colorScheme.tertiaryContainer.copy(alpha = 0.32f) + } else if (hasTrueAppIcon) { + MaterialTheme.colorScheme.surfaceContainerHighest + } else { + accentColor.copy(alpha = 0.14f) + }, + position = cardPositionFor(index = index, lastIndex = visibleLastIndex), + showTrailingChevron = false, + onClick = if (isCountrySection) { + { + expandedCountryFlag = if (isExpanded) null else item.flag + } + } else { + null + }, + trailing = { + Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically) { + Text( + text = metricText, + style = MaterialTheme.typography.labelMedium, + fontWeight = FontWeight.SemiBold, + color = accentColor + ) + if (isCountrySection) { + Spacer(modifier = Modifier.size(Dimensions.spacingXs)) + Icon( + imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f), + modifier = Modifier + .size(18.dp) + .rotate(if (isExpanded) 90f else 0f) + ) + } + } + } + ) + + AnimatedVisibility( + visible = isExpanded && item.flag.isNotBlank(), + enter = expandVertically( + animationSpec = sizeSpec + ), + exit = shrinkVertically( + animationSpec = sizeSpec + ) + ) { + CountryBreakdown( + flag = item.flag, + accentColor = accentColor, + viewModel = viewModel, + refreshToken = refreshToken + ) + } + } + + baseItems.forEachIndexed { index, item -> + renderRow(index, item) + } + + if (isCountrySection && extraCountryItems.isNotEmpty()) { + AnimatedVisibility( + visibleState = showAllVisibilityState, + enter = expandVertically(animationSpec = sizeSpec), + exit = shrinkVertically(animationSpec = sizeSpec) + ) { + Column { + extraCountryItems.forEachIndexed { extraIndex, item -> + renderRow(baseItems.size + extraIndex, item) + } + } + } + } + } + + val shouldShowInlineCountriesToggle = + isCountrySection && (showAllInlineCountries || pagingItems.itemCount > 5) + val shouldShowDefaultSeeMore = !isCountrySection && pagingItems.itemCount > 5 + + if (shouldShowInlineCountriesToggle || shouldShowDefaultSeeMore) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(top = Dimensions.spacingSm), + horizontalArrangement = Arrangement.End + ) { + FilledTonalButton( + onClick = { + if (isCountrySection) { + val nextShowAll = !showAllInlineCountries + if (!nextShowAll && expandedCountryFlag != null) { + val isExpandedRowVisibleInCollapsed = + snapshotItems.take(5).any { it.flag == expandedCountryFlag } + if (!isExpandedRowVisibleInCollapsed) { + expandedCountryFlag = null + } + } + showAllInlineCountries = nextShowAll + } else { + onSeeMoreClick(type) + } + }, + shape = RoundedCornerShape(Dimensions.cornerRadiusPill) + ) { + Text( + text = if (isCountrySection && showAllInlineCountries) { + stringResource(id = R.string.ssv_see_less) + } else { + stringResource(id = R.string.ssv_see_more) + }, + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.SemiBold + ) + } + } + } + } + } +} + +private fun shouldShowOptionalSection(pagingItems: LazyPagingItems): Boolean { + val isLoading = pagingItems.loadState.refresh is LoadState.Loading + return isLoading || pagingItems.itemCount > 0 +} + +@Composable +private fun CountryBreakdown( + flag: String, + accentColor: Color, + viewModel: SummaryStatisticsViewModel, + refreshToken: TimeCategory +) { + val apps by produceState>(initialValue = emptyList(), flag, refreshToken) { + value = viewModel.getTopAppsForCountry(flag, limit = 4) + } + + Surface( + modifier = Modifier + .fillMaxWidth() + .padding(top = Dimensions.spacingXs, bottom = Dimensions.spacingXs), + shape = RoundedCornerShape(Dimensions.cornerRadiusLg), + color = MaterialTheme.colorScheme.surfaceContainerHigh, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)) + ) { + Column( + modifier = Modifier.padding(horizontal = Dimensions.spacingMd, vertical = Dimensions.spacingSm), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm) + ) { + Text( + text = stringResource(id = R.string.ssv_app_network_activity_heading), + style = MaterialTheme.typography.labelMedium, + fontWeight = FontWeight.SemiBold, + color = accentColor + ) + if (apps.isEmpty()) { + Text( + text = stringResource(id = R.string.lbl_no_logs), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } else { + apps.forEach { app -> + val iconPainter = rememberStatisticsAppIconPainter(app.uid) + val appName = app.appOrDnsName?.takeIf { it.isNotBlank() } + ?: stringResource(id = R.string.network_log_app_name_unknown) + Row( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 2.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = androidx.compose.ui.Alignment.CenterVertically + ) { + Row( + modifier = Modifier.weight(1f), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + verticalAlignment = androidx.compose.ui.Alignment.CenterVertically + ) { + Box( + modifier = Modifier.size(20.dp) + ) { + if (iconPainter != null) { + Icon( + painter = iconPainter, + contentDescription = null, + tint = Unspecified, + modifier = Modifier.size(20.dp) + ) + } else { + Icon( + painter = painterResource(id = R.drawable.ic_app_info), + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(18.dp) + ) + } + } + Text( + text = appName, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurface, + maxLines = 1 + ) + } + Text( + text = app.count.toString(), + style = MaterialTheme.typography.labelSmall, + color = accentColor, + fontWeight = FontWeight.SemiBold + ) + } + } + } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Color.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Color.kt new file mode 100644 index 000000000..b970e801c --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Color.kt @@ -0,0 +1,118 @@ +package com.celzero.bravedns.ui.compose.theme + +import androidx.compose.ui.graphics.Color + +// Light palette +val PrimaryLight = Color(0xFF804136) +val OnPrimaryLight = Color(0xFFFFFFFF) +val PrimaryContainerLight = Color(0xFFFFDBD3) +val OnPrimaryContainerLight = Color(0xFF32120C) +val SecondaryLight = Color(0xFF755A54) +val OnSecondaryLight = Color(0xFFFFFFFF) +val SecondaryContainerLight = Color(0xFFFFDBD3) +val OnSecondaryContainerLight = Color(0xFF2B1612) +val TertiaryLight = Color(0xFF6F5D2E) +val OnTertiaryLight = Color(0xFFFFFFFF) +val TertiaryContainerLight = Color(0xFFF9E1A6) +val OnTertiaryContainerLight = Color(0xFF251A00) +val BackgroundLight = Color(0xFFFFF8F6) +val OnBackgroundLight = Color(0xFF231A18) +val SurfaceLight = Color(0xFFFFF8F6) +val OnSurfaceLight = Color(0xFF231A18) +val SurfaceVariantLight = Color(0xFFF4DED9) +val OnSurfaceVariantLight = Color(0xFF54433F) +val OutlineLight = Color(0xFF86736E) +val ErrorLight = Color(0xFFBA1A1A) +val OnErrorLight = Color(0xFFFFFFFF) +val ErrorContainerLight = Color(0xFFFFDAD6) +val OnErrorContainerLight = Color(0xFF410002) + +// Dark palette +val PrimaryDark = Color(0xFFFFB4A3) +val OnPrimaryDark = Color(0xFF4C1E15) +val PrimaryContainerDark = Color(0xFF653429) +val OnPrimaryContainerDark = Color(0xFFFFDBD3) +val SecondaryDark = Color(0xFFE6BDB4) +val OnSecondaryDark = Color(0xFF432A25) +val SecondaryContainerDark = Color(0xFF5C3F39) +val OnSecondaryContainerDark = Color(0xFFFFDBD3) +val TertiaryDark = Color(0xFFDBC58C) +val OnTertiaryDark = Color(0xFF3D2F05) +val TertiaryContainerDark = Color(0xFF554519) +val OnTertiaryContainerDark = Color(0xFFF9E1A6) +val BackgroundDark = Color(0xFF1A1110) +val OnBackgroundDark = Color(0xFFF0DEDA) +val SurfaceDark = Color(0xFF1A1110) +val OnSurfaceDark = Color(0xFFF0DEDA) +val SurfaceVariantDark = Color(0xFF53433F) +val OnSurfaceVariantDark = Color(0xFFD8C2BC) +val OutlineDark = Color(0xFFA08C87) +val ErrorDark = Color(0xFFFFB4AB) +val OnErrorDark = Color(0xFF690005) +val ErrorContainerDark = Color(0xFF93000A) +val OnErrorContainerDark = Color(0xFFFFDAD6) + +// True Black palette +val PrimaryBlack = Color(0xFFFFB7A7) +val OnPrimaryBlack = Color(0xFF45170F) +val PrimaryContainerBlack = Color(0xFF5F2E24) +val OnPrimaryContainerBlack = Color(0xFFFFDBD3) +val SecondaryBlack = Color(0xFFE8BDB2) +val OnSecondaryBlack = Color(0xFF3E2722) +val SecondaryContainerBlack = Color(0xFF583C36) +val OnSecondaryContainerBlack = Color(0xFFFFDBD3) +val TertiaryBlack = Color(0xFFDCC58B) +val OnTertiaryBlack = Color(0xFF3A2D03) +val TertiaryContainerBlack = Color(0xFF514214) +val OnTertiaryContainerBlack = Color(0xFFF9E1A6) +val BackgroundBlack = Color(0xFF090607) +val OnBackgroundBlack = Color(0xFFF0DEDA) +val SurfaceBlack = Color(0xFF090607) +val OnSurfaceBlack = Color(0xFFF0DEDA) +val SurfaceVariantBlack = Color(0xFF4F3F3B) +val OnSurfaceVariantBlack = Color(0xFFD6C1BC) +val OutlineBlack = Color(0xFF9E8B86) +val ErrorBlack = Color(0xFFFFB4AB) +val OnErrorBlack = Color(0xFF690005) +val ErrorContainerBlack = Color(0xFF93000A) +val OnErrorContainerBlack = Color(0xFFFFDAD6) + +// Light Plus palette +val PrimaryLightPlus = Color(0xFF255FA6) +val OnPrimaryLightPlus = Color(0xFFFFFFFF) +val PrimaryContainerLightPlus = Color(0xFFD6E3FF) +val OnPrimaryContainerLightPlus = Color(0xFF001B3E) +val SecondaryLightPlus = Color(0xFF505F79) +val OnSecondaryLightPlus = Color(0xFFFFFFFF) +val SecondaryContainerLightPlus = Color(0xFFD8E3F8) +val OnSecondaryContainerLightPlus = Color(0xFF0C1C33) +val BackgroundLightPlus = Color(0xFFF8F9FF) +val OnBackgroundLightPlus = Color(0xFF1A1C21) +val SurfaceLightPlus = Color(0xFFF8F9FF) +val OnSurfaceLightPlus = Color(0xFF1A1C21) +val SurfaceVariantLightPlus = Color(0xFFE0E2EC) +val OnSurfaceVariantLightPlus = Color(0xFF43474E) +val OutlineLightPlus = Color(0xFF73777F) +val AccentGoodLightPlus = Color(0xFF006E2A) +val AccentBadLightPlus = Color(0xFFBA1A1A) + +// True Black Plus palette +val PrimaryBlackPlus = Color(0xFFA8C8FF) +val OnPrimaryBlackPlus = Color(0xFF003061) +val PrimaryContainerBlackPlus = Color(0xFF004786) +val OnPrimaryContainerBlackPlus = Color(0xFFD6E3FF) +val SecondaryBlackPlus = Color(0xFFBBC7DC) +val OnSecondaryBlackPlus = Color(0xFF253248) +val SecondaryContainerBlackPlus = Color(0xFF3B4960) +val OnSecondaryContainerBlackPlus = Color(0xFFD8E3F8) +val BackgroundBlackPlus = Color(0xFF0A0D14) +val OnBackgroundBlackPlus = Color(0xFFE3E8F3) +val SurfaceBlackPlus = Color(0xFF0A0D14) +val OnSurfaceBlackPlus = Color(0xFFE3E8F3) +val SurfaceVariantBlackPlus = Color(0xFF43474E) +val OnSurfaceVariantBlackPlus = Color(0xFFC3C6D0) +val OutlineBlackPlus = Color(0xFF8D9199) +val AccentGoodBlackPlus = Color(0xFF7ADD8E) +val AccentBadBlackPlus = Color(0xFFFFB4AB) + +val SeedColor = Color(0xFF255FA6) diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/theme/DesignComponents.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/DesignComponents.kt new file mode 100644 index 000000000..463b8bdf9 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/DesignComponents.kt @@ -0,0 +1,1434 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) + +package com.celzero.bravedns.ui.compose.theme + +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.core.spring +import androidx.compose.animation.core.tween +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight +import androidx.compose.material.icons.filled.KeyboardArrowDown +import androidx.compose.material.icons.outlined.Info +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.ButtonGroupDefaults +import androidx.compose.material3.Card +import androidx.compose.material3.CardColors +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.FilledTonalButton +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.LargeTopAppBar +import androidx.compose.material3.ListItem +import androidx.compose.material3.ListItemDefaults +import androidx.compose.material3.MaterialShapes +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.RadioButton +import androidx.compose.material3.SegmentedButton +import androidx.compose.material3.SegmentedButtonDefaults +import androidx.compose.material3.SingleChoiceSegmentedButtonRow +import androidx.compose.material3.Surface +import androidx.compose.material3.Switch +import androidx.compose.material3.ToggleButton +import androidx.compose.material3.ToggleButtonDefaults +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.TopAppBarScrollBehavior +import androidx.compose.material3.toShape +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.hapticfeedback.HapticFeedbackType +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalHapticFeedback +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.Dimensions.Elevation +import com.celzero.bravedns.ui.compose.theme.Dimensions.Opacity + +// ==================== ANIMATED SECTIONS ==================== + +// ==================== CARDS ==================== + +/** + * Standard app card with M3 Expressive corner radius. + */ +@Composable +fun AppCard( + modifier: Modifier = Modifier, + onClick: (() -> Unit)? = null, + colors: CardColors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceContainer + ), + content: @Composable ColumnScope.() -> Unit +) { + if (onClick != null) { + Card( + modifier = modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cardCornerRadius), + colors = colors, + elevation = CardDefaults.cardElevation(defaultElevation = Elevation.medium), + onClick = onClick, + content = content + ) + } else { + Card( + modifier = modifier.fillMaxWidth(), + shape = RoundedCornerShape(Dimensions.cardCornerRadius), + colors = colors, + elevation = CardDefaults.cardElevation(defaultElevation = Elevation.low), + content = content + ) + } +} + +// ==================== EMPTY STATES ==================== + +/** + * Compact empty state for inline use in lists/sections. + */ +@Composable +fun CompactEmptyState( + modifier: Modifier = Modifier, + message: String, + icon: ImageVector? = null +) { + Row( + modifier = modifier + .fillMaxWidth() + .padding(Dimensions.spacingLg), + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically + ) { + if (icon != null) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier + .size(Dimensions.iconSizeSm) + .alpha(Opacity.HINT), + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + Spacer(modifier = Modifier.width(Dimensions.spacingSm)) + } + Text( + text = message, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + modifier = Modifier.alpha(Opacity.HINT) + ) + } +} + +// ==================== LIST ITEMS ==================== + +/** + * Shared grid tile used by configure/about quick actions. + */ +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +fun RethinkGridTile( + title: String, + iconRes: Int, + accentColor: Color, + shape: RoundedCornerShape, + modifier: Modifier = Modifier, + containerColor: Color = MaterialTheme.colorScheme.surfaceContainerLow, + titleColor: Color = MaterialTheme.colorScheme.onSurface, + iconTint: Color = accentColor, + iconContainerColor: Color = accentColor.copy(alpha = 0.16f), + trailing: @Composable (() -> Unit)? = null, + onClick: (() -> Unit)? = null +) { + val iconShape = MaterialShapes.Sunny.toShape() + + if (onClick != null) { + Surface( + onClick = onClick, + shape = shape, + color = containerColor, + modifier = modifier + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 12.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Surface( + shape = iconShape, + color = iconContainerColor, + modifier = Modifier.size(34.dp) + ) { + Box(contentAlignment = Alignment.Center) { + Icon( + painter = painterResource(id = iconRes), + contentDescription = null, + tint = iconTint, + modifier = Modifier.size(18.dp) + ) + } + } + + Text( + text = title, + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + color = titleColor, + maxLines = 2, + overflow = TextOverflow.Ellipsis + ) + + trailing?.invoke() + } + } + } else { + Surface( + shape = shape, + color = containerColor, + modifier = modifier + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 12.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Surface( + shape = iconShape, + color = iconContainerColor, + modifier = Modifier.size(34.dp) + ) { + Box(contentAlignment = Alignment.Center) { + Icon( + painter = painterResource(id = iconRes), + contentDescription = null, + tint = iconTint, + modifier = Modifier.size(18.dp) + ) + } + } + + Text( + text = title, + modifier = Modifier.weight(1f), + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + color = titleColor, + maxLines = 2, + overflow = TextOverflow.Ellipsis + ) + + trailing?.invoke() + } + } + } +} + +// ==================== SECTION HEADERS ==================== + +enum class RethinkSecondaryActionStyle { TONAL, OUTLINED, TEXT } + +@Composable +fun RethinkSegmentedChoiceRow( + options: List, + selectedOption: T, + onOptionSelected: (T) -> Unit, + modifier: Modifier = Modifier, + fillEqually: Boolean = false, + minHeight: Dp = 0.dp, + icon: (@Composable (option: T, selected: Boolean) -> Unit)? = null, + label: @Composable (option: T, selected: Boolean) -> Unit +) { + SingleChoiceSegmentedButtonRow(modifier = modifier.fillMaxWidth()) { + options.forEachIndexed { index, option -> + val isSelected = option == selectedOption + SegmentedButton( + modifier = + Modifier + .then(if (fillEqually) Modifier.weight(1f) else Modifier) + .heightIn(min = minHeight), + selected = isSelected, + onClick = { if (!isSelected) onOptionSelected(option) }, + shape = SegmentedButtonDefaults.itemShape(index = index, count = options.size), + icon = { + icon?.invoke(option, isSelected) + }, + label = { + label(option, isSelected) + } + ) + } + } +} + +@Composable +fun RethinkConnectedChoiceButtonRow( + options: List, + selectedOption: T, + onOptionSelected: (T) -> Unit, + modifier: Modifier = Modifier, + buttonMinHeight: Dp = 0.dp, + icon: (@Composable (option: T, selected: Boolean) -> Unit)? = null, + label: @Composable (option: T, selected: Boolean) -> Unit +) { + Row( + modifier = modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(ButtonGroupDefaults.ConnectedSpaceBetween) + ) { + options.forEachIndexed { index, option -> + val isSelected = option == selectedOption + ToggleButton( + checked = isSelected, + onCheckedChange = { checked -> + if (checked && !isSelected) { + onOptionSelected(option) + } + }, + shapes = + when (index) { + 0 -> ButtonGroupDefaults.connectedLeadingButtonShapes() + options.lastIndex -> ButtonGroupDefaults.connectedTrailingButtonShapes() + else -> ButtonGroupDefaults.connectedMiddleButtonShapes() + }, + colors = + ToggleButtonDefaults.toggleButtonColors( + checkedContainerColor = MaterialTheme.colorScheme.primaryContainer, + checkedContentColor = MaterialTheme.colorScheme.onPrimaryContainer, + containerColor = MaterialTheme.colorScheme.surfaceContainerHigh.copy(alpha = 0.82f), + contentColor = MaterialTheme.colorScheme.onSurfaceVariant + ), + border = null, + modifier = Modifier + .weight(1f) + .heightIn(min = buttonMinHeight) + .semantics { role = Role.RadioButton } + ) { + icon?.let { + it(option, isSelected) + Spacer(modifier = Modifier.size(ToggleButtonDefaults.IconSpacing)) + } + label(option, isSelected) + } + } + } +} + +@Composable +fun RethinkTwoOptionSegmentedRow( + leftLabel: String, + rightLabel: String, + leftSelected: Boolean, + onLeftClick: () -> Unit, + onRightClick: () -> Unit, + modifier: Modifier = Modifier, + minHeight: Dp = 0.dp +) { + RethinkSegmentedChoiceRow( + options = listOf(true, false), + selectedOption = leftSelected, + onOptionSelected = { selected -> + if (selected) onLeftClick() else onRightClick() + }, + modifier = modifier, + fillEqually = true, + minHeight = minHeight, + label = { selected, _ -> + Text(text = if (selected) leftLabel else rightLabel) + } + ) +} + +@Composable +fun RethinkDropdownSelector( + selectedText: String, + options: List, + onOptionSelected: (String) -> Unit, + modifier: Modifier = Modifier, + enabled: Boolean = true +) { + var expanded by remember { mutableStateOf(false) } + val containerColor = + if (enabled) { + MaterialTheme.colorScheme.surfaceContainerLow + } else { + MaterialTheme.colorScheme.surfaceVariant + } + + Box(modifier = modifier.fillMaxWidth()) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + color = containerColor, + border = BorderStroke( + 1.dp, + MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.24f) + ), + modifier = + Modifier + .fillMaxWidth() + .clickable(enabled = enabled) { expanded = true } + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding( + horizontal = Dimensions.spacingLg, + vertical = Dimensions.spacingMd + ), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = selectedText, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f) + ) + Icon( + imageVector = Icons.Filled.KeyboardArrowDown, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + + DropdownMenu( + expanded = expanded && enabled, + onDismissRequest = { expanded = false } + ) { + options.forEach { option -> + DropdownMenuItem( + text = { + Text( + text = option, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + }, + onClick = { + expanded = false + onOptionSelected(option) + } + ) + } + } + } +} + +@Composable +fun RethinkConfirmDialog( + onDismissRequest: () -> Unit, + confirmText: String, + onConfirm: () -> Unit, + modifier: Modifier = Modifier, + title: String? = null, + message: String? = null, + dismissText: String? = null, + onDismiss: (() -> Unit)? = onDismissRequest, + isConfirmDestructive: Boolean = false, + confirmEnabled: Boolean = true, + dismissEnabled: Boolean = true, + text: (@Composable (() -> Unit))? = null +) { + val confirmColors = + if (isConfirmDestructive) { + ButtonDefaults.textButtonColors(contentColor = MaterialTheme.colorScheme.error) + } else { + ButtonDefaults.textButtonColors() + } + + AlertDialog( + modifier = modifier, + onDismissRequest = onDismissRequest, + title = title?.let { { Text(text = it) } }, + text = text ?: message?.let { { Text(text = it) } }, + confirmButton = { + TextButton(onClick = onConfirm, colors = confirmColors, enabled = confirmEnabled) { + Text(text = confirmText) + } + }, + dismissButton = + if (dismissText != null && onDismiss != null) { + { + TextButton(onClick = onDismiss, enabled = dismissEnabled) { + Text(text = dismissText) + } + } + } else { + null + } + ) +} + +@Composable +fun RethinkMultiActionDialog( + onDismissRequest: () -> Unit, + title: String, + primaryText: String, + onPrimary: () -> Unit, + modifier: Modifier = Modifier, + message: String? = null, + secondaryText: String? = null, + onSecondary: (() -> Unit)? = null, + tertiaryText: String? = null, + onTertiary: (() -> Unit)? = null, + isPrimaryDestructive: Boolean = false, + text: (@Composable (() -> Unit))? = null +) { + val primaryColors = + if (isPrimaryDestructive) { + ButtonDefaults.textButtonColors(contentColor = MaterialTheme.colorScheme.error) + } else { + ButtonDefaults.textButtonColors() + } + + AlertDialog( + modifier = modifier, + onDismissRequest = onDismissRequest, + title = { Text(text = title) }, + text = text ?: message?.let { { Text(text = it) } }, + confirmButton = { + TextButton(onClick = onPrimary, colors = primaryColors) { + Text(text = primaryText) + } + }, + dismissButton = { + Row(horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingXs)) { + if (secondaryText != null && onSecondary != null) { + TextButton(onClick = onSecondary) { + Text(text = secondaryText) + } + } + if (tertiaryText != null && onTertiary != null) { + TextButton(onClick = onTertiary) { + Text(text = tertiaryText) + } + } + } + } + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RethinkBottomSheetDragHandle( + modifier: Modifier = Modifier +) { + Box( + modifier = modifier + .fillMaxWidth() + .padding(top = Dimensions.spacingXs, bottom = Dimensions.spacingSm), + contentAlignment = Alignment.Center + ) { + Surface( + modifier = Modifier + .width(44.dp) + .height(5.dp), + shape = RoundedCornerShape(100), + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.42f) + ) {} + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RethinkModalBottomSheet( + onDismissRequest: () -> Unit, + modifier: Modifier = Modifier, + dragHandle: @Composable (() -> Unit)? = { RethinkBottomSheetDragHandle() }, + containerColor: Color = Color.Unspecified, + contentPadding: PaddingValues = PaddingValues( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingSm + ), + verticalSpacing: Dp = Dimensions.spacingLg, + includeBottomSpacer: Boolean = true, + content: @Composable ColumnScope.() -> Unit +) { + ModalBottomSheet( + onDismissRequest = onDismissRequest, + dragHandle = dragHandle, + containerColor = + if (containerColor == Color.Unspecified) { + MaterialTheme.colorScheme.surface + } else { + containerColor + } + ) { + Column( + modifier = modifier + .fillMaxWidth() + .padding(contentPadding), + verticalArrangement = Arrangement.spacedBy(verticalSpacing) + ) { + content() + if (includeBottomSpacer) { + Spacer(modifier = Modifier.height(Dimensions.spacing2xl)) + } + } + } +} + +@Composable +fun RethinkBottomSheetCard( + modifier: Modifier = Modifier, + shape: RoundedCornerShape = RoundedCornerShape(Dimensions.cornerRadius3xl), + contentPadding: PaddingValues = PaddingValues(horizontal = 14.dp, vertical = 12.dp), + content: @Composable ColumnScope.() -> Unit +) { + Surface( + modifier = modifier.fillMaxWidth(), + shape = shape, + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.22f)), + tonalElevation = 0.dp + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(contentPadding), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingSm), + content = content + ) + } +} + +@Composable +fun RethinkBottomSheetActionRow( + modifier: Modifier = Modifier, + primaryText: String, + onPrimaryClick: () -> Unit, + secondaryText: String? = null, + onSecondaryClick: (() -> Unit)? = null, + primaryEnabled: Boolean = true, + secondaryEnabled: Boolean = true, + secondaryStyle: RethinkSecondaryActionStyle = RethinkSecondaryActionStyle.TONAL, + useCardContainer: Boolean = false +) { + val content: @Composable () -> Unit = { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding( + horizontal = Dimensions.spacingMd, + vertical = Dimensions.spacingSmMd + ), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingSmMd), + verticalAlignment = Alignment.CenterVertically + ) { + if (secondaryText != null && onSecondaryClick != null) { + when (secondaryStyle) { + RethinkSecondaryActionStyle.TONAL -> { + FilledTonalButton( + modifier = Modifier.weight(1f), + onClick = onSecondaryClick, + enabled = secondaryEnabled + ) { + Text(text = secondaryText) + } + } + + RethinkSecondaryActionStyle.OUTLINED -> { + OutlinedButton( + modifier = Modifier.weight(1f), + onClick = onSecondaryClick, + enabled = secondaryEnabled + ) { + Text(text = secondaryText) + } + } + + RethinkSecondaryActionStyle.TEXT -> { + TextButton( + modifier = Modifier.weight(1f), + onClick = onSecondaryClick, + enabled = secondaryEnabled + ) { + Text(text = secondaryText) + } + } + } + Button( + modifier = Modifier.weight(1f), + onClick = onPrimaryClick, + enabled = primaryEnabled + ) { + Text(text = primaryText) + } + } else { + Spacer(modifier = Modifier.weight(1f)) + Button( + onClick = onPrimaryClick, + enabled = primaryEnabled + ) { + Text(text = primaryText) + } + } + } + } + + if (useCardContainer) { + RethinkBottomSheetCard( + modifier = modifier, + shape = RoundedCornerShape(Dimensions.cornerRadiusXl), + contentPadding = PaddingValues(0.dp) + ) { + content() + } + } else { + Box( + modifier = + modifier + .fillMaxWidth() + .padding( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.spacingXs + ) + ) { + content() + } + } +} + +/** + * Section header — M3 Expressive style with more prominent styling and typography. + */ +@Composable +fun SectionHeader( + title: String, + modifier: Modifier = Modifier, + color: Color = MaterialTheme.colorScheme.onSurfaceVariant, + actionLabel: String? = null, + onAction: (() -> Unit)? = null +) { + Row( + modifier = modifier + .fillMaxWidth() + .padding( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingMd, + bottom = Dimensions.spacingSm + ), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = title, + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + letterSpacing = 0.1.sp, + color = color + ) + if (actionLabel != null && onAction != null) { + TextButton( + onClick = onAction, + contentPadding = PaddingValues(horizontal = Dimensions.spacingSm, vertical = 0.dp) + ) { + Text( + text = actionLabel, + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.SemiBold, + color = color, + letterSpacing = 0.1.sp + ) + } + } + } +} + +/** + * Section header with optional subtitle for more context. + */ +@Composable +fun SectionHeaderWithSubtitle( + modifier: Modifier = Modifier, + title: String, + subtitle: String? = null, + color: Color = MaterialTheme.colorScheme.onSurfaceVariant, + actionLabel: String? = null, + onAction: (() -> Unit)? = null +) { + Column( + modifier = modifier + .fillMaxWidth() + .padding( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingMd, + bottom = Dimensions.spacingSm + ) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = title, + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.SemiBold, + letterSpacing = 0.1.sp, + color = color + ) + if (actionLabel != null && onAction != null) { + TextButton( + onClick = onAction, + contentPadding = PaddingValues( + horizontal = Dimensions.spacingSm, + vertical = 0.dp + ) + ) { + Text( + text = actionLabel, + style = MaterialTheme.typography.labelLarge, + fontWeight = FontWeight.SemiBold, + color = color, + letterSpacing = 0.1.sp + ) + } + } + } + if (subtitle != null) { + Spacer(modifier = Modifier.height(Dimensions.spacingXs)) + Text( + text = subtitle, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + fontWeight = FontWeight.Normal, + letterSpacing = 0.sp + ) + } + } +} + +// ==================== BUTTONS ==================== + +/** + * Primary action button — M3 Expressive full-pill shape. + */ +@Composable +fun PrimaryButton( + text: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, + enabled: Boolean = true, + icon: ImageVector? = null +) { + Button( + onClick = onClick, + modifier = modifier.height(Dimensions.buttonHeight), + enabled = enabled, + shape = RoundedCornerShape(Dimensions.buttonCornerRadius), + colors = ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primary, + contentColor = MaterialTheme.colorScheme.onPrimary + ) + ) { + if (icon != null) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(Dimensions.iconSizeSm) + ) + Spacer(modifier = Modifier.width(Dimensions.spacingSm)) + } + Text(text = text, fontWeight = FontWeight.SemiBold) + } +} + +/** + * Secondary action button — pill shape. + */ +@Composable +fun SecondaryButton( + text: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, + enabled: Boolean = true, + icon: ImageVector? = null +) { + OutlinedButton( + onClick = onClick, + modifier = modifier.height(Dimensions.buttonHeight), + enabled = enabled, + shape = RoundedCornerShape(Dimensions.buttonCornerRadius) + ) { + if (icon != null) { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(Dimensions.iconSizeSm) + ) + Spacer(modifier = Modifier.width(Dimensions.spacingSm)) + } + Text(text = text) + } +} + +// ==================== STAT ITEMS ==================== + +/** + * Stat display for dashboard cards. + */ +@Composable +fun StatItem( + label: String, + value: String, + modifier: Modifier = Modifier, + isHighlighted: Boolean = false +) { + Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) { + Text( + text = value, + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + color = if (isHighlighted) MaterialTheme.colorScheme.primary + else MaterialTheme.colorScheme.onSurface, + letterSpacing = (-0.5).sp + ) + Text( + text = label, + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = Opacity.MEDIUM), + letterSpacing = 0.2.sp + ) + } +} + +// ==================== EXPRESSIVE LAYOUT PRIMITIVES ==================== + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RethinkTopBar( + title: String, + onBackClick: (() -> Unit)? = null, + scrollBehavior: TopAppBarScrollBehavior? = null, + containerColor: Color = MaterialTheme.colorScheme.surface, + scrolledContainerColor: Color = MaterialTheme.colorScheme.surfaceContainer, + actions: @Composable RowScope.() -> Unit = {} +) { + TopAppBar( + title = { + Text( + text = title, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + fontWeight = FontWeight.SemiBold, + letterSpacing = (-0.15).sp + ) + }, + navigationIcon = { + if (onBackClick != null) { + IconButton(onClick = onBackClick) { + Icon( + imageVector = Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = stringResource(R.string.cd_navigate_back) + ) + } + } + }, + actions = actions, + scrollBehavior = scrollBehavior, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = containerColor, + scrolledContainerColor = scrolledContainerColor, + navigationIconContentColor = MaterialTheme.colorScheme.onSurfaceVariant, + titleContentColor = MaterialTheme.colorScheme.onSurface, + actionIconContentColor = MaterialTheme.colorScheme.onSurfaceVariant + ) + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RethinkLargeTopBar( + title: String, + subtitle: String? = null, + onBackClick: (() -> Unit)? = null, + scrollBehavior: TopAppBarScrollBehavior? = null, + containerColor: Color = MaterialTheme.colorScheme.surface, + scrolledContainerColor: Color = MaterialTheme.colorScheme.surfaceContainer, + titleTextStyle: TextStyle = MaterialTheme.typography.titleLarge, + titleStartPadding: Dp = 0.dp, + titleLeading: (@Composable () -> Unit)? = null, + actions: @Composable RowScope.() -> Unit = {} +) { + LargeTopAppBar( + title = { + Row( + modifier = Modifier.padding(start = titleStartPadding), + horizontalArrangement = Arrangement.spacedBy(10.dp), + verticalAlignment = Alignment.CenterVertically + ) { + titleLeading?.invoke() + Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text( + text = title, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + style = titleTextStyle, + fontWeight = FontWeight.SemiBold, + letterSpacing = (-0.2).sp + ) + if (!subtitle.isNullOrBlank()) { + Text( + text = subtitle, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + style = MaterialTheme.typography.labelMedium, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } + }, + navigationIcon = { + if (onBackClick != null) { + IconButton(onClick = onBackClick) { + Icon( + imageVector = Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = stringResource(R.string.cd_navigate_back) + ) + } + } + }, + actions = actions, + scrollBehavior = scrollBehavior, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = containerColor, + scrolledContainerColor = scrolledContainerColor, + navigationIconContentColor = MaterialTheme.colorScheme.onSurfaceVariant, + titleContentColor = MaterialTheme.colorScheme.onSurface, + actionIconContentColor = MaterialTheme.colorScheme.onSurfaceVariant + ) + ) +} + +enum class CardPosition { + First, Middle, Last, Single +} + +fun cardPositionFor(index: Int, lastIndex: Int): CardPosition { + return when { + lastIndex <= 0 -> CardPosition.Single + index == 0 -> CardPosition.First + index == lastIndex -> CardPosition.Last + else -> CardPosition.Middle + } +} + +/** + * Expressive grouped list container — M3 Expressive card shape. + */ +@Composable +fun RethinkListGroup( + modifier: Modifier = Modifier, + content: @Composable ColumnScope.() -> Unit +) { + Column( + modifier = modifier + .fillMaxWidth() + .padding(vertical = 2.dp), + content = content + ) +} + +/** + * Expressive list item with spring press animation and tinted icon container. + */ +@Composable +fun RethinkListItem( + modifier: Modifier = Modifier, + headline: String, + headlineAnnotated: AnnotatedString? = null, + supporting: String? = null, + supportingAnnotated: AnnotatedString? = null, + contentOffset: Modifier = Modifier, + leadingIcon: ImageVector? = null, + leadingIconPainter: Painter? = null, + leadingIconTint: Color = MaterialTheme.colorScheme.primary, + leadingIconContainerColor: Color = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.6f), + leadingIconContainerShape: Shape = RoundedCornerShape(Dimensions.iconContainerRadius), + leadingContent: @Composable (() -> Unit)? = null, + trailing: @Composable (() -> Unit)? = null, + position: CardPosition = CardPosition.Middle, + enabled: Boolean = true, + highlighted: Boolean = false, + defaultContainerColor: Color = MaterialTheme.colorScheme.surfaceContainerLow, + highlightContainerColor: Color = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.34f), + showTrailingChevron: Boolean = false, + onClick: (() -> Unit)? = null +) { + val hapticFeedback = LocalHapticFeedback.current + val interactionSource = remember { MutableInteractionSource() } + val isPressed by interactionSource.collectIsPressedAsState() + val scale by animateFloatAsState( + targetValue = if (isPressed) 0.985f else 1f, + animationSpec = spring(dampingRatio = 0.62f, stiffness = Spring.StiffnessMediumLow), + label = "listItemScale" + ) + + val itemShape = when (position) { + CardPosition.Single -> RoundedCornerShape(Dimensions.cornerRadius3xl) + CardPosition.First -> RoundedCornerShape( + topStart = 22.dp, + topEnd = 22.dp, + bottomStart = 6.dp, + bottomEnd = 6.dp + ) + + CardPosition.Last -> RoundedCornerShape( + topStart = 6.dp, + topEnd = 6.dp, + bottomStart = 22.dp, + bottomEnd = 22.dp + ) + + CardPosition.Middle -> RoundedCornerShape(Dimensions.cornerRadiusSm) + } + + val contentAlpha = if (enabled) 1f else 0.5f + val highlightAlpha by animateFloatAsState( + targetValue = if (highlighted) 1f else 0f, + animationSpec = tween(durationMillis = 120), + label = "listItemHighlight" + ) + val containerColor = lerp(defaultContainerColor, highlightContainerColor, highlightAlpha) + val wrappedOnClick = + if (onClick != null) { + { + hapticFeedback.performHapticFeedback(HapticFeedbackType.TextHandleMove) + onClick() + } + } else { + null + } + + Column( + modifier = modifier + .fillMaxWidth() + .scale(scale) + ) { + Surface( + shape = itemShape, + color = containerColor, + modifier = Modifier + .fillMaxWidth() + .padding( + top = if (position == CardPosition.First || position == CardPosition.Single) 0.dp else 2.dp + ), + onClick = wrappedOnClick ?: {}, + enabled = wrappedOnClick != null && enabled, + interactionSource = interactionSource + ) { + ListItem( + headlineContent = { + Text( + text = headlineAnnotated ?: AnnotatedString(headline), + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = contentAlpha), + letterSpacing = 0.sp, + modifier = contentOffset + ) + }, + supportingContent = + if (supporting != null || supportingAnnotated != null) { + { + Text( + text = supportingAnnotated ?: AnnotatedString(supporting.orEmpty()), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.82f * contentAlpha), + letterSpacing = 0.sp, + modifier = contentOffset.then(Modifier.padding(top = Dimensions.spacingXs)) + ) + } + } else { + null + }, + leadingContent = { + if (leadingContent != null) { + leadingContent() + } else if (leadingIcon != null || leadingIconPainter != null) { + Surface( + shape = leadingIconContainerShape, + color = leadingIconContainerColor, + modifier = Modifier.size(Dimensions.iconContainerSm) + ) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(Dimensions.iconContainerSm) + ) { + if (leadingIcon != null) { + Icon( + imageVector = leadingIcon, + contentDescription = null, + tint = leadingIconTint.copy(alpha = contentAlpha), + modifier = Modifier.size(Dimensions.iconSizeSm) + ) + } else if (leadingIconPainter != null) { + if (leadingIconTint == Color.Unspecified) { + Image( + painter = leadingIconPainter, + contentDescription = null, + modifier = Modifier.size(18.dp) + ) + } else { + Icon( + painter = leadingIconPainter, + contentDescription = null, + tint = leadingIconTint.copy(alpha = contentAlpha), + modifier = Modifier.size(18.dp) + ) + } + } + } + } + } + }, + trailingContent = + when { + trailing != null -> trailing + showTrailingChevron && onClick != null && enabled -> { + { + Icon( + imageVector = Icons.AutoMirrored.Rounded.KeyboardArrowRight, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f) + ) + } + } + + else -> null + }, + colors = ListItemDefaults.colors( + containerColor = Color.Transparent + ), + tonalElevation = 0.dp, + shadowElevation = 0.dp, + modifier = Modifier + .clip(itemShape) + .padding(horizontal = Dimensions.spacingNone, vertical = 1.dp) + ) + } + } +} + +@Composable +fun RethinkActionListItem( + title: String, + description: String? = null, + iconRes: Int? = null, + icon: ImageVector? = null, + iconPainter: Painter? = null, + leadingContent: @Composable (() -> Unit)? = null, + accentColor: Color = MaterialTheme.colorScheme.primary, + position: CardPosition = CardPosition.Middle, + highlighted: Boolean = false, + enabled: Boolean = true, + trailing: @Composable (() -> Unit)? = null, + onClick: () -> Unit +) { + val resolvedPainter = iconPainter ?: iconRes?.let { painterResource(id = it) } + RethinkListItem( + headline = title, + supporting = description, + leadingIcon = icon, + leadingIconPainter = resolvedPainter, + leadingContent = leadingContent, + leadingIconTint = accentColor, + leadingIconContainerColor = accentColor.copy(alpha = 0.14f), + position = position, + highlighted = highlighted, + enabled = enabled, + showTrailingChevron = false, + trailing = trailing, + onClick = onClick + ) +} + +@Composable +fun RethinkToggleListItem( + title: String, + description: String? = null, + checked: Boolean, + onCheckedChange: (Boolean) -> Unit, + iconRes: Int? = null, + icon: ImageVector? = null, + iconPainter: Painter? = null, + accentColor: Color = MaterialTheme.colorScheme.primary, + position: CardPosition = CardPosition.Middle, + highlighted: Boolean = false, + enabled: Boolean = true, + onRowClick: (() -> Unit)? = null, + trailingPrefix: @Composable (() -> Unit)? = null +) { + val hapticFeedback = LocalHapticFeedback.current + val onSwitchChange: (Boolean) -> Unit = { value -> + hapticFeedback.performHapticFeedback(HapticFeedbackType.TextHandleMove) + onCheckedChange(value) + } + RethinkActionListItem( + title = title, + description = description, + iconRes = iconRes, + icon = icon, + iconPainter = iconPainter, + accentColor = accentColor, + position = position, + highlighted = highlighted, + enabled = enabled, + trailing = { + if (trailingPrefix == null) { + Switch( + checked = checked, + onCheckedChange = onSwitchChange, + enabled = enabled + ) + } else { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(2.dp) + ) { + trailingPrefix() + Switch( + checked = checked, + onCheckedChange = onSwitchChange, + enabled = enabled + ) + } + } + }, + onClick = onRowClick ?: { onCheckedChange(!checked) } + ) +} + +@Composable +fun RethinkRadioListItem( + title: String, + description: String? = null, + selected: Boolean, + onSelect: () -> Unit, + iconRes: Int? = null, + icon: ImageVector? = null, + iconPainter: Painter? = null, + accentColor: Color = MaterialTheme.colorScheme.primary, + position: CardPosition = CardPosition.Middle, + highlighted: Boolean = false, + onInfoClick: (() -> Unit)? = null +) { + val hapticFeedback = LocalHapticFeedback.current + RethinkActionListItem( + title = title, + description = description, + iconRes = iconRes, + icon = icon, + iconPainter = iconPainter, + accentColor = accentColor, + position = position, + highlighted = highlighted, + trailing = { + Row(verticalAlignment = Alignment.CenterVertically) { + if (onInfoClick != null) { + IconButton( + onClick = onInfoClick, + modifier = Modifier.size(36.dp) + ) { + Icon( + imageVector = Icons.Outlined.Info, + contentDescription = stringResource(id = R.string.lbl_info), + tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.8f), + modifier = Modifier.size(20.dp) + ) + } + } + RadioButton( + selected = selected, + onClick = { + hapticFeedback.performHapticFeedback(HapticFeedbackType.TextHandleMove) + onSelect() + } + ) + } + }, + onClick = onSelect + ) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Dimensions.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Dimensions.kt new file mode 100644 index 000000000..9bc9109dc --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Dimensions.kt @@ -0,0 +1,144 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.theme + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp + +/** + * Design system dimensions following Material 3 Expressive guidelines. + */ +object Dimensions { + // Spacing scale (4dp base) + val spacingNone: Dp = 0.dp + val spacingXs: Dp = 4.dp + val spacingGridTile: Dp = 2.dp + val spacingSm: Dp = 8.dp + val spacingMd: Dp = 12.dp + val spacingSmMd: Dp = 10.dp + val spacingLg: Dp = 16.dp + val spacingXl: Dp = 24.dp + val spacing2xl: Dp = 32.dp + val spacing3xl: Dp = 48.dp + + // M3 Expressive shape scale — larger, more expressive corner radii + val cornerRadius2xs: Dp = 3.dp + val cornerRadiusXs: Dp = 4.dp + val cornerRadiusSm: Dp = 6.dp + val cornerRadiusSmMd: Dp = 10.dp + val cornerRadiusMd: Dp = 12.dp + val cornerRadiusMdLg: Dp = 14.dp + val cornerRadiusLg: Dp = 16.dp + // Normalized medium-large card radii to one standard (20dp) + val cornerRadiusXl: Dp = 20.dp + val cornerRadius2xl: Dp = 20.dp + val cornerRadius3xl: Dp = 20.dp + val cornerRadius4xl: Dp = 24.dp + val cornerRadius5xl: Dp = 28.dp + val cornerRadiusPill: Dp = 50.dp + val cornerRadiusFull: Dp = 999.dp + + val cardCornerRadius: Dp = 20.dp // Cards, list groups + val cardCornerRadiusLarge: Dp = 28.dp // Section cards + val heroCornerRadius: Dp = 32.dp // Hero/protection cards + val chipCornerRadius: Dp = 50.dp // Full pill chips + val iconContainerRadius: Dp = 12.dp // Icon surface containers + val buttonCornerRadius: Dp = 50.dp // Full pill buttons (M3 Expressive default) + val buttonCornerRadiusLarge: Dp = 50.dp + + // Card padding + val cardPadding: Dp = 16.dp + val cardPaddingSm: Dp = 12.dp + + // Screen padding + val screenPaddingHorizontal: Dp = 16.dp + val screenPaddingVertical: Dp = 12.dp + + // Icon sizes + val iconSizeXs: Dp = 16.dp + val iconSizeSm: Dp = 20.dp + val iconSizeMd: Dp = 24.dp + val iconSizeLg: Dp = 32.dp + val iconSizeXl: Dp = 48.dp + + // Icon container sizes (tinted squircle containers) + val iconContainerSm: Dp = 32.dp + val iconContainerMd: Dp = 40.dp + val iconContainerLg: Dp = 48.dp + + // Touch targets (minimum 48dp for accessibility) + val touchTargetMin: Dp = 48.dp + val touchTargetSm: Dp = 44.dp + + // Button dimensions — M3 Expressive prefers taller buttons + val buttonHeight: Dp = 52.dp + val buttonHeightSm: Dp = 44.dp + val buttonHeightLg: Dp = 60.dp + + // List item dimensions + val listItemHeight: Dp = 64.dp + val listItemHeightSm: Dp = 56.dp + val listItemHeightLg: Dp = 72.dp + + // Progress indicators + val progressBarHeight: Dp = 10.dp + + // Active tab indicator + val tabIndicatorHeight: Dp = 4.dp + + // Divider + val dividerThickness: Dp = 0.5.dp + val dividerThicknessBold: Dp = 1.dp + + // Opacity values + object Opacity { + const val FULL: Float = 1f + const val HIGH: Float = 0.87f + const val MEDIUM: Float = 0.7f + const val DISABLED: Float = 0.38f + const val LOW: Float = 0.5f + const val HINT: Float = 0.6f + } + + // Elevation values + object Elevation { + val none: Dp = 0.dp + val low: Dp = 1.dp + val medium: Dp = 4.dp + val high: Dp = 8.dp + } +} + +/** + * Standard padding values for common use cases. + */ +object Paddings { + val none = PaddingValues(0.dp) + val xs = PaddingValues(Dimensions.spacingXs) + val sm = PaddingValues(Dimensions.spacingSm) + val md = PaddingValues(Dimensions.spacingMd) + val lg = PaddingValues(Dimensions.spacingLg) + val xl = PaddingValues(Dimensions.spacingXl) + + val screen = PaddingValues( + horizontal = Dimensions.screenPaddingHorizontal, + vertical = Dimensions.screenPaddingVertical + ) + + val card = PaddingValues(Dimensions.cardPadding) + val cardSm = PaddingValues(Dimensions.cardPaddingSm) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/theme/FilterComponents.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/FilterComponents.kt new file mode 100644 index 000000000..6f59efa56 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/FilterComponents.kt @@ -0,0 +1,162 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.theme + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Close +import androidx.compose.material.icons.rounded.Search +import androidx.compose.material3.FilterChip +import androidx.compose.material3.FilterChipDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.material3.TextFieldDefaults +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp + +@Composable +fun RethinkSearchField( + query: String, + onQueryChange: (String) -> Unit, + placeholder: String, + modifier: Modifier = Modifier, + enabled: Boolean = true, + shape: RoundedCornerShape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + containerColor: Color = MaterialTheme.colorScheme.surfaceContainerHigh, + textStyle: TextStyle = MaterialTheme.typography.bodyMedium, + leadingIconTint: Color = MaterialTheme.colorScheme.primary, + iconSize: Dp = Dimensions.iconSizeSm, + trailingIconSize: Dp = iconSize, + trailingIconButtonSize: Dp? = null, + clearQueryContentDescription: String? = null, + closeWhenEmptyContentDescription: String? = null, + onClearQuery: (() -> Unit)? = null, + onCloseWhenEmpty: (() -> Unit)? = null +) { + TextField( + value = query, + onValueChange = onQueryChange, + modifier = modifier, + singleLine = true, + enabled = enabled, + textStyle = textStyle, + placeholder = { Text(placeholder) }, + leadingIcon = { + Icon( + imageVector = Icons.Rounded.Search, + contentDescription = null, + tint = leadingIconTint, + modifier = Modifier.size(iconSize) + ) + }, + trailingIcon = { + val action = + when { + query.isNotEmpty() -> onClearQuery ?: { onQueryChange("") } + onCloseWhenEmpty != null -> onCloseWhenEmpty + else -> null + } + if (action != null) { + val description = + if (query.isNotEmpty()) { + clearQueryContentDescription + } else { + closeWhenEmptyContentDescription + } + val buttonModifier = + if (trailingIconButtonSize != null) { + Modifier.size(trailingIconButtonSize) + } else { + Modifier + } + IconButton( + onClick = action, + modifier = buttonModifier + ) { + Icon( + imageVector = Icons.Rounded.Close, + contentDescription = description, + modifier = Modifier.size(trailingIconSize) + ) + } + } + }, + shape = shape, + colors = TextFieldDefaults.colors( + focusedContainerColor = containerColor, + unfocusedContainerColor = containerColor, + focusedIndicatorColor = Color.Transparent, + unfocusedIndicatorColor = Color.Transparent, + disabledIndicatorColor = Color.Transparent + ) + ) +} + +@Composable +fun RethinkFilterChip( + label: String, + selected: Boolean, + onClick: () -> Unit, + modifier: Modifier = Modifier, + shape: RoundedCornerShape = RoundedCornerShape(Dimensions.cornerRadiusMdLg), + selectedContainerColor: Color = MaterialTheme.colorScheme.primaryContainer, + selectedLabelColor: Color = MaterialTheme.colorScheme.onPrimaryContainer, + containerColor: Color = MaterialTheme.colorScheme.surfaceContainerLow, + labelColor: Color = MaterialTheme.colorScheme.onSurfaceVariant, + textStyle: TextStyle = MaterialTheme.typography.labelMedium, + leadingIcon: (@Composable () -> Unit)? = null, + selectedLeadingIconColor: Color = selectedLabelColor, + leadingIconColor: Color = labelColor, + border: BorderStroke? = null, + minHeight: Dp = 0.dp, + selectedLabelWeight: FontWeight = FontWeight.SemiBold, + defaultLabelWeight: FontWeight = FontWeight.Normal +) { + FilterChip( + modifier = modifier.heightIn(min = minHeight), + selected = selected, + onClick = onClick, + label = { + Text( + text = label, + fontWeight = if (selected) selectedLabelWeight else defaultLabelWeight, + style = textStyle + ) + }, + leadingIcon = leadingIcon, + shape = shape, + border = border, + colors = FilterChipDefaults.filterChipColors( + selectedContainerColor = selectedContainerColor, + selectedLabelColor = selectedLabelColor, + containerColor = containerColor, + labelColor = labelColor, + selectedLeadingIconColor = selectedLeadingIconColor, + iconColor = leadingIconColor + ) + ) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Motion.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Motion.kt new file mode 100644 index 000000000..8e5642f2c --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Motion.kt @@ -0,0 +1,36 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.theme + +import android.animation.ValueAnimator +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember + +@Composable +fun rememberReducedMotion(): Boolean { + return remember { + runCatching { !ValueAnimator.areAnimatorsEnabled() }.getOrDefault(false) + } +} + +@Composable +@Suppress("UNUSED_PARAMETER") +fun RethinkAnimatedSection( + index: Int, + content: @Composable () -> Unit +) { + content() +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/theme/RethinkScreenScaffold.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/RethinkScreenScaffold.kt new file mode 100644 index 000000000..977cb0ce1 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/RethinkScreenScaffold.kt @@ -0,0 +1,85 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.theme + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.text.TextStyle + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun RethinkTopBarLazyColumnScreen( + title: String, + subtitle: String? = null, + onBackClick: (() -> Unit)? = null, + containerColor: Color = MaterialTheme.colorScheme.background, + topBarContainerColor: Color = MaterialTheme.colorScheme.surface, + topBarScrolledContainerColor: Color = MaterialTheme.colorScheme.surfaceContainer, + topBarTitleTextStyle: TextStyle = MaterialTheme.typography.titleLarge, + listState: LazyListState? = null, + contentPadding: PaddingValues = + PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = Dimensions.spacing3xl + ), + verticalArrangement: Arrangement.Vertical = Arrangement.spacedBy(Dimensions.spacingLg), + topBarActions: @Composable RowScope.() -> Unit = {}, + content: LazyListScope.() -> Unit +) { + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + val effectiveListState = listState ?: rememberLazyListState() + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + containerColor = containerColor, + topBar = { + RethinkLargeTopBar( + title = title, + subtitle = subtitle, + onBackClick = onBackClick, + scrollBehavior = scrollBehavior, + containerColor = topBarContainerColor, + scrolledContainerColor = topBarScrolledContainerColor, + titleTextStyle = topBarTitleTextStyle, + actions = topBarActions + ) + } + ) { paddingValues -> + LazyColumn( + state = effectiveListState, + modifier = Modifier.fillMaxSize().padding(paddingValues), + contentPadding = contentPadding, + verticalArrangement = verticalArrangement, + content = content + ) + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Theme.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Theme.kt new file mode 100644 index 000000000..d9035d020 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Theme.kt @@ -0,0 +1,134 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@file:OptIn(ExperimentalMaterial3ExpressiveApi::class) + +package com.celzero.bravedns.ui.compose.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.MaterialExpressiveTheme +import androidx.compose.material3.Shapes +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat +import com.celzero.bravedns.util.Themes +import com.materialkolor.dynamiccolor.ColorSpec +import com.materialkolor.rememberDynamicMaterialThemeState + +private val RethinkCoralSeed = Color(0xffFF5D73) +private val RethinkRoseSeed = Color(0xffEC4899) +private val RethinkTealSeed = Color(0xff14B8A6) +private val RethinkBlueSeed = Color(0xff3B82F6) +private val RethinkPurpleSeed = Color(0xffA855F7) +private val RethinkOrangeSeed = Color(0xffF97316) +private val RethinkGreenSeed = Color(0xff22C55E) +private val RethinkAmberSeed = Color(0xffF2B705) +private val RethinkCyanSeed = Color(0xff06B6D4) +private val RethinkIndigoSeed = Color(0xff6366F1) + +// M3 Expressive shape scale — generous corner radii throughout +val RethinkShapes = Shapes( + extraSmall = RoundedCornerShape(Dimensions.cornerRadiusSm), + small = RoundedCornerShape(Dimensions.cornerRadiusSmMd), + medium = RoundedCornerShape(Dimensions.cornerRadiusLg), + large = RoundedCornerShape(Dimensions.cornerRadius2xl), + extraLarge = RoundedCornerShape(Dimensions.heroCornerRadius) +) + +enum class RethinkColorPreset(val id: Int, val seedColor: Color?) { + AUTO(0, null), + DYNAMIC(1, null), + CORAL(2, RethinkCoralSeed), + ROSE(11, RethinkRoseSeed), + TEAL(3, RethinkTealSeed), + BLUE(4, RethinkBlueSeed), + PURPLE(5, RethinkPurpleSeed), + ORANGE(6, RethinkOrangeSeed), + GREEN(7, RethinkGreenSeed), + AMBER(8, RethinkAmberSeed), + CYAN(9, RethinkCyanSeed), + INDIGO(10, RethinkIndigoSeed); + + companion object { + fun fromId(id: Int): RethinkColorPreset { + return entries.firstOrNull { it.id == id } ?: AUTO + } + } +} + +@Composable +fun RethinkTheme( + themePreference: Int = Themes.SYSTEM_DEFAULT.id, + colorPreset: RethinkColorPreset = RethinkColorPreset.AUTO, + content: @Composable () -> Unit +) { + val resolvedThemePreference = Themes.resolveThemePreference( + isDarkThemeOn = androidx.compose.foundation.isSystemInDarkTheme(), + preference = themePreference + ) + val darkTheme = resolvedThemePreference == Themes.DARK.id || resolvedThemePreference == Themes.DARK_PLUS.id + + val useDynamicColor = when (colorPreset) { + RethinkColorPreset.AUTO -> Themes.useDynamicColor(themePreference) + RethinkColorPreset.DYNAMIC -> Themes.useDynamicColor(themePreference) + else -> false + } && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S + + val seedColor = colorPreset.seedColor ?: RethinkCoralSeed + + val colorScheme = when { + useDynamicColor -> { + val context = LocalContext.current + if (darkTheme) { + dynamicDarkColorScheme(context) + } else { + dynamicLightColorScheme(context) + } + } + + else -> + rememberDynamicMaterialThemeState( + seedColor = seedColor, + isDark = darkTheme, + specVersion = ColorSpec.SpecVersion.SPEC_2025, + ).colorScheme + } + + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + val windowInsetsController = WindowCompat.getInsetsController(window, view) + windowInsetsController.isAppearanceLightStatusBars = !darkTheme + windowInsetsController.isAppearanceLightNavigationBars = !darkTheme + } + } + + MaterialExpressiveTheme( + colorScheme = colorScheme, + typography = Typography, + shapes = RethinkShapes, + content = content + ) +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Type.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Type.kt new file mode 100644 index 000000000..52e5e9011 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/theme/Type.kt @@ -0,0 +1,127 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +/** + * M3 Expressive-tuned typography. + * + * Uses the system font family (Roboto / system sans-serif) but applies + * bolder weights, tighter letterSpacing on display sizes, and slightly + * larger labelLarge and titleMedium for improved readability on small + * phone screens. + */ +val Typography = Typography( + // Display + displayLarge = TextStyle( + fontWeight = FontWeight.Bold, + fontSize = 57.sp, + lineHeight = 64.sp, + letterSpacing = (-0.25).sp + ), + displayMedium = TextStyle( + fontWeight = FontWeight.Bold, + fontSize = 45.sp, + lineHeight = 52.sp, + letterSpacing = 0.sp + ), + displaySmall = TextStyle( + fontWeight = FontWeight.SemiBold, + fontSize = 36.sp, + lineHeight = 44.sp, + letterSpacing = 0.sp + ), + // Headline + headlineLarge = TextStyle( + fontWeight = FontWeight.Bold, + fontSize = 32.sp, + lineHeight = 40.sp, + letterSpacing = 0.sp + ), + headlineMedium = TextStyle( + fontWeight = FontWeight.Bold, + fontSize = 28.sp, + lineHeight = 36.sp, + letterSpacing = 0.sp + ), + headlineSmall = TextStyle( + fontWeight = FontWeight.SemiBold, + fontSize = 24.sp, + lineHeight = 32.sp, + letterSpacing = 0.sp + ), + // Title + titleLarge = TextStyle( + fontWeight = FontWeight.Bold, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + titleMedium = TextStyle( + fontWeight = FontWeight.SemiBold, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.15.sp + ), + titleSmall = TextStyle( + fontWeight = FontWeight.Medium, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.1.sp + ), + // Body + bodyLarge = TextStyle( + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ), + bodyMedium = TextStyle( + fontWeight = FontWeight.Normal, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.25.sp + ), + bodySmall = TextStyle( + fontWeight = FontWeight.Normal, + fontSize = 12.sp, + lineHeight = 16.sp, + letterSpacing = 0.4.sp + ), + // Label + labelLarge = TextStyle( + fontWeight = FontWeight.Medium, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.1.sp + ), + labelMedium = TextStyle( + fontWeight = FontWeight.SemiBold, + fontSize = 12.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ), + labelSmall = TextStyle( + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) +) diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgCardComponents.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgCardComponents.kt new file mode 100644 index 000000000..561d87ad2 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgCardComponents.kt @@ -0,0 +1,69 @@ +/* + * Copyright 2026 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.wireguard + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.ui.compose.theme.Dimensions + +@Composable +internal fun WgCardSurface( + modifier: Modifier = Modifier, + content: @Composable () -> Unit +) { + Surface( + modifier = modifier, + shape = RoundedCornerShape(Dimensions.cardCornerRadiusLarge), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)), + tonalElevation = 1.dp + ) { + content() + } +} + +@Composable +internal fun WgIconBadge(modifier: Modifier = Modifier) { + Surface( + modifier = modifier, + shape = RoundedCornerShape(Dimensions.cornerRadiusSmMd), + color = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.5f) + ) { + Box( + modifier = Modifier.padding(8.dp), + contentAlignment = Alignment.Center + ) { + Icon( + painter = painterResource(R.drawable.ic_wireguard_icon), + contentDescription = null, + tint = MaterialTheme.colorScheme.onSecondaryContainer, + modifier = Modifier.size(20.dp) + ) + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgConfigDetailScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgConfigDetailScreen.kt new file mode 100644 index 000000000..0e751c132 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgConfigDetailScreen.kt @@ -0,0 +1,842 @@ +/* + * Copyright 2023 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.wireguard + +import android.app.Activity +import android.text.format.DateUtils +import android.widget.Toast +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.rounded.ArrowForward +import androidx.compose.material.icons.rounded.Add +import androidx.compose.material.icons.rounded.Apps +import androidx.compose.material.icons.rounded.Delete +import androidx.compose.material.icons.rounded.Edit +import androidx.compose.material3.Button +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.lifecycle.asFlow +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.WgPeerRow +import com.celzero.bravedns.data.SsidItem +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.database.WgConfigFilesImmutable +import com.celzero.bravedns.net.doh.Transaction +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.service.ProxyManager.ID_WG_BASE +import com.celzero.bravedns.service.VpnController +import com.celzero.bravedns.service.WireguardManager +import com.celzero.bravedns.service.WireguardManager.ERR_CODE_OTHER_WG_ACTIVE +import com.celzero.bravedns.service.WireguardManager.ERR_CODE_VPN_NOT_ACTIVE +import com.celzero.bravedns.service.WireguardManager.ERR_CODE_VPN_NOT_FULL +import com.celzero.bravedns.service.WireguardManager.ERR_CODE_WG_INVALID +import com.celzero.bravedns.service.WireguardManager.INVALID_CONF_ID +import com.celzero.bravedns.service.WireguardManager.WG_UPTIME_THRESHOLD +import com.celzero.bravedns.ui.compose.theme.CardPosition +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkActionListItem +import com.celzero.bravedns.ui.compose.theme.RethinkListGroup +import com.celzero.bravedns.ui.compose.theme.RethinkToggleListItem +import com.celzero.bravedns.ui.dialog.WgAddPeerDialog +import com.celzero.bravedns.ui.dialog.WgHopDialog +import com.celzero.bravedns.ui.dialog.WgIncludeAppsDialog +import com.celzero.bravedns.ui.dialog.WgSsidDialog +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.SectionHeader +import com.celzero.bravedns.util.SsidPermissionManager +import com.celzero.bravedns.util.UIUtils +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.viewmodel.ProxyAppsMappingViewModel +import com.celzero.bravedns.wireguard.Config +import com.celzero.bravedns.wireguard.Peer +import com.celzero.bravedns.wireguard.WgHopManager +import com.celzero.firestack.backend.RouterStats +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun WgConfigDetailScreen( + configId: Int, + wgType: WgType, + persistentState: PersistentState, + eventLogger: EventLogger, + mappingViewModel: ProxyAppsMappingViewModel, + onEditConfig: (Int, WgType) -> Unit, + onBackClick: () -> Unit +) { + val context = LocalContext.current + val scope = rememberCoroutineScope() + val socks5VpnDisabledErrorText = stringResource(R.string.settings_socks5_vpn_disabled_error) + val wireguardEnabledFailureText = stringResource(R.string.wireguard_enabled_failure) + val configAddSuccessToast = stringResource(R.string.config_add_success_toast) + val lblSsidsText = stringResource(R.string.lbl_ssids) + + // State variables + var configFiles by remember { mutableStateOf(null) } + var config by remember { mutableStateOf(null) } + var peers by remember { mutableStateOf>(emptyList()) } + var statusText by remember { mutableStateOf("") } + var statusColor by remember { mutableStateOf(null) } + var catchAllEnabled by remember { mutableStateOf(false) } + var useMobileEnabled by remember { mutableStateOf(false) } + var ssidEnabled by remember { mutableStateOf(false) } + var ssids by remember { mutableStateOf>(emptyList()) } + var showInvalidConfigDialog by remember { mutableStateOf(false) } + var showDeleteInterfaceDialog by remember { mutableStateOf(false) } + var showSsidPermissionDialog by remember { mutableStateOf(false) } + var showAddPeerDialog by remember { mutableStateOf(false) } + var showHopDialog by remember { mutableStateOf(false) } + var hopDialogConfigs by remember { mutableStateOf>(emptyList()) } + var hopDialogSelectedId by remember { mutableStateOf(INVALID_CONF_ID) } + var showSsidDialog by remember { mutableStateOf(false) } + var ssidDialogCurrent by remember { mutableStateOf("") } + var showIncludeAppsDialog by remember { mutableStateOf(false) } + var includeAppsProxyId by remember { mutableStateOf("") } + var includeAppsProxyName by remember { mutableStateOf("") } + val onSurfaceVariantColor = MaterialTheme.colorScheme.onSurfaceVariant.toArgb() + val errorColor = MaterialTheme.colorScheme.error.toArgb() + val tertiaryColor = MaterialTheme.colorScheme.tertiary.toArgb() + val statusFailingText = + stringResource(id = R.string.status_failing).replaceFirstChar(Char::titlecase) + val statusDisabledText = + stringResource(id = R.string.lbl_disabled).replaceFirstChar(Char::titlecase) + val statusWaitingText = stringResource(id = R.string.status_waiting) + val statusTextById = mutableMapOf().apply { + for (status in UIUtils.ProxyStatus.entries) { + put( + status.id, + stringResource(id = UIUtils.getProxyStatusStringRes(status.id)).replaceFirstChar(Char::titlecase) + ) + } + } + val wireguardVersionTemplate = stringResource(id = R.string.about_version_install_source) + + val appsCount by mappingViewModel + .getAppCountById(ID_WG_BASE + configId) + .asFlow() + .collectAsState(initial = 0) + + // Refresh config on launch + LaunchedEffect(configId) { + val cfg = WireguardManager.getConfigById(configId) + val mapping = WireguardManager.getConfigFilesById(configId) + if (cfg == null || mapping == null) { + showInvalidConfigDialog = true + return@LaunchedEffect + } + config = cfg + configFiles = mapping + peers = cfg.getPeers() ?: emptyList() + catchAllEnabled = mapping.isCatchAll + useMobileEnabled = mapping.useOnlyOnMetered + ssidEnabled = mapping.ssidEnabled + ssids = SsidItem.parseStorageList(mapping.ssids) + } + + // Update status UI when config changes + LaunchedEffect(configFiles?.isActive, configFiles?.id) { + updateStatusUi( + id = configId, + persistentState = persistentState, + onSurfaceVariantColor = onSurfaceVariantColor, + errorColor = errorColor, + tertiaryColor = tertiaryColor, + statusTextById = statusTextById, + statusFailingText = statusFailingText, + statusDisabledText = statusDisabledText, + statusWaitingText = statusWaitingText, + wireguardVersionTemplate = wireguardVersionTemplate, + onStatusUpdate = { text, color -> + statusText = text + statusColor = color + } + ) + } + + // Helper functions + fun logEvent(msg: String, details: String) { + eventLogger.log( + type = EventType.PROXY_SWITCH, + severity = Severity.LOW, + message = msg, + source = EventSource.MANAGER, + userAction = true, + details = details + ) + } + + suspend fun refreshConfig() { + val cfg = WireguardManager.getConfigById(configId) + val mapping = WireguardManager.getConfigFilesById(configId) + if (cfg == null || mapping == null) { + showInvalidConfigDialog = true + return + } + config = cfg + configFiles = mapping + peers = cfg.getPeers() ?: emptyList() + catchAllEnabled = mapping.isCatchAll + useMobileEnabled = mapping.useOnlyOnMetered + ssidEnabled = mapping.ssidEnabled + ssids = SsidItem.parseStorageList(mapping.ssids) + } + + fun updateUseOnMobileNetwork(enabled: Boolean) { + useMobileEnabled = enabled + scope.launch(Dispatchers.IO) { + WireguardManager.updateUseOnMobileNetworkConfig(configId, enabled) + } + logEvent( + "WireGuard Use on Mobile Networks", + "User ${if (enabled) "enabled" else "disabled"} use on mobile networks for WireGuard config with id $configId" + ) + } + + fun updateCatchAll(enabled: Boolean) { + catchAllEnabled = enabled + scope.launch(Dispatchers.IO) { + if (!VpnController.hasTunnel()) { + withContext(Dispatchers.Main) { + catchAllEnabled = !enabled + Utilities.showToastUiCentered( + context, + ERR_CODE_VPN_NOT_ACTIVE + socks5VpnDisabledErrorText, + Toast.LENGTH_LONG + ) + } + return@launch + } + + if (!WireguardManager.canEnableProxy()) { + withContext(Dispatchers.Main) { + catchAllEnabled = false + Utilities.showToastUiCentered( + context, + ERR_CODE_VPN_NOT_FULL + wireguardEnabledFailureText, + Toast.LENGTH_LONG + ) + } + return@launch + } + + if (WireguardManager.oneWireGuardEnabled()) { + withContext(Dispatchers.Main) { + catchAllEnabled = false + Utilities.showToastUiCentered( + context, + ERR_CODE_OTHER_WG_ACTIVE + wireguardEnabledFailureText, + Toast.LENGTH_LONG + ) + } + return@launch + } + + val cfg = WireguardManager.getConfigFilesById(configId) + if (cfg == null) { + withContext(Dispatchers.Main) { + catchAllEnabled = false + Utilities.showToastUiCentered( + context, + ERR_CODE_WG_INVALID + wireguardEnabledFailureText, + Toast.LENGTH_LONG + ) + } + return@launch + } + + WireguardManager.updateCatchAllConfig(configId, enabled) + logEvent( + "WireGuard Catch All apps", + "User ${if (enabled) "enabled" else "disabled"} catch all apps for WireGuard config with id $configId" + ) + } + } + + fun toggleSsid(enabled: Boolean) { + ssidEnabled = enabled + val activity = context as? Activity + if (activity == null || !SsidPermissionManager.hasRequiredPermissions(activity) || !SsidPermissionManager.isLocationEnabled( + activity + ) + ) { + ssidEnabled = false + showSsidPermissionDialog = true + return + } + scope.launch(Dispatchers.IO) { + WireguardManager.updateSsidEnabled(configId, enabled) + } + } + + fun openAppsDialog(proxyName: String) { + val proxyId = ID_WG_BASE + configId + includeAppsProxyId = proxyId + includeAppsProxyName = proxyName + showIncludeAppsDialog = true + } + + fun openHopDialog() { + scope.launch(Dispatchers.IO) { + val hopables = WgHopManager.getHopableWgs(configId) + val selectedId = convertStringIdToId(WgHopManager.getHop(configId)) + withContext(Dispatchers.Main) { + hopDialogConfigs = hopables + hopDialogSelectedId = selectedId + showHopDialog = true + } + } + } + + fun openSsidDialog() { + ssidDialogCurrent = WireguardManager.getConfigFilesById(configId)?.ssids.orEmpty() + showSsidDialog = true + } + + // Dialogs + if (showInvalidConfigDialog) { + RethinkConfirmDialog( + onDismissRequest = {}, + title = stringResource(R.string.lbl_wireguard), + message = stringResource(R.string.config_invalid_desc), + confirmText = stringResource(R.string.lbl_delete), + dismissText = stringResource(R.string.fapps_info_dialog_positive_btn), + onConfirm = { + showInvalidConfigDialog = false + WireguardManager.deleteConfig(configId) + }, + onDismiss = { + showInvalidConfigDialog = false + onBackClick() + }, + isConfirmDestructive = true + ) + } + + if (showDeleteInterfaceDialog) { + val delText = stringResource( + R.string.two_argument_space, + stringResource(R.string.config_delete_dialog_title), + stringResource(R.string.lbl_wireguard) + ) + RethinkConfirmDialog( + onDismissRequest = { showDeleteInterfaceDialog = false }, + title = delText, + message = stringResource(R.string.config_delete_dialog_desc), + confirmText = delText, + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + showDeleteInterfaceDialog = false + scope.launch(Dispatchers.IO) { + WireguardManager.deleteConfig(configId) + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + configAddSuccessToast, + Toast.LENGTH_SHORT + ) + onBackClick() + } + logEvent( + "Delete WireGuard config", + "User deleted WireGuard config with id $configId" + ) + } + }, + onDismiss = { showDeleteInterfaceDialog = false }, + isConfirmDestructive = true + ) + } + + if (showSsidPermissionDialog) { + RethinkConfirmDialog( + onDismissRequest = { showSsidPermissionDialog = false }, + title = stringResource(R.string.lbl_ssid), + message = SsidPermissionManager.getPermissionExplanation(context), + confirmText = stringResource(R.string.fapps_info_dialog_positive_btn), + dismissText = stringResource(R.string.lbl_cancel), + onConfirm = { + showSsidPermissionDialog = false + val activity = context as? Activity + if (activity != null) { + SsidPermissionManager.requestSsidPermissions(activity) + } + }, + onDismiss = { + showSsidPermissionDialog = false + scope.launch(Dispatchers.IO) { + WireguardManager.updateSsidEnabled(configId, false) + } + } + ) + } + + if (showAddPeerDialog) { + WgAddPeerDialog( + configId = configId, + wgPeer = null, + onDismiss = { + showAddPeerDialog = false + scope.launch { refreshConfig() } + } + ) + } + + if (showHopDialog) { + WgHopDialog( + srcId = configId, + hopables = hopDialogConfigs, + selectedId = hopDialogSelectedId, + onDismiss = { showHopDialog = false } + ) + } + + if (showSsidDialog) { + WgSsidDialog( + currentSsids = ssidDialogCurrent, + onSave = { newSsids -> + scope.launch(Dispatchers.IO) { + WireguardManager.updateSsids(configId, newSsids) + val cfg = WireguardManager.getConfigFilesById(configId) + withContext(Dispatchers.Main) { + ssids = SsidItem.parseStorageList(cfg?.ssids ?: "") + } + } + }, + onDismiss = { showSsidDialog = false } + ) + } + + if (showIncludeAppsDialog) { + WgIncludeAppsDialog( + viewModel = mappingViewModel, + proxyId = includeAppsProxyId, + proxyName = includeAppsProxyName, + onDismiss = { showIncludeAppsDialog = false } + ) + } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.lbl_wireguard), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + if (config == null || configFiles == null) { + Column( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues) + .padding(Dimensions.screenPaddingHorizontal), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + Text(text = stringResource(id = R.string.config_invalid_desc)) + Button(onClick = onBackClick) { + Text(text = stringResource(id = R.string.fapps_info_dialog_positive_btn)) + } + } + return@Scaffold + } + + LazyColumn( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues), + contentPadding = + PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + bottom = Dimensions.spacing3xl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + item { + WgConfigOverviewCard( + name = config?.getName().orEmpty(), + status = statusText.ifEmpty { + stringResource(R.string.single_argument_parenthesis, configId.toString()) + }, + statusColor = statusColor + ) + } + + if (wgType.isOneWg()) { + item { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadius2xl), + color = MaterialTheme.colorScheme.tertiaryContainer + ) { + Text( + text = stringResource(id = R.string.one_wg_apps_added), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onTertiaryContainer, + modifier = Modifier.padding(horizontal = 14.dp, vertical = 12.dp) + ) + } + } + } + + item { + SectionHeader(title = stringResource(id = R.string.lbl_configure)) + RethinkListGroup { + RethinkActionListItem( + title = stringResource(id = R.string.lbl_add), + description = stringResource(id = R.string.lbl_peer), + icon = Icons.Rounded.Add, + position = CardPosition.First, + onClick = { showAddPeerDialog = true } + ) + RethinkActionListItem( + title = stringResource(id = R.string.rt_edit_dialog_positive), + description = stringResource(id = R.string.lbl_wireguard), + icon = Icons.Rounded.Edit, + position = CardPosition.Middle, + onClick = { onEditConfig(configId, wgType) } + ) + RethinkActionListItem( + title = stringResource(id = R.string.lbl_delete), + description = stringResource(id = R.string.config_delete_dialog_title), + icon = Icons.Rounded.Delete, + accentColor = MaterialTheme.colorScheme.error, + position = CardPosition.Last, + onClick = { showDeleteInterfaceDialog = true } + ) + } + } + + if (wgType.isDefault()) { + item { + SectionHeader(title = stringResource(id = R.string.lbl_apps)) + RethinkListGroup { + RethinkActionListItem( + title = stringResource(R.string.add_remove_apps, appsCount.toString()), + icon = Icons.Rounded.Apps, + position = CardPosition.First, + onClick = { openAppsDialog(config?.getName().orEmpty()) }, + enabled = !catchAllEnabled + ) + RethinkActionListItem( + title = stringResource(id = R.string.hop_add_remove_title), + icon = Icons.AutoMirrored.Rounded.ArrowForward, + position = CardPosition.Last, + onClick = { openHopDialog() } + ) + } + } + } + + item { + SectionHeader(title = stringResource(id = R.string.lbl_advanced)) + RethinkListGroup { + RethinkToggleListItem( + title = stringResource(id = R.string.catch_all_wg_dialog_title), + description = stringResource(id = R.string.catch_all_wg_dialog_desc), + iconRes = R.drawable.ic_firewall_shield, + checked = catchAllEnabled, + onCheckedChange = { enabled -> updateCatchAll(enabled) }, + position = CardPosition.First, + ) + RethinkToggleListItem( + title = stringResource(id = R.string.wg_setting_use_on_mobile), + description = stringResource(id = R.string.wg_setting_use_on_mobile_desc), + iconRes = R.drawable.ic_meter_mobile_only, + checked = useMobileEnabled, + onCheckedChange = { enabled -> updateUseOnMobileNetwork(enabled) }, + position = if (SsidPermissionManager.isDeviceSupported(context)) CardPosition.Middle else CardPosition.Last, + ) + if (SsidPermissionManager.isDeviceSupported(context)) { + val ssidSubtitle = + buildString { + append( + stringResource(R.string.wg_setting_ssid_desc, lblSsidsText) + ) + if (ssids.isNotEmpty()) { + append("\n") + append(ssids.joinToString { it.name }) + } + } + RethinkToggleListItem( + title = stringResource(id = R.string.wg_setting_ssid_title), + description = ssidSubtitle, + iconRes = R.drawable.ic_firewall_wifi_on, + checked = ssidEnabled, + onCheckedChange = { enabled -> toggleSsid(enabled) }, + position = CardPosition.Middle, + ) + RethinkActionListItem( + title = stringResource(id = R.string.rt_edit_dialog_positive), + description = stringResource(id = R.string.lbl_ssids), + icon = Icons.Rounded.Edit, + position = CardPosition.Last, + onClick = { openSsidDialog() } + ) + } + } + } + + item { + SectionHeader(title = stringResource(id = R.string.lbl_peer)) + } + + items(peers) { peer -> + WgPeerRow( + context = context, + configId = configId, + wgPeer = peer, + onPeerChanged = { scope.launch { refreshConfig() } } + ) + } + } + } +} + +@Composable +private fun WgConfigOverviewCard(name: String, status: String, statusColor: Int?) { + WgCardSurface { + Row( + modifier = Modifier.fillMaxWidth().padding(16.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp) + ) { + WgIconBadge() + Column(modifier = Modifier.weight(1f)) { + Text( + text = name, + style = MaterialTheme.typography.titleMedium + ) + Text( + text = status, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + if (statusColor != null) { + Surface( + shape = RoundedCornerShape(Dimensions.cornerRadiusFull), + color = Color(statusColor).copy(alpha = 0.14f) + ) { + Text( + text = status, + style = MaterialTheme.typography.labelMedium, + color = Color(statusColor), + modifier = Modifier.padding(horizontal = 10.dp, vertical = 6.dp) + ) + } + } + } + } +} + +private suspend fun updateStatusUi( + id: Int, + persistentState: PersistentState, + onSurfaceVariantColor: Int, + errorColor: Int, + tertiaryColor: Int, + statusTextById: Map, + statusFailingText: String, + statusDisabledText: String, + statusWaitingText: String, + wireguardVersionTemplate: String, + onStatusUpdate: (String, Int?) -> Unit +) { + val mapping = WireguardManager.getConfigFilesById(id) + val cid = ID_WG_BASE + id + if (mapping?.isActive == true) { + val statusPair = VpnController.getProxyStatusById(cid) + val stats = VpnController.getProxyStats(cid) + val ps = UIUtils.ProxyStatus.entries.find { it.id == statusPair.first } + val dnsStatusId = if (persistentState.splitDns) { + VpnController.getDnsStatus(cid) + } else { + null + } + withContext(Dispatchers.Main) { + if (dnsStatusId != null && isDnsError(dnsStatusId)) { + val text = statusFailingText + val color = errorColor + onStatusUpdate(text, color) + return@withContext + } + val text = + getStatusText( + statusTextById = statusTextById, + statusFailingText = statusFailingText, + statusWaitingText = statusWaitingText, + wireguardVersionTemplate = wireguardVersionTemplate, + status = ps, + handshakeTime = getHandshakeTime(stats).toString(), + stats = stats, + errMsg = statusPair.second + ) + val color = getStrokeColorForStatus(ps, stats, onSurfaceVariantColor, errorColor, tertiaryColor) + onStatusUpdate(text, color) + } + } else { + withContext(Dispatchers.Main) { + val text = statusDisabledText + onStatusUpdate(text, null) + } + } +} + +private fun isDnsError(statusId: Long?): Boolean { + if (statusId == null) return true + + val s = Transaction.Status.fromId(statusId) + return s == Transaction.Status.BAD_QUERY || + s == Transaction.Status.BAD_RESPONSE || + s == Transaction.Status.NO_RESPONSE || + s == Transaction.Status.SEND_FAIL || + s == Transaction.Status.CLIENT_ERROR || + s == Transaction.Status.INTERNAL_ERROR || + s == Transaction.Status.TRANSPORT_ERROR +} + +private fun getStatusText( + statusTextById: Map, + statusFailingText: String, + statusWaitingText: String, + wireguardVersionTemplate: String, + status: UIUtils.ProxyStatus?, + handshakeTime: String? = null, + stats: RouterStats?, + errMsg: String? = null +): String { + if (status == null) { + val txt = + if (!errMsg.isNullOrEmpty()) { + "$statusWaitingText ($errMsg)" + } else { + statusWaitingText + } + return txt.replaceFirstChar(Char::titlecase) + } + + if (status == UIUtils.ProxyStatus.TPU) { + return statusTextById.getValue(status.id) + } + + val now = System.currentTimeMillis() + val lastOk = stats?.lastOK ?: 0L + val since = stats?.since ?: 0L + if (now - since > WG_UPTIME_THRESHOLD && lastOk == 0L) { + return statusFailingText + } + + val baseText = statusTextById.getValue(status.id) + + return if (stats?.lastOK != 0L && handshakeTime != null) { + String.format(wireguardVersionTemplate, baseText, handshakeTime) + } else { + baseText + } +} + +private fun getHandshakeTime(stats: RouterStats?): CharSequence { + if (stats == null) { + return "" + } + if (stats.lastOK == 0L) { + return "" + } + val now = System.currentTimeMillis() + return DateUtils.getRelativeTimeSpanString( + stats.lastOK, + now, + DateUtils.MINUTE_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE + ) +} + +private fun getStrokeColorForStatus( + status: UIUtils.ProxyStatus?, + stats: RouterStats?, + onSurfaceVariantColor: Int, + errorColor: Int, + tertiaryColor: Int +): Int { + val now = System.currentTimeMillis() + val lastOk = stats?.lastOK ?: 0L + val since = stats?.since ?: 0L + val isFailing = now - since > WG_UPTIME_THRESHOLD && lastOk == 0L + return when (status) { + UIUtils.ProxyStatus.TOK -> + if (isFailing) { + onSurfaceVariantColor + } else { + tertiaryColor + } + + UIUtils.ProxyStatus.TUP, + UIUtils.ProxyStatus.TZZ, + UIUtils.ProxyStatus.TNT -> onSurfaceVariantColor + + else -> errorColor + } +} + +private fun convertStringIdToId(id: String): Int { + return try { + id.removePrefix(ID_WG_BASE).toIntOrNull() ?: INVALID_CONF_ID + } catch (_: Exception) { + INVALID_CONF_ID + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgConfigEditorScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgConfigEditorScreen.kt new file mode 100644 index 000000000..5f37a51dd --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgConfigEditorScreen.kt @@ -0,0 +1,500 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.wireguard + +import android.app.Activity +import android.content.Context +import android.content.ContextWrapper +import android.view.WindowManager +import android.widget.Toast +import androidx.annotation.Keep +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.ime +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ContentCopy +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import com.celzero.bravedns.R +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.service.WireguardManager +import com.celzero.bravedns.util.UIUtils.clipboardCopy +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.util.Utilities.tos +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.PrimaryButton +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.SecondaryButton +import com.celzero.bravedns.wireguard.WgInterface +import com.celzero.bravedns.wireguard.util.ErrorMessages +import com.celzero.firestack.backend.Backend +import io.github.aakira.napier.Napier +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +private const val CLIPBOARD_PUBLIC_KEY_LBL = "Public Key" +private const val DEFAULT_MTU = "-1" + +// when dns is set to auto, the default dns is set to 1.1.1.1. this differs from official +// wireguard for android, because rethink requires a dns to be set in "Simple" mode +private const val DEFAULT_DNS = "1.1.1.1" +private const val DEFAULT_LISTEN_PORT = "0" + +@Keep +enum class WgType(val value: Int) { + DEFAULT(0), + ONE_WG(1); + + fun isOneWg() = this == ONE_WG + + fun isDefault() = this == DEFAULT + + companion object { + fun fromInt(value: Int): WgType { + return entries.firstOrNull { it.value == value } ?: DEFAULT + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun WgConfigEditorScreen( + configId: Int, + wgType: WgType, + persistentState: PersistentState, + onBackClick: () -> Unit, + onSaveSuccess: () -> Unit +) { + val context = LocalContext.current + val activity = context.findActivity() + val scope = rememberCoroutineScope() + val publicKeyCopyToast = stringResource(R.string.public_key_copy_toast_msg) + val configAddSuccessToast = stringResource(R.string.config_add_success_toast) + + var interfaceName by remember { mutableStateOf("") } + var privateKey by remember { mutableStateOf("") } + var publicKey by remember { mutableStateOf("") } + var addresses by remember { mutableStateOf("") } + var listenPort by remember { mutableStateOf("") } + var dnsServers by remember { mutableStateOf("") } + var mtu by remember { mutableStateOf("") } + var amzProps by remember { mutableStateOf("") } + var showListenPortState by remember { mutableStateOf(false) } + + fun showListenPort(wgIface: WgInterface?): Boolean { + val isPresent = + wgIface?.listenPort?.isPresent == true && wgIface.listenPort.get() != 1 + val byType = wgType.isOneWg() || (!persistentState.randomizeListenPort && wgType.isDefault()) + return isPresent && byType + } + + // Load config on first composition + LaunchedEffect(configId) { + withContext(Dispatchers.IO) { + val cfg = WireguardManager.getConfigById(configId) + val iface = cfg?.getInterface() + + withContext(Dispatchers.Main) { + interfaceName = cfg?.getName().orEmpty() + privateKey = iface?.getKeyPair()?.getPrivateKey()?.base64()?.tos().orEmpty() + publicKey = iface?.getKeyPair()?.getPublicKey()?.base64()?.tos().orEmpty() + + var dns = iface?.dnsServers?.joinToString { it.hostAddress ?: "" } + val searchDomains = iface?.dnsSearchDomains?.joinToString { it } + dns = if (!searchDomains.isNullOrEmpty()) { + "$dns,$searchDomains" + } else { + dns + } + dnsServers = dns.orEmpty() + + addresses = if (iface?.getAddresses()?.isEmpty() != true) { + iface?.getAddresses()?.joinToString { it.toString() }.orEmpty() + } else { + "" + } + + showListenPortState = showListenPort(iface) + listenPort = if (showListenPortState) { + iface?.listenPort?.get()?.toString().orEmpty() + } else { + "" + } + + mtu = if (iface?.mtu?.isPresent == true) { + iface.mtu.get().toString() + } else { + "" + } + + amzProps = if (iface?.isAmnezia() == true) { + iface.getAmzProps().orEmpty() + } else { + "" + } + } + } + } + + fun generateKeys() { + val key = Backend.newWgPrivateKey() + privateKey = key.base64().toString() + publicKey = key.mult().base64().toString() + } + + fun copyPublicKey() { + clipboardCopy(context, publicKey, CLIPBOARD_PUBLIC_KEY_LBL) + Utilities.showToastUiCentered( + context, + publicKeyCopyToast, + Toast.LENGTH_SHORT + ) + } + + fun saveConfig() { + val name = interfaceName + val addr = addresses + val mtuValue = mtu.ifEmpty { DEFAULT_MTU } + val listenPortValue = listenPort.ifEmpty { DEFAULT_LISTEN_PORT } + val dns = dnsServers.ifEmpty { DEFAULT_DNS } + val privateKeyValue = privateKey + + scope.launch(Dispatchers.IO) { + try { + val newWgInterface = WgInterface.Builder() + .parsePrivateKey(privateKeyValue) + .parseAddresses(addr) + .parseListenPort(listenPortValue) + .parseDnsServers(dns) + .parseMtu(mtuValue) + .build() + + val result = WireguardManager.addOrUpdateInterface(configId, name, newWgInterface) + if (result != null) { + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered( + context, + configAddSuccessToast, + Toast.LENGTH_LONG + ) + onSaveSuccess() + } + } + } catch (e: Throwable) { + val error = ErrorMessages[context, e] + Napier.e("err while parsing wg interface: $error", e) + withContext(Dispatchers.Main) { + Utilities.showToastUiCentered(context, error, Toast.LENGTH_LONG) + } + } + } + } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + val density = LocalDensity.current + val editorFieldShape = RoundedCornerShape(Dimensions.cornerRadiusLg) + val imeBottomInset = with(density) { WindowInsets.ime.getBottom(density).toDp() } + val navBottomInset = with(density) { WindowInsets.navigationBars.getBottom(density).toDp() } + val actionBarBottomInset = when { + imeBottomInset > 0.dp -> imeBottomInset + navBottomInset > 0.dp -> navBottomInset + else -> 48.dp + } + DisposableEffect(activity) { + val window = activity?.window + val previousSoftInputMode = window?.attributes?.softInputMode + window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) + + onDispose { + if (previousSoftInputMode != null) { + window.setSoftInputMode(previousSoftInputMode) + } + } + } + + Scaffold( + modifier = Modifier + .nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = stringResource(R.string.lbl_configure), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + }, + bottomBar = { + EditorActionsBar( + bottomInset = actionBarBottomInset, + onCancelClick = onBackClick, + onSaveClick = { saveConfig() } + ) + } + ) { padding -> + LazyColumn( + modifier = Modifier + .fillMaxSize() + .padding(padding), + contentPadding = PaddingValues( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = Dimensions.spacingXl + ), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + item { + EditorSection( + title = stringResource(R.string.lbl_configure) + ) { + OutlinedTextField( + value = interfaceName, + onValueChange = { interfaceName = it }, + label = { Text(stringResource(R.string.cd_dns_crypt_dialog_name)) }, + modifier = Modifier.fillMaxWidth(), + shape = editorFieldShape, + singleLine = true + ) + + OutlinedTextField( + value = addresses, + onValueChange = { addresses = it }, + label = { Text(stringResource(R.string.lbl_addresses)) }, + modifier = Modifier.fillMaxWidth(), + shape = editorFieldShape, + minLines = 2 + ) + + OutlinedTextField( + value = dnsServers, + onValueChange = { dnsServers = it }, + label = { Text(stringResource(R.string.lbl_dns_servers)) }, + modifier = Modifier.fillMaxWidth(), + shape = editorFieldShape, + minLines = 2 + ) + } + } + item { EditorSectionDivider() } + + item { + EditorSection( + title = stringResource(R.string.setup_wireguard) + ) { + OutlinedTextField( + value = privateKey, + onValueChange = { privateKey = it }, + label = { Text(stringResource(R.string.lbl_private_key)) }, + modifier = Modifier.fillMaxWidth(), + shape = editorFieldShape, + singleLine = true, + textStyle = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace), + trailingIcon = { + IconButton(onClick = { generateKeys() }) { + Icon( + imageVector = Icons.Filled.Refresh, + contentDescription = stringResource(id = R.string.cd_generate_keys) + ) + } + } + ) + + OutlinedTextField( + value = publicKey, + onValueChange = { }, + label = { Text(stringResource(R.string.lbl_public_key)) }, + modifier = Modifier + .fillMaxWidth() + .clickable(enabled = publicKey.isNotEmpty()) { + copyPublicKey() + }, + shape = editorFieldShape, + readOnly = true, + singleLine = true, + textStyle = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace), + trailingIcon = { + IconButton(onClick = { copyPublicKey() }, enabled = publicKey.isNotEmpty()) { + Icon( + imageVector = Icons.Filled.ContentCopy, + contentDescription = stringResource(id = R.string.cd_copy_public_key) + ) + } + } + ) + } + } + item { EditorSectionDivider() } + + item { + EditorSection( + title = stringResource(R.string.lbl_network) + ) { + if (showListenPortState) { + OutlinedTextField( + value = listenPort, + onValueChange = { listenPort = it }, + label = { Text(stringResource(R.string.lbl_listen_port)) }, + modifier = Modifier.fillMaxWidth(), + shape = editorFieldShape, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number) + ) + } + + OutlinedTextField( + value = mtu, + onValueChange = { mtu = it }, + label = { Text(stringResource(R.string.lbl_mtu)) }, + modifier = Modifier.fillMaxWidth(), + shape = editorFieldShape, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number) + ) + } + } + + if (amzProps.isNotEmpty()) { + item { EditorSectionDivider() } + item { + EditorSection( + title = stringResource(R.string.lbl_advanced) + ) { + Text( + text = amzProps, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } + } + } +} + +private tailrec fun Context.findActivity(): Activity? { + return when (this) { + is Activity -> this + is ContextWrapper -> baseContext.findActivity() + else -> null + } +} + +@Composable +private fun EditorSection( + title: String, + content: @Composable ColumnScope.() -> Unit +) { + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + Text( + text = title, + style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + content() + } +} + +@Composable +private fun EditorSectionDivider() { + HorizontalDivider( + color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f) + ) +} + +@Composable +private fun EditorActionsBar( + bottomInset: Dp, + onCancelClick: () -> Unit, + onSaveClick: () -> Unit +) { + val actionBottomPadding = Dimensions.spacingSm + bottomInset + + Surface( + modifier = Modifier + .fillMaxWidth(), + color = MaterialTheme.colorScheme.surfaceContainer, + tonalElevation = 2.dp, + shadowElevation = 8.dp + ) { + Column { + HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.6f)) + Row( + modifier = Modifier + .fillMaxWidth() + .padding( + start = Dimensions.screenPaddingHorizontal, + end = Dimensions.screenPaddingHorizontal, + top = Dimensions.spacingSm, + bottom = actionBottomPadding + ), + horizontalArrangement = Arrangement.spacedBy(Dimensions.spacingMd) + ) { + SecondaryButton( + text = stringResource(R.string.lbl_cancel), + onClick = onCancelClick, + modifier = Modifier.weight(1f) + ) + PrimaryButton( + text = stringResource(R.string.lbl_save), + onClick = onSaveClick, + modifier = Modifier.weight(1f) + ) + } + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgMainScreen.kt b/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgMainScreen.kt new file mode 100644 index 000000000..3751f6e8e --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/ui/compose/wireguard/WgMainScreen.kt @@ -0,0 +1,558 @@ +/* + * Copyright 2025 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.ui.compose.wireguard + +import android.widget.Toast +import androidx.activity.compose.BackHandler +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.wrapContentSize +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.KeyboardArrowDown +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.PlainTooltip +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SplitButtonDefaults +import androidx.compose.material3.SplitButtonLayout +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TooltipAnchorPosition +import androidx.compose.material3.TooltipBox +import androidx.compose.material3.TooltipDefaults +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.rememberTooltipState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.semantics.stateDescription +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.lifecycle.asFlow +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.paging.compose.collectAsLazyPagingItems +import com.celzero.bravedns.R +import com.celzero.bravedns.adapter.OneWgConfigRow +import com.celzero.bravedns.adapter.WgConfigRow +import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.database.EventSource +import com.celzero.bravedns.database.EventType +import com.celzero.bravedns.database.Severity +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.service.WireguardManager +import com.celzero.bravedns.ui.compose.theme.Dimensions +import com.celzero.bravedns.ui.compose.theme.RethinkConfirmDialog +import com.celzero.bravedns.ui.compose.theme.RethinkLargeTopBar +import com.celzero.bravedns.ui.compose.theme.RethinkTwoOptionSegmentedRow +import com.celzero.bravedns.util.Utilities +import com.celzero.bravedns.viewmodel.WgConfigViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +private const val EMPTY_ALPHA = 0.7f + +enum class WgTab { + ONE, + GENERAL +} + +@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) +@Composable +fun WgMainScreen( + wgConfigViewModel: WgConfigViewModel, + persistentState: PersistentState, + appConfig: AppConfig, + eventLogger: EventLogger, + onBackClick: () -> Unit, + onCreateClick: () -> Unit, + onImportClick: () -> Unit, + onQrScanClick: () -> Unit, + onConfigDetailClick: (Int, WgType) -> Unit +) { + val context = LocalContext.current + val density = LocalDensity.current + val navBarBottomInset = with(density) { WindowInsets.navigationBars.getBottom(density).toDp() } + val splitFabBottomPadding = navBarBottomInset + 12.dp + val scope = rememberCoroutineScope() + val wireguardDisclaimerText = stringResource(R.string.wireguard_disclaimer) + val fallbackDnsLabel = stringResource(R.string.lbl_fallback) + val wireguardDisableFailure = stringResource(R.string.wireguard_disable_failure) + val wireguardDisableFailureRelay = stringResource(R.string.wireguard_disable_failure_relay) + + var selectedTab by remember { + mutableStateOf( + if (WireguardManager.isAnyWgActive() && !WireguardManager.oneWireGuardEnabled()) { + WgTab.GENERAL + } else { + WgTab.ONE + } + ) + } + var isFabMenuExpanded by remember { mutableStateOf(false) } + var showDisableDialog by remember { mutableStateOf(false) } + var disableDialogIsOneWgToggle by remember { mutableStateOf(false) } + var disclaimerText by remember { mutableStateOf("") } + + val configCount by wgConfigViewModel.configCount().asFlow() + .collectAsStateWithLifecycle(initialValue = 0) + val showEmpty = configCount == 0 + + // Observe connected DNS for non-OneWG mode + val connectedDns by appConfig.getConnectedDnsObservable().asFlow() + .collectAsStateWithLifecycle(initialValue = "") + + // DNS status listener callback - updates disclaimer text + fun updateDisclaimerText() { + val activeConfigs = WireguardManager.getActiveConfigs() + disclaimerText = if (WireguardManager.oneWireGuardEnabled()) { + val dnsName = activeConfigs.firstOrNull()?.getName() ?: "" + String.format(wireguardDisclaimerText, dnsName) + } else { + var dnsNames = connectedDns + if (persistentState.splitDns && activeConfigs.isNotEmpty()) { + if (dnsNames.isNotEmpty()) { + dnsNames += ", " + } + dnsNames += activeConfigs.joinToString(",") { it.getName() } + } + if (persistentState.useFallbackDnsToBypass) { + dnsNames += ", $fallbackDnsLabel" + } + String.format(wireguardDisclaimerText, dnsNames) + } + } + + // A counter to trigger disclaimer text refresh + var dnsRefreshTrigger by remember { mutableStateOf(0) } + + // Initialize and update disclaimer text when tab, DNS, or refresh trigger changes + LaunchedEffect(selectedTab, connectedDns, dnsRefreshTrigger) { + updateDisclaimerText() + } + + + + BackHandler(enabled = isFabMenuExpanded) { + isFabMenuExpanded = false + } + + if (showDisableDialog) { + DisableConfigsDialog( + onDismiss = { showDisableDialog = false }, + onConfirm = { + showDisableDialog = false + val isOneWgToggle = disableDialogIsOneWgToggle + scope.launch(Dispatchers.IO) { + if (WireguardManager.canDisableAllActiveConfigs()) { + WireguardManager.disableAllActiveConfigs() + logEvent( + eventLogger, + "Wireguard disable", + "all configs from toggle switch; isOneWgToggle: $isOneWgToggle" + ) + withContext(Dispatchers.Main) { + dnsRefreshTrigger++ + selectedTab = if (isOneWgToggle) WgTab.ONE else WgTab.GENERAL + } + } else { + val configs = WireguardManager.getActiveCatchAllConfig() + withContext(Dispatchers.Main) { + val msgText = if (configs.isNotEmpty()) { + wireguardDisableFailure + } else { + wireguardDisableFailureRelay + } + Utilities.showToastUiCentered( + context, + msgText, + Toast.LENGTH_LONG + ) + } + } + } + } + ) + } + + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + RethinkLargeTopBar( + title = stringResource(id = R.string.lbl_wireguard), + onBackClick = onBackClick, + scrollBehavior = scrollBehavior + ) + } + ) { paddingValues -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { + if (showEmpty) { + EmptyState(bottomInset = navBarBottomInset) + } else { + Column( + modifier = Modifier + .fillMaxSize() + ) { + WireguardOverviewCard(disclaimerText = disclaimerText) + WgConfigContent( + selectedTab = selectedTab, + wgConfigViewModel = wgConfigViewModel, + eventLogger = eventLogger, + onDnsStatusChanged = { dnsRefreshTrigger++ }, + onConfigDetailClick = onConfigDetailClick, + bottomInset = navBarBottomInset, + modifier = Modifier.weight(1f), + onOneWgToggleClick = { + val activeConfigs = WireguardManager.getActiveConfigs() + val isAnyConfigActive = activeConfigs.isNotEmpty() + val isOneWgEnabled = WireguardManager.oneWireGuardEnabled() + if (isAnyConfigActive && !isOneWgEnabled) { + disableDialogIsOneWgToggle = true + showDisableDialog = true + } else { + selectedTab = WgTab.ONE + } + }, + onGeneralToggleClick = { + if (WireguardManager.oneWireGuardEnabled()) { + disableDialogIsOneWgToggle = false + showDisableDialog = true + } else { + selectedTab = WgTab.GENERAL + } + } + ) + } + } + + WgSplitFab( + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(start = 16.dp, end = 16.dp, bottom = splitFabBottomPadding), + expanded = isFabMenuExpanded, + onExpandedChange = { isFabMenuExpanded = it }, + onCreateClick = { + isFabMenuExpanded = false + onCreateClick() + }, + onImportClick = { + isFabMenuExpanded = false + onImportClick() + }, + onQrClick = { + isFabMenuExpanded = false + onQrScanClick() + } + ) + } + } +} + +@Composable +private fun WgConfigContent( + selectedTab: WgTab, + wgConfigViewModel: WgConfigViewModel, + eventLogger: EventLogger, + onDnsStatusChanged: () -> Unit, + onConfigDetailClick: (Int, WgType) -> Unit, + bottomInset: Dp, + modifier: Modifier = Modifier, + onOneWgToggleClick: () -> Unit, + onGeneralToggleClick: () -> Unit +) { + Column(modifier = modifier.fillMaxSize()) { + ToggleRow( + selectedTab = selectedTab, + onOneWgClick = onOneWgToggleClick, + onGeneralClick = onGeneralToggleClick + ) + + Box(modifier = Modifier.fillMaxSize()) { + val items = wgConfigViewModel.interfaces.asFlow().collectAsLazyPagingItems() + val padding = PaddingValues(bottom = 84.dp + bottomInset) + + if (selectedTab == WgTab.GENERAL) { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = padding + ) { + items(count = items.itemCount) { index -> + val item = items[index] ?: return@items + WgConfigRow( + config = item, + eventLogger = eventLogger, + onDnsStatusChanged = onDnsStatusChanged, + onConfigDetailClick = onConfigDetailClick + ) + } + } + } + + if (selectedTab == WgTab.ONE) { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = padding + ) { + items(count = items.itemCount) { index -> + val item = items[index] ?: return@items + OneWgConfigRow( + config = item, + eventLogger = eventLogger, + onDnsStatusChanged = onDnsStatusChanged, + onConfigDetailClick = onConfigDetailClick + ) + } + } + } + } + } +} + +@Composable +private fun ToggleRow( + selectedTab: WgTab, + onOneWgClick: () -> Unit, + onGeneralClick: () -> Unit +) { + RethinkTwoOptionSegmentedRow( + leftLabel = stringResource(id = R.string.rt_list_simple_btn_txt), + rightLabel = stringResource(id = R.string.lbl_advanced), + leftSelected = selectedTab == WgTab.ONE, + onLeftClick = onOneWgClick, + onRightClick = onGeneralClick, + modifier = Modifier + .fillMaxWidth() + .padding(top = 16.dp, start = 16.dp, end = 16.dp) + ) +} + +@Composable +private fun DisableConfigsDialog( + onDismiss: () -> Unit, + onConfirm: () -> Unit +) { + RethinkConfirmDialog( + onDismissRequest = onDismiss, + title = stringResource(id = R.string.wireguard_disable_title), + message = stringResource(id = R.string.wireguard_disable_message), + confirmText = stringResource(id = R.string.always_on_dialog_positive), + dismissText = stringResource(id = R.string.lbl_cancel), + onConfirm = onConfirm, + onDismiss = onDismiss + ) +} + +@Composable +private fun EmptyState(bottomInset: Dp) { + Surface( + modifier = Modifier + .fillMaxSize() + .padding(start = 24.dp, top = 24.dp, end = 24.dp, bottom = 24.dp + bottomInset), + shape = RoundedCornerShape(Dimensions.cornerRadius2xl), + color = MaterialTheme.colorScheme.surfaceContainerLow, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.2f)) + ) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + Image( + painter = painterResource(id = R.drawable.illustrations_no_record), + contentDescription = null, + modifier = Modifier.size(200.dp) + ) + Spacer(modifier = Modifier.height(12.dp)) + Text( + text = stringResource(id = R.string.wireguard_no_config_msg), + style = MaterialTheme.typography.titleMedium, + textAlign = TextAlign.Center + ) + } + } +} + +@Composable +private fun WireguardOverviewCard(disclaimerText: String) { + WgCardSurface(modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 12.dp)) { + Row( + modifier = Modifier.fillMaxWidth().padding(16.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + WgIconBadge() + Text( + text = disclaimerText, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } +} + +@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) +@Composable +private fun WgSplitFab( + modifier: Modifier, + expanded: Boolean, + onExpandedChange: (Boolean) -> Unit, + onCreateClick: () -> Unit, + onImportClick: () -> Unit, + onQrClick: () -> Unit +) { + val createLabel = stringResource(R.string.lbl_create) + val moreDescription = stringResource(R.string.wireguard_fab_more_actions) + val expandedStateLabel = stringResource(R.string.wireguard_fab_expanded) + val collapsedStateLabel = stringResource(R.string.wireguard_fab_collapsed) + Box( + modifier = modifier.wrapContentSize() + ) { + SplitButtonLayout( + leadingButton = { + SplitButtonDefaults.LeadingButton( + onClick = onCreateClick, + modifier = Modifier + .height(56.dp) + .semantics { contentDescription = createLabel } + ) { + Icon( + painter = painterResource(id = R.drawable.ic_add), + modifier = Modifier.size(SplitButtonDefaults.LeadingIconSize), + contentDescription = null + ) + Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing)) + Text(text = stringResource(id = R.string.lbl_create)) + } + }, + trailingButton = { + Box { + TooltipBox( + positionProvider = TooltipDefaults.rememberTooltipPositionProvider( + TooltipAnchorPosition.Above + ), + tooltip = { PlainTooltip { Text(text = moreDescription) } }, + state = rememberTooltipState() + ) { + SplitButtonDefaults.TrailingButton( + checked = expanded, + onCheckedChange = onExpandedChange, + modifier = Modifier + .height(56.dp) + .semantics { + stateDescription = if (expanded) { + expandedStateLabel + } else { + collapsedStateLabel + } + contentDescription = moreDescription + } + ) { + val rotation by animateFloatAsState( + targetValue = if (expanded) 180f else 0f, + label = "wgSplitArrowRotation" + ) + Icon( + imageVector = Icons.Filled.KeyboardArrowDown, + modifier = Modifier + .size(SplitButtonDefaults.TrailingIconSize) + .graphicsLayer { rotationZ = rotation }, + contentDescription = null + ) + } + } + DropdownMenu( + expanded = expanded, + onDismissRequest = { onExpandedChange(false) } + ) { + DropdownMenuItem( + text = { Text(text = stringResource(id = R.string.lbl_import)) }, + onClick = onImportClick, + leadingIcon = { + Icon( + painter = painterResource(id = R.drawable.ic_import_conf), + contentDescription = null + ) + } + ) + HorizontalDivider() + DropdownMenuItem( + text = { Text(text = stringResource(id = R.string.lbl_qr_code)) }, + onClick = onQrClick, + leadingIcon = { + Icon( + painter = painterResource(id = R.drawable.ic_qr_code_scanner), + contentDescription = null + ) + } + ) + } + } + } + ) + } +} + +private fun logEvent(eventLogger: EventLogger, msg: String, details: String) { + eventLogger.log(EventType.PROXY_SWITCH, Severity.LOW, msg, EventSource.UI, false, details) +} diff --git a/app/src/main/java/com/celzero/bravedns/util/BioMetricType.kt b/app/src/main/java/com/celzero/bravedns/util/BioMetricType.kt new file mode 100644 index 000000000..ab1147d16 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/util/BioMetricType.kt @@ -0,0 +1,40 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.util + +/** + * Enum representing biometric authentication types and their respective timeout durations. + */ +enum class BioMetricType(val action: Int, val mins: Long) { + OFF(0, 0L), + EVERY_TIME(1, 0L), + FIVE_MIN(2, 5L), + FIFTEEN_MIN(3, 15L); + + fun enabled(): Boolean { + return this != OFF + } + + companion object { + fun fromAction(value: Int): BioMetricType { + return entries.find { it.action == value } ?: OFF + } + + fun fromValue(value: Int): BioMetricType { + return fromAction(value) + } + } +} diff --git a/app/src/main/java/com/celzero/bravedns/util/OrbotHelper.kt b/app/src/main/java/com/celzero/bravedns/util/OrbotHelper.kt index aa179806a..6fd8a1652 100644 --- a/app/src/main/java/com/celzero/bravedns/util/OrbotHelper.kt +++ b/app/src/main/java/com/celzero/bravedns/util/OrbotHelper.kt @@ -40,7 +40,7 @@ import com.celzero.bravedns.database.ProxyEndpoint.Companion.DEFAULT_PROXY_TYPE import com.celzero.bravedns.receiver.NotificationActionReceiver import com.celzero.bravedns.service.PersistentState import com.celzero.bravedns.service.ProxyManager -import com.celzero.bravedns.ui.activity.AppLockActivity +import com.celzero.bravedns.ui.HomeScreenActivity import com.celzero.bravedns.util.Constants.Companion.HTTP_PROXY_PORT import com.celzero.bravedns.util.Constants.Companion.SOCKS_DEFAULT_PORT import com.celzero.bravedns.util.Utilities.getActivityPendingIntent @@ -174,12 +174,12 @@ class OrbotHelper( // link. return Intent( Intent.ACTION_VIEW, - context.resources.getString(R.string.orbot_download_link_website).toUri() + context.getString(R.string.orbot_download_link_website).toUri() ) } else { return Intent( Intent.ACTION_VIEW, - context.resources.getString(R.string.orbot_download_link_website).toUri() + context.getString(R.string.orbot_download_link_website).toUri() ) } } @@ -279,7 +279,7 @@ class OrbotHelper( val pendingIntent = getActivityPendingIntent( context, - Intent(context, AppLockActivity::class.java), + Intent(context, HomeScreenActivity::class.java), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, mutable = false ) @@ -287,7 +287,7 @@ class OrbotHelper( var builder: NotificationCompat.Builder if (isAtleastO()) { val name: CharSequence = context.getString(R.string.notif_channel_proxy_failure) - val description = context.resources.getString(R.string.notif_channel_desc_proxy_failure) + val description = context.getString(R.string.notif_channel_desc_proxy_failure) val importance = NotificationManager.IMPORTANCE_HIGH val channel = NotificationChannel(NOTIF_CHANNEL_ID_PROXY_ALERTS, name, importance) channel.description = description @@ -298,8 +298,8 @@ class OrbotHelper( builder = NotificationCompat.Builder(context, NOTIF_CHANNEL_ID_PROXY_ALERTS) } - val contentTitle = context.resources.getString(R.string.lbl_action_required) - val contentText = context.resources.getString(R.string.settings_orbot_notification_content) + val contentTitle = context.getString(R.string.lbl_action_required) + val contentText = context.getString(R.string.settings_orbot_notification_content) builder .setSmallIcon(R.drawable.ic_notification_icon) .setContentTitle(contentTitle) @@ -312,7 +312,7 @@ class OrbotHelper( val notificationAction: NotificationCompat.Action = NotificationCompat.Action( 0, - context.resources.getString(R.string.settings_orbot_notification_action), + context.getString(R.string.settings_orbot_notification_action), openIntent ) builder.addAction(notificationAction) diff --git a/app/src/main/java/com/celzero/bravedns/util/Themes.kt b/app/src/main/java/com/celzero/bravedns/util/Themes.kt index fa2d90bbe..ba1514b60 100644 --- a/app/src/main/java/com/celzero/bravedns/util/Themes.kt +++ b/app/src/main/java/com/celzero/bravedns/util/Themes.kt @@ -15,152 +15,58 @@ */ package com.celzero.bravedns.util -import android.view.Window -import androidx.core.view.WindowInsetsControllerCompat -import com.celzero.bravedns.R -import com.celzero.bravedns.util.Utilities.isAtleastQ -import com.celzero.bravedns.util.Utilities.isAtleastS - // Application themes enum enum class Themes(val id: Int) { SYSTEM_DEFAULT(0), LIGHT(1), DARK(2), - TRUE_BLACK(3), LIGHT_PLUS(4), - DARK_PLUS(5), - DARK_FROST(6); + DARK_PLUS(5); companion object { + private const val LEGACY_TRUE_BLACK_ID = 3 + private const val LEGACY_DARK_FROST_ID = 6 + fun getThemeCount(): Int { return entries.count() } fun getAvailableThemeCount(): Int { - return if (isAtleastS()) { - entries.count() - } else { - // Exclude LIGHT_FROST and DARK_FROST for pre-Android S devices - entries.count() - 2 - } + return entries.count() } fun isFrostTheme(id: Int): Boolean { - return id == DARK_FROST.id + return false } fun isThemeAvailable(id: Int): Boolean { - if (isFrostTheme(id)) { - return isAtleastS() - } - return true - } - - fun getTheme(id: Int): Int { return when (id) { - SYSTEM_DEFAULT.id -> 0 // system default - LIGHT.id -> R.style.AppThemeWhite - DARK.id -> R.style.AppTheme - TRUE_BLACK.id -> R.style.AppThemeTrueBlack - LIGHT_PLUS.id -> R.style.AppThemeWhitePlus - DARK_PLUS.id -> R.style.AppThemeTrueBlackPlus - DARK_FROST.id -> R.style.AppThemeTrueBlackFrost - else -> 0 + SYSTEM_DEFAULT.id, + LIGHT.id, + DARK.id, + LIGHT_PLUS.id, + DARK_PLUS.id, + LEGACY_TRUE_BLACK_ID, + LEGACY_DARK_FROST_ID -> true + else -> false } } - private fun getBottomSheetTheme(id: Int): Int { - return when (id) { - SYSTEM_DEFAULT.id -> 0 // system default - LIGHT.id -> R.style.BottomSheetDialogThemeWhite - DARK.id -> R.style.BottomSheetDialogTheme - TRUE_BLACK.id -> R.style.BottomSheetDialogThemeTrueBlack - LIGHT_PLUS.id -> R.style.BottomSheetDialogThemeWhitePlus - DARK_PLUS.id -> R.style.BottomSheetDialogThemeTrueBlackPlus - // for now use same as dark, can be changed later - DARK_FROST.id -> R.style.BottomSheetDialogThemeTrueBlack - else -> 0 + fun resolveThemePreference(isDarkThemeOn: Boolean, preference: Int): Int { + return when (preference) { + SYSTEM_DEFAULT.id -> if (isDarkThemeOn) DARK_PLUS.id else LIGHT_PLUS.id + LIGHT.id, + DARK.id, + LIGHT_PLUS.id, + DARK_PLUS.id -> preference + LEGACY_TRUE_BLACK_ID, + LEGACY_DARK_FROST_ID -> DARK_PLUS.id + else -> if (isDarkThemeOn) DARK_PLUS.id else LIGHT_PLUS.id } } - fun getCurrentTheme(isDarkThemeOn: Boolean, theme: Int): Int { - // If Frost themes are requested on pre-Android S, fallback to appropriate theme - if (isFrostTheme(theme) && !isAtleastS()) { - return getTheme(DARK_FROST.id) - } - - return if (theme == SYSTEM_DEFAULT.id) { - if (isDarkThemeOn) { - getTheme(TRUE_BLACK.id) - } else { - getTheme(LIGHT.id) - } - } else if (theme == LIGHT.id) { - getTheme(theme) - } else if (theme == DARK.id) { - getTheme(theme) - } else if (theme == LIGHT_PLUS.id) { - getTheme(theme) - } else if (theme == DARK_PLUS.id) { - getTheme(theme) - } else if (theme == DARK_FROST.id) { - getTheme(theme) - } else { - getTheme(TRUE_BLACK.id) - } - } - - fun getBottomSheetCurrentTheme(isDarkThemeOn: Boolean, theme: Int): Int { - // If Frost themes are requested on pre-Android S, fallback to appropriate theme - if (isFrostTheme(theme) && !isAtleastS()) { - return getBottomSheetTheme(TRUE_BLACK.id) - } - - return if (theme == SYSTEM_DEFAULT.id) { - if (isDarkThemeOn) { - getBottomSheetTheme(TRUE_BLACK.id) - } else { - getBottomSheetTheme(LIGHT.id) - } - } else if (theme == LIGHT.id) { - getBottomSheetTheme(theme) - } else if (theme == DARK.id) { - getBottomSheetTheme(theme) - } else if (theme == LIGHT_PLUS.id) { - getBottomSheetTheme(theme) - } else if (theme == DARK_PLUS.id) { - getBottomSheetTheme(theme) - } else if (theme == DARK_FROST.id) { - getBottomSheetTheme(theme) - } else { - getBottomSheetTheme(TRUE_BLACK.id) - } - } - - fun isBottomSheetLightTheme(isDarkThemeOn: Boolean, theme: Int): Boolean { - val resolved = getBottomSheetCurrentTheme(isDarkThemeOn, theme) - return resolved == R.style.BottomSheetDialogThemeWhite || - resolved == R.style.BottomSheetDialogThemeWhitePlus - } - - fun isActivityLightTheme(isDarkThemeOn: Boolean, theme: Int): Boolean { - val resolved = getCurrentTheme(isDarkThemeOn, theme) - return resolved == R.style.AppThemeWhite || - resolved == R.style.AppThemeWhitePlus - } - - fun applyBottomSheetSystemBarAppearance( - window: Window, - isDarkThemeOn: Boolean, - theme: Int - ) { - if (!isAtleastQ()) return - val isLight = isBottomSheetLightTheme(isDarkThemeOn, theme) - WindowInsetsControllerCompat(window, window.decorView).apply { - isAppearanceLightStatusBars = isLight - isAppearanceLightNavigationBars = isLight - } - window.isNavigationBarContrastEnforced = false + fun useDynamicColor(preference: Int): Boolean { + return preference == SYSTEM_DEFAULT.id } } } diff --git a/app/src/main/java/com/celzero/bravedns/viewmodel/CheckoutViewModel.kt b/app/src/main/java/com/celzero/bravedns/viewmodel/CheckoutViewModel.kt new file mode 100644 index 000000000..9007e61c7 --- /dev/null +++ b/app/src/main/java/com/celzero/bravedns/viewmodel/CheckoutViewModel.kt @@ -0,0 +1,114 @@ +/* + * Copyright 2024 RethinkDNS and its authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.celzero.bravedns.viewmodel + +import android.app.Application +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.viewModelScope +import androidx.work.WorkInfo +import androidx.work.WorkManager +import com.celzero.bravedns.service.EncryptedFileManager +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.service.TcpProxyHelper +import com.celzero.bravedns.util.Utilities.togb +import com.celzero.bravedns.util.Utilities.togs +import com.celzero.bravedns.util.Utilities.tos +import com.celzero.firestack.backend.Backend +import io.github.aakira.napier.Napier +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import java.io.File +import java.math.BigInteger +import java.security.SecureRandom +import java.util.UUID + +class CheckoutViewModel(val app: Application, private val persistentState: PersistentState) : AndroidViewModel(app) { + + private val _paymentStatus = MutableStateFlow(TcpProxyHelper.getTcpProxyPaymentStatus()) + val paymentStatus = _paymentStatus.asStateFlow() + + init { + // create and handle keys if not paid + if (TcpProxyHelper.getTcpProxyPaymentStatus().isNotPaid()) { + handleKeys() + } + + // Generate random tokens/uuids for logs/tracking as done in Activity + // UUID.randomUUID().toString().let { uuid -> Napier.d("UUID: $uuid") } + // generateRandomHexToken(TOKEN_LENGTH).let { token -> Napier.d("Token: $token") } + // These were just logged in Activity, maybe not needed? Keeping them for parity if they had side effects. + // They didn't seem to store anything? + // "generateRandomHexToken(TOKEN_LENGTH).let { token -> Napier.d("Token: $token") }" + } + + private fun handleKeys() { + viewModelScope.launch(Dispatchers.IO) { + try { + val key = TcpProxyHelper.getPublicKey() + Napier.d("Public Key: $key") + // if there is a key state, the msgOrExistingState (keyState.msg/keyState.v()) should not be empty + val keyGenerator = Backend.newPipKeyProvider(key.togb(), "".togs()) + val keyState = keyGenerator.blind() + // id: use 64 chars as account id + val id = keyState.msg.opaque()?.s ?: "" + val accountId = id.substring(0, 64) + // rest of the keyState values will never be used in kotlin + + // keyState.v() should be retrieved from the file system + Backend.newPipKeyStateFrom(keyState.v()) // retrieve the key state alone + + Napier.d("Blind: $keyState") + val path = + File( + app.filesDir.canonicalPath + + File.separator + + TcpProxyHelper.TCP_FOLDER_NAME + + File.separator + + TcpProxyHelper.PIP_KEY_FILE_NAME + ) + EncryptedFileManager.writeTcpConfig(app, keyState.v().tos() ?: "", TcpProxyHelper.PIP_KEY_FILE_NAME) + val content = EncryptedFileManager.read(app, path) + Napier.d("Content: $content") + } catch (e: Exception) { + Napier.e("err in handleKeys: ${e.message}", e) + } + } + } + + val paymentWorkInfo = WorkManager.getInstance(app).getWorkInfosByTagLiveData(TcpProxyHelper.PAYMENT_WORKER_TAG) + + fun updatePaymentStatusFromWorkInfo(workInfoList: List) { + val workInfo = workInfoList.firstOrNull() ?: return + if (workInfo.state == WorkInfo.State.ENQUEUED || workInfo.state == WorkInfo.State.RUNNING) { + _paymentStatus.value = TcpProxyHelper.getTcpProxyPaymentStatus() + } else if (workInfo.state == WorkInfo.State.SUCCEEDED) { + _paymentStatus.value = TcpProxyHelper.getTcpProxyPaymentStatus() + WorkManager.getInstance(app).pruneWork() + } else if (workInfo.state == WorkInfo.State.CANCELLED || workInfo.state == WorkInfo.State.FAILED) { + _paymentStatus.value = TcpProxyHelper.getTcpProxyPaymentStatus() + WorkManager.getInstance(app).pruneWork() + WorkManager.getInstance(app).cancelAllWorkByTag(TcpProxyHelper.PAYMENT_WORKER_TAG) + } + } + + fun startPayment() { + TcpProxyHelper.initiatePaymentVerification(app) + _paymentStatus.value = TcpProxyHelper.getTcpProxyPaymentStatus() + } +} diff --git a/app/src/main/java/com/celzero/bravedns/viewmodel/EventsViewModel.kt b/app/src/main/java/com/celzero/bravedns/viewmodel/EventsViewModel.kt index ef9905122..4c56338f5 100644 --- a/app/src/main/java/com/celzero/bravedns/viewmodel/EventsViewModel.kt +++ b/app/src/main/java/com/celzero/bravedns/viewmodel/EventsViewModel.kt @@ -15,24 +15,28 @@ */ package com.celzero.bravedns.viewmodel -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.switchMap +import androidx.lifecycle.viewModelScope import androidx.paging.Pager import androidx.paging.PagingConfig import androidx.paging.PagingData -import androidx.paging.liveData +import androidx.paging.cachedIn import com.celzero.bravedns.database.Event import com.celzero.bravedns.database.EventDao import com.celzero.bravedns.database.EventSource import com.celzero.bravedns.database.Severity +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.update +@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class) class EventsViewModel(private val eventDao: EventDao) : ViewModel() { - private val filteredQuery = MutableLiveData() - private val filteredSeverity = MutableLiveData() - private val filteredSources = MutableLiveData>() + private val _filterQuery = MutableStateFlow("") + private val _filterSeverity = MutableStateFlow(null) + private val _filterSources = MutableStateFlow>(emptySet()) companion object { private const val PAGE_SIZE = 50 @@ -46,26 +50,22 @@ class EventsViewModel(private val eventDao: EventDao) : ViewModel() { private var filterType: TopLevelFilter = TopLevelFilter.ALL - init { - filteredQuery.value = "" - filteredSeverity.value = null - filteredSources.value = emptySet() - } - - val eventsList: LiveData> = - filteredQuery.switchMap { query -> - filteredSeverity.switchMap { severity -> - filteredSources.switchMap { sources -> - getEventsLiveData(query, severity, sources) - } - } - } - - private fun getEventsLiveData( + val eventsFlow: kotlinx.coroutines.flow.Flow> = + kotlinx.coroutines.flow.combine( + _filterQuery, + _filterSeverity, + _filterSources + ) { query, severity, sources -> + Triple(query, severity, sources) + }.flatMapLatest { (query, severity, sources) -> + getEventsPagingData(query, severity, sources) + }.cachedIn(viewModelScope) + + private fun getEventsPagingData( query: String, severity: Severity?, sources: Set - ): LiveData> { + ): kotlinx.coroutines.flow.Flow> { return Pager( config = PagingConfig( pageSize = PAGE_SIZE, @@ -99,13 +99,13 @@ class EventsViewModel(private val eventDao: EventDao) : ViewModel() { } } } - ).liveData + ).flow } fun setFilter(query: String, sources: Set, severity: Severity?) { - filteredSources.value = sources - filteredSeverity.value = severity - filteredQuery.value = "%$query%" + _filterSources.value = sources + _filterSeverity.value = severity + _filterQuery.value = query } fun setFilterType(type: TopLevelFilter) { @@ -117,15 +117,15 @@ class EventsViewModel(private val eventDao: EventDao) : ViewModel() { } fun getCurrentSeverity(): Severity? { - return filteredSeverity.value + return _filterSeverity.value } fun getCurrentSources(): Set { - return filteredSources.value ?: emptySet() + return _filterSources.value } fun getCurrentQuery(): String { - return filteredQuery.value ?: "" + return _filterQuery.value } } diff --git a/app/src/main/java/com/celzero/bravedns/wireguard/Peer.kt b/app/src/main/java/com/celzero/bravedns/wireguard/Peer.kt index 33cdce4f3..04e338053 100644 --- a/app/src/main/java/com/celzero/bravedns/wireguard/Peer.kt +++ b/app/src/main/java/com/celzero/bravedns/wireguard/Peer.kt @@ -61,7 +61,7 @@ class Peer private constructor(builder: Builder) { unresolvedEndpoint = builder.unresolvedEndpoint persistentKeepalive = builder.persistentKeepalive preSharedKey = builder.preSharedKey - publicKey = Objects.requireNonNull(builder.publicKey, "Peers must have a public key")!! + publicKey = requireNotNull(builder.publicKey) { "Peers must have a public key" } } @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") @@ -232,7 +232,7 @@ class Peer private constructor(builder: Builder) { } fun addAllowedIps(allowedIps: Collection?): Builder { - this.allowedIps.addAll(allowedIps!!) + allowedIps?.let { this.allowedIps.addAll(it) } return this } diff --git a/app/src/main/res/drawable/ic_arrow_back_24.xml b/app/src/main/res/drawable/ic_arrow_back_24.xml index 7739802b5..a8a2da5c2 100644 --- a/app/src/main/res/drawable/ic_arrow_back_24.xml +++ b/app/src/main/res/drawable/ic_arrow_back_24.xml @@ -4,9 +4,8 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/colorOnPrimary"> + android:tint="?attr/primaryTextColor"> - diff --git a/app/src/main/res/drawable/ic_expand_more_24.xml b/app/src/main/res/drawable/ic_expand_more_24.xml index dcaf5a95d..b48d2b358 100644 --- a/app/src/main/res/drawable/ic_expand_more_24.xml +++ b/app/src/main/res/drawable/ic_expand_more_24.xml @@ -4,9 +4,8 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/colorOnSurface"> + android:tint="?attr/primaryTextColor"> - diff --git a/app/src/main/res/drawable/ic_firewall_welcome.xml b/app/src/main/res/drawable/ic_firewall_welcome.xml index 776d9a96d..1908afffa 100644 --- a/app/src/main/res/drawable/ic_firewall_welcome.xml +++ b/app/src/main/res/drawable/ic_firewall_welcome.xml @@ -12,7 +12,7 @@ diff --git a/app/src/main/res/drawable/ic_location_on_24.xml b/app/src/main/res/drawable/ic_location_on_24.xml index 1ba7ba311..c42e84d14 100644 --- a/app/src/main/res/drawable/ic_location_on_24.xml +++ b/app/src/main/res/drawable/ic_location_on_24.xml @@ -4,9 +4,8 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/colorOnPrimaryContainer"> + android:tint="?attr/primaryTextColor"> - diff --git a/app/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter.xml index 97bb67c52..ad3b49135 100644 --- a/app/src/main/res/drawable/ic_twitter.xml +++ b/app/src/main/res/drawable/ic_twitter.xml @@ -4,11 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> + android:fillColor="#FF000000" + android:pathData="M3,2h5.6l4.2,6L18,2h3l-6.8,7.9L22,22h-5.6l-4.6,-6.6L6.1,22H3.1l7.4,-8.5zM7.3,4.3H5.4l11.3,15.4h1.9z" /> diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties new file mode 100644 index 000000000..467b3efec --- /dev/null +++ b/app/src/main/res/resources.properties @@ -0,0 +1 @@ +unqualifiedResLocale=en-US diff --git a/app/src/main/res/values-ab/strings.xml b/app/src/main/res/values-ab/strings.xml index df41f498c..6457cb1a6 100644 --- a/app/src/main/res/values-ab/strings.xml +++ b/app/src/main/res/values-ab/strings.xml @@ -340,7 +340,7 @@ Ашәахә: %1$s Cannot pause: Rethink not active Ашәақәа - ашҟа + Ашҟа Аҧсуа DNS Риthink Ҟьшьшәааԥш %1$s аҧызар » @@ -369,9 +369,9 @@ Апсихуақьтәи аполитика аԥхьа Аҧしшәлашь Абжьыра - апп + Апп Е-маил ашәашәалоит - sistema + Sistema Апликациазын адылхъва VPN Ашьапынеибамра А kebijakan ашәахәаҧшқәа @@ -1012,7 +1012,7 @@ Уры уиэит «Rethink» %1$s амш, урҭыр аусура аԥазалара $%2$s. Аразвилаз ашәшьары змоу аспонсорра узышьҭалаша ушьҭыршьымшәа? Ашәаҧшра ашәарҭадара аҿы дахьыжьымкәа адоменқәа рахь System DNS ахыҵхәаҧш Асистем DNS аиахъазлар ауеит адоменқәа рзы, еицҧаауамызқәа, мамзаргьы .lan, .internal, еиԥш. - фильтрациа + Фильтрациа Split DNS (ашәахcharт ашқәа) Аԥсшәа:\nАԥсоуп DNS ашәҟәы иахәаԥкны анхацәа рҟны ианызсыжьуа апрокси арҿы апрокси а DNS хылаԥшҩцәа рҟны. Уабыжьым иҟны аҧҵәаны аҿацәқәрақә зегьы рыцхраамла diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d562c8e6c..4280eaa76 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -101,7 +101,7 @@ تنزيل التنبيهات بدون اسم (%1$s) المنفذ غير صالح - vpn + VPN معلومات التطبيق عزل تم تمكين نظام dns الخصوصي @@ -600,7 +600,7 @@ الإعدادات يفشل خادم نظام أسماء النطاقات متوقف - إعادة التفكير + Re-Rethink يأخذ غفوة… التالي أهلاً وسهلاً @@ -645,7 +645,7 @@ احذف محلل DNSCrypt من التكوين المحفوظ. هناك خطأ ما ! إما أن خوادمنا معطلة أو لا يمكن إنشاء الاتصال. من فضلك حاول مرة أخرى بعد بعض من الوقت. - متصل بـ RethinkDNS + متصل بـ Re-RethinkDNS يجب أن يتراوح نطاق المنفذ بين 1024 و 65535 قوائم الحظر على الجهاز موجودة بالفعل في أحدث إصدار %1$s. هناك خطأ ما. حاول مرة أخرى في وقت لاحق! diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 32023d2da..62e264b5a 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1,6 +1,6 @@ - RethinkDNS + Re-Rethink DNS и Firewall с много възможности за персонализиране Rethink използва услуга за достъпност, за да открива и защитава фонови приложения. Rethink не събира и не продава никаква информация. Rethink е най-лесният начин да наблюдавате мрежовата активност, да заобикаляте интернет цензурата и приложенията за защитна стена на вашето устройство с Android. @@ -12,7 +12,7 @@ няма интернет защитен с http proxy и частен dns защитен със socks5 и частен dns - Свързан с RethinkDNS + Свързан с Re-RethinkDNS защитен с прокси не е защитен Свързан към защитната стена @@ -255,7 +255,7 @@ Новата версия на приложението е достъпна за изтегляне от уебсайта. Искате ли да продължите? защитен с wireguard и частен dns Копиран публичният ключ. - vpn + VPN TCP + HTTP прокси Изтриване на DNS прокси. Изтегляне на блокови списъци diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index bc5c7b012..6a308d7eb 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -116,7 +116,7 @@ অনুমতি - অ্যাক্সেসযোগ্যতা নেটওয়ার্ক লগ এখনই আপডেট করা যাচ্ছে না - vpn + VPN ইউআরএল কপি করা হয়েছে উপরের সবগুলো. ইনস্টল করুন @@ -290,7 +290,7 @@ সত্যিকারের কালো DNS / DNS + ফায়ারওয়াল অ্যাপের তথ্য পাওয়া যায়নি - RethinkDNS + Re-RethinkDNS GitHub-এ অবদান রাখুন [RethinkDNS]: কাস্টম সার্ভার URL @@ -354,7 +354,7 @@ বৈশিষ্ট্য প্রস্তাব করুন ডিভাইস লক হয়ে গেলে সমস্ত অ্যাপ ব্লক করুন IPv6 তে IPv4 ব্লক করুন (পরীক্ষামূলক) - RethinkDNS + Re-Rethink ঘুমানো… rethink পছন্দসমূহ diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 3b84b9985..bb3db7f9d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3,7 +3,7 @@ O aplikaci Nastavení Statistiky - pravidla + Pravidla Konfigurovat záznamy síť @@ -130,7 +130,7 @@ Selhalo: používá se záložní DNS Připojeno k RethinkDNS a Firewallu Monitorujte síťovou aktivitu a firewallujte jakoukoli aplikaci nebo IP adresu. - Připojeno k RethinkDNS + Připojeno k Re-RethinkDNS Vyberte mód. Aplikace DNS + Firewall @@ -185,7 +185,7 @@ Žádné spustit Nepodařilo se získat crash logy. Chcete chybu nahlásit ručně? - odkazy + Odkazy Navštívit rethinkdns.com %1$sms Obcházeno @@ -277,7 +277,7 @@ Firewall DNS a Firewall (výchozí) VPN - vpn + VPN IP adresa zkopírována. URL zkopírována Veřejný klíč zkopírován. @@ -426,8 +426,8 @@ Optimalizace baterie Vypnout %1$s %1$s může vést ke ztrátě konektivity. Změňte nastavení, abyste Rethinku povolili používat data a další prostředky na pozadí. - pravidla - typ + Pravidla + Typ Jiné DNS Rethink DNS Blokovací seznamy v zařízení @@ -453,7 +453,7 @@ Zobrazit FAQ Přečíst dokumentaci Přečíst zásady ochrany soukromí - kontakt + Kontakt VPN profil Nastavení oznámení Sledujte nás na Twitteru @@ -552,7 +552,7 @@ Izolovat vybrané aplikace? Zobrazuji všechny aplikace Nebyla nalezena žádná firewallová pravidla - znovu načíst + Znovu načíst Neznámé Nepojmenováno (%1$s) Chyba při připojování k DNSCrypt serveru. @@ -699,14 +699,14 @@ Obnovení se nezdařilo Nelze provést obnovu. Zkusit znovu? Záloha dokončena - nejčastěji povolované aplikace - nejčastěji blokované aplikace - nejčastěji navštěvované domény - nejčastěji kontaktované země - nejčastěji blokované domény - nejčastěji kontaktované IP - nejčastěji blokované IP - nejčastěji blokované země + Nejčastěji povolované aplikace + Nejčastěji blokované aplikace + Nejčastěji navštěvované domény + Nejčastěji kontaktované země + Nejčastěji blokované domény + Nejčastěji kontaktované IP + Nejčastěji blokované IP + Nejčastěji blokované země Zobrazit vše Neplatný klíč Neznámý atribut @@ -785,7 +785,7 @@ Povolit RDNS+ Sponzorovat Napište nám e-mail - systém + Systém Info o aplikaci Interní Externí @@ -853,7 +853,7 @@ Záloha Orbot %1$sms - aplikace + Aplikace Poznámka Obcházet aplikaci pro všechny proxy Tato aplikace již obchází proxy diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d049deea1..e55d25eda 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,6 +1,6 @@ - RethinkDNS + Re-Rethink rethink Einstellungen Über @@ -28,7 +28,7 @@ geschützt geschützt mit Tor Anwendungsfehler - DNS-Fehler + DNS Fehler DNS-Server ausgefallen Kein Internet geschützt durch privaten DNS @@ -40,7 +40,7 @@ geschützt mit Proxy private DNS ist eingeschaltet nicht geschützt - Verbunden mit RethinkDNS + Verbunden mit Re-RethinkDNS Verbunden mit der Firewall Verbunden mit RethinkDNS und Firewall FORTSETZEN @@ -94,10 +94,10 @@ Du nutzt bereits die neueste Version. Firewall DNS - vpn + VPN IP-Adresse kopiert. DNS- und Firewall-Logs lokal auf dem Gerät speichern. - Geräteinterne Protokollierung aktivieren + Geräteinteres Logging aktivieren Alle Netzwerk-Logs löschen? blockiert %1$s auf dem Gerät #1: Blockiert eine App daran, eine Verbindung zum Internet herzustellen. \n #2: Blockiert alle Apps, sich mit einer bestimmten IP-Adresse zu verbinden. \n #3: Blockiert alle Verbindungen, während das Gerät gesperrt ist (Universelle Firewall). \n #4: Blockiert alle nicht verwendeten Apps (Universelle Firewall). \n #5: Blockiert Verbindungen, wenn die Quell-App unbekannt ist (Universelle Firewall). \n #6: Blockiert den gesamten UDP-Datenverkehr außer DNS (Universelle Firewall). \n #7: Blockiert Verbindungen, wenn DNS umgangen wird (Universelle Firewall). @@ -121,7 +121,7 @@ Anfragenden Apps erlauben, alle verfügbaren Netzwerke zu benutzen. Diese Apps könnten die RethinkDNS-Firewall bei Bedarf umgehen. Einige Audio-/Videokonferenz-Apps wie Zoom und Meet können dies erfordern, um richtig zu funktionieren. Baut einen HTTP-CONNECT-Tunnel zu Orbot auf. Rethink hat aufgehört Verbindungen zu Orbot weiterzuleiten, aber Orbot läuft vielleicht noch im Hintergrund. - Orbot ist eine kostenlose Proxy-App, die es anderen Apps ermöglicht, das Internet sicherer zu nutzen.\nOrbot verwendet Tor, um deinen Internetverkehr zu verschlüsseln, was dir dabei hilft, Zensur zu umgehen und dich gegen Formen der Netzwerküberwachung zu verteidigen, die die persönliche Freiheit und Privatsphäre bedrohen.\nTCP Proxy: Rethink leitet nur TCP-Verbindungen von eingeschlossenen Apps an Orbot weiter.\nHTTP Proxy: Rethink stellt einen HTTP CONNECT-Tunnel zu Orbot her und leitet nur TCP-Verbindungen von eingeschlossenen Apps weiter. + Orbot ist eine kostenlose Proxy-App, die es anderen Apps ermöglicht, das Internet sicherer zu nutzen.\nOrbot verwendet Tor, um Ihren Internetverkehr zu verschlüsseln, was Ihnen hilft, Zensur zu umgehen und sich gegen Formen der Netzwerküberwachung zu verteidigen, die die persönliche Freiheit und Privatsphäre bedrohen.\nTCP Proxy: Rethink leitet nur TCP-Verbindungen von eingeschlossenen Apps an Orbot weiter.\nHTTP Proxy: Rethink stellt einen HTTP CONNECT-Tunnel zu Orbot her und leitet nur TCP-Verbindungen von eingeschlossenen Apps weiter. Orbot installieren\? Orbot im nicht-VPN-Modus mit HTTPS/SOCKS5. Einstellungen öffnen @@ -132,7 +132,7 @@ DNSCrypt DNS-Proxy Verbunden mit %1$s - DNSCrypt: %1$s Resolver + DNSCrypt: %1$s Auflöser HTTP(S)-CONNECT-Proxy festlegen Etwas ist schiefgelaufen! Entweder sind unsere Server ausgefallen oder die Verbindung konnte nicht hergestellt werden. Bitte versuche es nach einiger Zeit erneut. @@ -194,7 +194,7 @@ Orbot ❯ erlaubt bei %1$s %2$s DNS (energiesparend) - HTTP-Proxy ist eingestellt. + HTTP-Proxy ist festgelegt. Manueller Eingriff erforderlich Orbot stoppen https://guardianproject.info/apps/org.torproject.android/ @@ -238,13 +238,13 @@ pausiert Hinweis: %1$s blockierte Anwendungen werden weiterhin mit einer Firewall versehen. DoH - DNS-Proxy - DNSCrypt + Dns-Proxy + Dnscrypt App gesperrt Keine Regel - Unbegrenzt (WLAN) + Ungezählt (Wlan) Getaktet (Mobil) - Getaktet (universell) + Getaktet (Universell) Isolieren Neue App Fehler @@ -252,9 +252,9 @@ umgangene App App blockiert.

Zum Ändern gehe zum Tab Alle Apps .]]> ersten Mal eine Verbindung hergestellt.

Um dies zu ändern, gehe zum Tab Universal.]]> - App beim Versuch, eine Verbindung in einem nach Datenvolumen begrenzten Netzwerk herzustellen, blockiert.

Um dies zu ändern, gehe zum Tab Alle Apps.]]> - Ziel-IP / den Ziel-Port blockiert.

Zum Ändern gehe zum Tab Universell.]]> - Ziel-IP blockiert.

Um dies zu ändern, gehe zum Bildschirm App-spezifische Firewall.]]> + App beim Versuch, eine Verbindung in einem nach Datenvolumen begrenzten Netzwerk herzustellen, blockiert.

Um dies zu ändern, gehen Sie zum Tab Alle Apps.]]> + Ziel-IP / den Ziel-Port blockiert.

Zum Ändern gehen Sie zum Tab Universell.]]> + Ziel-IP blockiert.

Um dies zu ändern, gehen Sie zum Bildschirm App-spezifische Firewall.]]> Berechtigung für Benachrichtigungen erteilen Verbindung mit dem Host fehlgeschlagen. Versuche es erneut. Auto (experimentell) @@ -266,14 +266,14 @@ IP / Port (Universell) Gerät gesperrt App beim Versuch, eine Verbindung im Unmetered-Netzwerk herzustellen, blockiert.

Um dies zu ändern, wechsel zum Tab Alle Apps.]]> - App blockiert, als sie versuchte, eine Verbindung in einem gedrosselten (mobilen) Netzwerk herzustellen.

Um dies zu ändern, gehe zum Reiter Universell.]]> + App blockiert, als sie versuchte, eine Verbindung in einem gedrosselten (mobilen) Netzwerk herzustellen.

Um dies zu ändern, gehen Sie zum Reiter Universell.]]> Gerät zu diesem Zeitpunkt gesperrt war.

Um dieses Verhalten zu ändern, gehe zum Tab Universal.]]> - Ziel-IP so eingestellt ist, dass alle universellen Firewall-Regeln umgangen werden.

Um dies zu ändern, gehe zu IP-Regeln im Tab Universell.]]> - nicht im Vordergrund war.

Um dieses Verhalten zu ändern, gehe zum Tab Universal.]]> + Ziel-IP so eingestellt ist, dass alle universellen Firewall-Regeln umgangen werden.

Um dies zu ändern, gehen Sie zu IP-Regeln im Tab Universell.]]> + nicht im Vordergrund war.

Um dieses Verhalten zu ändern, gehen Sie zum Tab Universal.]]> Quell-App die vom Benutzer bevorzugte DNS-Auflösung umgangen hat.

Um dieses Verhalten zu ändern, gehe zum Tab Universal.]]> - UDP-Verbindung blockiert.

Um dies zu ändern, gehe zum Tab Universal.]]> + UDP-Verbindung blockiert.

Um dies zu ändern, gehen Sie zum Tab Universal.]]> unsicheres HTTP verwendete.

Um dies zu ändern, gehe zum Tab Universal.]]> - Quell-App auf universelle Firewall-Regeln umgehen eingestellt ist.

Um dies zu ändern, gehe zum Bildschirm App-spezifische Firewall.]]> + Quell-App auf universelle Firewall-Regeln umgehen eingestellt ist.

Um dies zu ändern, gehen Sie zum Bildschirm App-spezifische Firewall.]]> Benutzerdefinierte Server-URL Der Portbereich muss zwischen 1024 und 65535 liegen Ungültiger Port @@ -287,7 +287,7 @@ Vom System eingestellt Hell Dunkel - Tiefschwarz + Schwarz IP-Version wählen IPv4 (Standard) IPv4 @@ -302,7 +302,7 @@ erlaubt Der Rethink-Dienst für Barrierefreiheit wurde angehalten oder ist abgestürzt. Anwendungen im Hintergrund werden nicht mehr blockiert. demnächst - Der Modus kann nicht geändert werden, wenn das VPN gesperrt ist. Tippe auf <u>VPN-Einstellungen bearbeiten</u>. + Der Modus kann nicht geändert werden, wenn VPN im Modus Sperre ist. Tippe hier, um <u>VPN-Einstellungen zu bearbeiten</u>. IP/ Port (App) Vertrauenswürdige IP Umgangene IP @@ -312,9 +312,9 @@ totale Sperrung Für diese Verbindung gibt es keine passenden Firewall-Regeln. App sich mit anderen Zielen als umgangenen IPs verbindet.

Um dies zu ändern, gehe zum Tab Alle Apps.]]> - Ziel-IP als vertrauenswürdige IP festgelegt ist.

Zum Ändern gehe zum Bildschirm App-spezifische Firewall.]]> - Quell-App nicht ermittelt werden konnte.

Um dieses Verhalten zu ändern, gehe zur Registerkarte Universal.]]> -
Um dies zu ändern, deaktiviere DNS-Leaks verhindern auf dem Bildschirm DNS konfigurieren.]]> + Ziel-IP als vertrauenswürdige IP festgelegt ist.

Zum Ändern gehen Sie zum Bildschirm App-spezifische Firewall.]]> + Quell-App nicht ermittelt werden konnte.

Um dieses Verhalten zu ändern, gehen Sie zur Registerkarte Universal.]]> +
Um dies zu ändern, deaktivieren Sie DNS-Leaks verhindern auf dem Bildschirm DNS konfigurieren.]]> One-Click-Tor-als-Proxy-Einrichtung über Orbot im Gange war.]]> Manuelles Sichern oder Wiederherstellen der App-Daten und Einstellungen. In-App-Downloader verwenden @@ -324,7 +324,7 @@ Sichern und Wiederherstellen Pauschale Umgehung Öffnen der Einstellungen für Barrierefreiheit fehlgeschlagen. Versuche es später erneut! - Universell + Pauschal Achtung Download Warnung Informieren, wenn Rethink aktiv ist und im Hintergrund läuft @@ -367,8 +367,8 @@ ist erlaubt Keine Netzwerkprotokolle für diese Kategorie. ist blockiert - wird in unbegrenzten (WLAN-)Netzwerken blockiert - ist isoliert; nur vertrauenswürdige IPs und Domains erlaubt + wird in nicht gebührenpflichtigen Netzwerken (Wlan) blockiert + ist isoliert; nur vertrauenswürdige IPs erlaubt ist unbekannt umgeht die universellen Firewall-Regeln Elterliche Kontrolle @@ -381,14 +381,14 @@ Aktualisierung verfügbar Nach Updates suchen Blocklisten erneut herunterladen - Blocklisten herunterladen (ca. 60 MB), um diese Funktion zu nutzen. + Laden Sie Blocklisten herunter (ca. 60 MB), um diese Funktion zu nutzen. ⛅ Himmel 🪂 Max Zeige alle Blocklisten %1$s Blockierlisten an]]> - 50+ Standorte; mehr Privatsphäre; rekursiver Resolver läuft auf fly.io + 50+ Standorte; mehr privat; rekursiver Resolver läuft auf fly.io %1$s Blocklisten in Gruppe: %2$s und Untergruppe: %3$s]]> - 280+ Standorte; höhere Betriebszeit; Stub-Resolver läuft auf cloudflare.com + 280+ Standorte; höhere Betriebszeit; Stub Resolver läuft auf cloudflare.com Untergruppe Leeren Rethink DNS @@ -408,31 +408,31 @@ Sichert die App-Einstellungen, Netzwerk- und DNS-Protokolle in einer Datei. Dadurch wird das VPN neu gestartet. Sicherung (Backup) wiederherstellen Sichern (Backup) - App-Einstellungen, Netzwerk- und DNS-Protokolle aus einer Sicherungsdatei wiederherstellen. Dadurch wird die App neu gestartet. + Stellen Sie die App-Einstellungen, Netzwerk- und DNS-Protokolle aus einer Sicherungsdatei wieder her. Dadurch wird die App neu gestartet. Wiederherstellen Konnte nicht wiederhergestellt werden. Erneut versuchen\? Wiederherstellen wiederholen Wiederherstellung abgeschlossen, Neustart der Anwendung… Sicherung komplett - Wiederherstellung fehlgeschlagen; versuche es nochmal + Wiederherstellung fehlgeschlagen; versuchen Sie es nochmal Wiederherstellung fehlgeschlagen B Installierte Apps Domäne aus der benutzerdefinierten Liste entfernt N - Lösche die Domain aus den gespeicherten Konfiguration. + Löschen Sie die Domäne aus den gespeicherten Konfiguration. IP-Adresse, IP-Subnetz (Bereich), Port zulassen (umgehen) oder sperren. Beispiel: 10.10.10.10, 10.1.1.*, 10.2.2/24, ffff::/104, [::]:80,[10.1.0.0/16]:80, *.*:80 ist von DNS und Firewall ausgeschlossen Firewall-Regeln für diese Anwendung blockiert %1$s durch %2$s - Sperre Inhalte für Erwachsene und Raubkopien, Online-Glücksspiele und -Dating sowie soziale Medien. - Möchtest du neu konfigurierte Blocklisten anwenden? + Sperren Sie Inhalte für Erwachsene und Raubkopien, Online-Glücksspiele und -Dating, sowie soziale Medien. + Möchten Sie neu konfigurierte Blocklisten anwenden\? Weiter Keine Regel - Malware, Ransomware, Cryptoware, Phisher und andere Bedrohungen blockieren. + Blockieren Sie Malware, Ransomware (Erpressersoftware), Kryptoware, Phisher und andere Bedrohungen. Aus Sicherungsdatei wiederherstellen Sichern von Anwendungseinstellungen, Netzwerk- und DNS-Protokollen - Der Rethink-Dienst für Barrierefreiheit wurde angehalten oder ist abgestürzt. Erzwinge das Beenden von Rethink über die Systemeinstellungen und starte Rethink erneut, um die Funktion Blockieren aller nicht genutzten Apps zu verwenden.\n\nRethink verwendet den Dienst für Barrierefreiheit, um zu verfolgen, welche Apps in Gebrauch sind (im Vordergrund) und welche nicht (im Hintergrund). + Der Rethink Dienst für Barrierefreiheit wurde angehalten oder ist abgestürzt. Erzwinge das Beenden von Rethink über die Systemeinstellungen und starte Rethink erneut, um die Funktion Blockieren aller nicht genutzten Apps zu verwenden.\n\nRethink verwendet den Dienst für Barrierefreiheit, um zu verfolgen, welche Apps in Gebrauch sind (im Vordergrund) und welche nicht (im Hintergrund). isoliert von DNS und Firewall ausgeschlossen umgeht die universellen Firewall-Regeln @@ -447,7 +447,7 @@ Fortfahren Verwerfen Warnung vor Firewall-Fehlern und Anomalien - Webseite + webseite Spiel {fileName} fdroid Domain erfolgreich hinzugefügt @@ -463,13 +463,13 @@ Ausblenden Isolieren Protokolle löschen - Lösche alle Protokolle, die sich auf diese App beziehen. + Löschen Sie alle Protokolle, die sich auf diese Anwendung beziehen. Die Regeln gelten nur für diese App. System DNS On-Device Blockliste herunterladen Download in Arbeit… - Download fehlgeschlagen. Versuche es erneut. - Attentionware, Spyware und Scareware blockieren. + Download fehlgeschlagen. Versuchen Sie es erneut. + Blockieren Sie Attentionware, Spyware und Scareware. Sicherheit Änderungen speichern einfach @@ -491,14 +491,14 @@ Firewall-Modus aktivieren. %1$s ms Achtung! - Entweder fehlt die VPN-Berechtigung oder eine andere Anwendung befindet sich im Always-on-VPN-Modus. + Entweder fehlt die VPN-Berechtigung, oder eine andere Anwendung befindet sich im Always-on-VPN-Modus. Fortfahren Erteile die Berechtigung für Benachrichtigungen in den Android-Einstellungen in gebührenfreien Netzen (WLAN) blockiert in gebührenpflichtigen (mobilen) Netzen gesperrt blockiert unbekannt - App-Info nicht gefunden + App Info nicht gefunden %1$s Apps DNS-Modus aktivieren. %1$s IP- und Port-Regel(n) @@ -510,10 +510,11 @@ Start Was gibt\'s Neues Du bist nur einen Schritt von einem sicheren Android-System entfernt: Kontrolliere Netzwerkaktivitäten, blockiere Webseiten, IP-Adressen und sich unerwünscht verhaltende Apps. - Proxy aktiv + Proxy aktiviert RDNS+ aktivieren - Ausschließen im VPN-Sperrmodus nicht möglich + Ausschließen im VPN-Lockdown-Modus nicht möglich Proxy entfernt + Stoppen… Schließen… Aktivieren… Thema: %1$s @@ -539,19 +540,19 @@ https://svc.rethinkdns.com/r/translate v%1$s https://www.rethinkdns.com/privacy - Die Webseite kann nicht im Browser geöffnet werden. - Der Benachrichtigungsbildschirm der App konnte nicht gestartet werden. + Webseite konnte nicht im Browser geöffnet werden. + App-Benachrichtigungs-Bildschirm konnte nicht geöffnet werden. Kein Absturzbericht gefunden Fehler beim Laden der Protokolldatei - Erfassen… + Sammle… Autor:innen Benutzerdefinierte Server-URL DoH DNSCrypt - DNSCrypt-Resolver oder -Relay hinzufügen + DNSCrypt Resolver oder Relay hinzufügen DNSCrypt %1$s - DNSCrypt-Resolver oder -Relay hinzufügen - Resolver + DNSCrypt Resolver oder Relay hinzufügen + Auflöser Relay Name Stamp @@ -599,8 +600,8 @@ https://www.rethinkdns.com/ v%1$s (%2$s) Funktion vorschlagen - App-Info konnte nicht gestartet werden. - Das VPN-Profil konnte nicht gestartet werden. + App-Info konnte nicht geöffnet werden. + VPN-Profile konnten nicht geöffnet werden. Einstellung für Privates DNS konnte nicht geöffnet werden. DoH %1$s Benutzerdefinierter DNS-Proxy @@ -614,8 +615,8 @@ Portbereich muss zwischen 1024 und 65535 liegen DNSRelay %1$s Seite mit den App-Einstellungen nicht gefunden - %1$s + %2$s andere Anwendung(en) - Die für %1$s geltenden Regeln gelten auch für %2$s andere Apps + %1$s + %2$s andere App(s) + Regeln angewendet für %1$s sind auch anwendbar für %2$s andere Apps Zurück %1$s: %2$s Blockliste(n)%3$s.

]]> ]]> @@ -625,20 +626,20 @@ aufgelöst %1$s %1$ss Abfragetyp: %1$s - OK + ok Update abgeschlossen - Webseite besuchen + Besuche Webseite Später erinnern - Alle Apps blockieren, wenn das Gerät gesperrt ist - Alle nicht verwendeten Apps blockieren + Blockiere alle Apps, wenn das Gerät gesperrt ist + Blockiere jede App, die nicht in Benutzung ist Blockieren, wenn die Quell-App unbekannt ist - UDP außer DNS und NTP blockieren + Blockiere UDP, außer DNS und NTP Blockieren, wenn DNS umgangen wird - Neu installierte Apps standardmäßig blockieren - IPv4 in IPv6 blockieren (experimentell) - Port 80 blockieren (unsicherer HTTP-Verkehr) - Gebührenpflichtige (mobile) Netzwerke blockieren - Alles außer umgehende Apps und IPs blockieren + Blockiere neu installierte Apps standardmäßig + Blockiere IPv4 in IPv6 (experimentell) + Blockiere Port 80-Verkehr (unsicheres HTTP) + Blockiere gebührenpflichtige Netzwerke (z.B. mobile Netzwerke) + Blockiere alles außer umgehende Apps und IPs IP- & Port-Regeln Ungültiger Port Absturzprotokolle per E-Mail senden @@ -710,7 +711,7 @@ GitHub / Sonatype
]]> - Anderer DNS + Andere DNS Rethink DNS %1$s Einträge » Wähle aus über 195 Blocklisten. Tippe hier, um Blocklisten herunterzuladen oder zu konfigurieren. @@ -767,11 +768,11 @@ Leeren Installiert OK - Verbindungen in kostenpflichtigen (mobilen) Netzwerken für aufgelistete Apps blockieren? + Verbindungen in kostenpflichtigen Netzwerken (Mobilfunknetze) für die auf aufgeführten Apps blockieren? Erlaubt im kostenpflichtigen Verbindungen in kostenpflichtigen Netzwerken (Mobilfunknetze) für die auf aufgeführten Apps erlauben? Keine Firewall-Regeln gefunden - neu laden + Neu laden SOCKS5 Proxy Tor-as-a-proxy Der aktuelle DNS-Server kann nicht ermittelt werden @@ -787,7 +788,7 @@ Fehler bei der biometrischen Authentifizierung Umgangen Isoliert - Sowohl von DNS als auch von der Firewall ausschließen. + Sowohl von DNS + Firewall ausschließen. Apps umgehen Verbindungen für aufgelistete Apps erlauben\? Apps ausschließen @@ -798,19 +799,19 @@ %1$s %2$s Apps in Kategorien werden angezeigt: %3$s]]> ⚠ Vertrauen - meistblockierte Apps - meisterlaubte Apps - meist kontaktierte IPs - meist blockierte IPs + Meistblockierte Apps + Meisterlaubte Apps + Meistkontaktierte IPs + Meistblockierte IPs Alle anzeigen Universelle Firewall-Regeln für aufgelistete Apps umgehen\? - meist kontaktierte Domains + Meistkontaktierte Domains Bevorzugte Sprache wählen Bevorzugte Sprache wählen Rethink entsperren Biometrische Authentifizierung zum Entsperren von Rethink verwenden Biometrische Authentifizierung fehlgeschlagen - meistblockierte Domains + Meistblockierte Domains Anwendungen zulassen Alle außer vertrauenswürdigen IPs blockieren. Universelle Firewall-Regeln umgehen. @@ -818,8 +819,8 @@ Typ URL Blockieren auf nicht getakteten Verbindung - Zulassen / Blockieren im gebührenpflichtigen (mobilen) Netz. - Starte Rethink, um fortzufahren + Zulassen / Blockieren in gebührenpflichtigen Netzen (mobile Netze). + Starten Sie Rethink, um fortzufahren Platzhalter Erlaubt Blockiert @@ -829,8 +830,8 @@ Zulassen / Blockieren in gebührenfreien Netzen (WLAN). DNS durch Proxy geleitet Domäne (App) - Domain blockiert.

Um dies zu ändern, gehe zum Bildschirm App-spezifische Firewall.]]> - Domain als vertrauenswürdige Domain festgelegt wurde.

Zum Ändern gehe zum Bildschirm App-spezifische Firewall.]]> + Domain blockiert.

Um dies zu ändern, gehen Sie zum Bildschirm App-spezifische Firewall.]]> + Domain als vertrauenswürdige Domain festgelegt wurde.

Zum Ändern gehen Sie zum Bildschirm App-spezifische Firewall.]]> Abbrechen Übernehmen Verwerfen @@ -869,24 +870,24 @@ Funktioniert nicht über verschiedene App-Versionen hinweg Blockieren, Domain(s) für diese App vertrauen Proxies können nicht aufgesetzt werden, während das VPN im DNS only - Modus läuft. - Universelle DNS- & Firewall-Regeln für aufgelistete Apps umgehen? + Sollen universelle DNS- & Firewall-Regeln für aufgelisteten Apps umgangen werden\? Vertrauenswürdige Domäne (Univ) - Domain vom benutzer bevorzugten DNS blockiert wird.

Um dieses Verhalten zu ändern, gehe zum Tab DNS konfigurieren.]]> + Domain vom benutzer bevorzugten DNS blockiert wird.

Um dieses Verhalten zu ändern, wechseln Sie zum Tab DNS konfigurieren.]]> Umgehe DNS & Firewall - Anfragen bündeln, Antworten zwischenspeichern, robuste Fehlerbehandlung - Domain in den universellen Domain-Regeln als blockiert festgelegt ist.

Um dieses Verhalten zu ändern, gehe zum Tab DNS konfigurieren.]]> + Vereine Anfragen, cache Antworten, robuste Fehlerbehandlung + Domain in den universellen Domain-Regeln als blockiert festgelegt ist.

Um dieses Verhalten zu ändern, gehen Sie zur Registerkarte DNS konfigurieren.]]> wird universelle DNS- & Firewall-Regeln umgehen %1$s Domain-Regel(n) Einzigartige IP für jede DNS-Anfrage verwenden. Domäne (Univ) - Quell-App auf DNS- und Firewall-Regeln umgehen gesetzt ist.

Zum Ändern gehe zum Bildschirm App-spezifische Firewall.]]> + Quell-App auf DNS- und Firewall-Regeln umgehen gesetzt ist.

Zum Ändern gehen Sie zum Bildschirm App-spezifische Firewall.]]> In seltenen Fällen kann das bevorzugte DNS nicht ermittelt bzw. erreicht werden. Dann wird das Ausweich-DNS verwendet. - Domain in den universellen Domain-Regeln als vertrauenswürdig eingestuft ist.

Um dieses Verhalten zu ändern, gehe zum Tab DNS konfigurieren.]]> - Eventuell blockiert + Domain in den universellen Domain-Regeln als vertrauenswürdig eingestuft ist.

Um dieses Verhalten zu ändern, gehen Sie zum Tab DNS konfigurieren.]]> + Evtl. blockiert Netzwerk %1$s funktioniert nur mit Rethink\'s DNS - Private IPs nicht weiterleiten (experimentell) - LAN, Loopback, Multicast und Link-Local-Routen von Rethinks VPN-Tunnel ausschließen. + Private IPs nicht umlenken (experimentell) + LAN, Loopback, Multicast und Link-Local Routen von Rethinks VPN-Tunnel ausschließen. Importieren SOCKS5 HTTP @@ -907,8 +908,8 @@ pro App Öffentlicher Schlüssel Privater Schlüssel - Apps - Einbeziehen + Anwendungen + Miteinbeziehen sehr Alles auswählen Erstellen @@ -918,7 +919,7 @@ Ungültiger Schlüssel IP-Netzwerk IP-Adresse - Schützt dein Gerät vor Schadsoftware und mehr. + Schützt Ihr Gerät vor Schadsoftware und mehr. WireGuard als ein Proxy. Universelle Firewall-Regeln Zulässige IPs @@ -932,7 +933,7 @@ : WireGuard Hex-Schlüssel müssen 64 Zeichen (32 Bytes) lang sein Anonymisiertes DNS-Relay, gehostet in Singapur. Std - Schalte andere aktive Proxys aus, um WireGuard zu aktivieren + Schalten Sie andere aktive Proxys aus, um WireGuard zu aktivieren speichern Alle Domain-Regeln gelöscht (optional) @@ -954,8 +955,8 @@ Unbekannter Fehler Apps nach Namen suchen Alle Apps einbeziehen - meist kontaktierte Länder - meistblockierte Länder + Meistkontaktierte Länder + Meistblockierte Länder geschützt mit WireGuard Konfiguration hinzugefügt Falsche Zeichen im Schlüssel @@ -969,7 +970,7 @@ Falsche Schlüssellänge Konfiguration löschen da %1$s - Bist du sicher, dass du diese Konfiguration löschen möchten? + Sind Sie sicher, dass Sie diese Konfiguration löschen möchten\? WARP-Konfiguration vom Server abrufen Zeichenkette Unbekannter Fehler „%s“ @@ -1006,16 +1007,18 @@ Geschützt! Verbunden mit DNS + Firewall + Proxy. Peer Loopback (experimentell) + Loopback (experimentell) + Aktiviert auch die %1$s Einstellung. Fortfahren? Dauerhafte Benachrichtigung - Die Benachrichtigung dauerhaft anzeigen + Zu dauerhafter Benachrichtigung machen Rethinks eigenen Netzwerkverkehr, wie z.B. Blocklisten-Downloads, Verbindungschecks oder DNS-Verbindungen in den Tunnel zurückleiten. - Wenn deaktiviert, werden Proxy-Apps (SOCKS5, HTTP, DNS) aus Rethinks VPN-Tunnel ausgeschlossen. + Bei Deaktivierung werden Proxy-Apps (SOCKS5, HTTP, DNS) aus Rethinks VPN-Tunnel ausgeschlossen. Endpunkt für DNS-over-TLS (DoT) aus der gespeicherten Konfiguration löschen. Richte die URL in der Form \"<protocol>://<username>:<password>@<domain-or-ip>:<port><path>\" ein. Beispiel: https://proxy.example.com:8080/ %1$s deaktivieren Verbindungstests durchführen Verbindungstests werden durchgeführt, um die Erreichbarkeit zu ermitteln. - Leite den Datenverkehr von Rethink durch den Tunnel. Deaktiviere diese Funktion, wenn du nicht genau weißt, was du tust. + Rethinks eigenen Netzwerkverkehr in den Tunnel zurüclleiten. Schalte diese Einstellung aus, außer du weißt was du tust. Mindestens eine App aktivieren, um Orbot zu starten %1$s kann zu Verbindungsabbrüchen führen. Ändere die Einstellung, um Rethink Daten und andere Ressourcen nutzen zu lassen, wenn es sich im Hintergrund befindet. Loopback Proxy-Forwarder-Apps @@ -1059,7 +1062,7 @@ Quad9 leitet deine DNS-Anfragen über ein sicheres Netz von Servern rund um den Globus. Quad9 (anycast) mit DNSSEC, ohne Logging, mit Filter (IP-Adressen: 9.9.9.9 – 149.112.112.9 – 149.112.112.112) Anonymisiertes DNS-Relay, gehostet in Los Angeles, Kalifornien, USA und bereitgestellt von https://cryptostrom.is/. - Blockiert den Zugang zu allen nicht jugendfreien, pornografischen und expliziten Webseiten. Außerdem werden Proxy- und VPN-Domains blockiert, die zur Umgehung der Filter verwendet werden. Seiten mit gemischten Inhalten wie Reddit werden ebenfalls blockiert. Google, Bing und YouTube werden auf den abgesicherten Suchmodus eingestellt. + Blockiert den Zugang zu allen nicht jugendfreien, pornografischen und expliziten Webseiten. Proxys und VPNs, welche zur Umgehung der Filter verwendet werden können, werden ebenso gesperrt. Seiten mit gemischten Inhalten wie Reddit werden ebenfalls blockiert. Google, Bing und YoutTube werden auf den abgesicherten Suchmodus eingestellt. Quad9 (anycast) ohne DNSSEC, ohne Logging, ohne Filter, mit ECS (IP-Adressen: 9.9.9.12 – 149.112.112.12) Anonymisiertes DNS-Relay, gehostet in Paris, Frankreich und bereitgestellt von https://cryptostrom.is/. Anonymisiertes DNS-Relay, gehostet in Schweden und bereitgestellt von https://cryptostrom.is/. @@ -1068,19 +1071,20 @@ Relays protos Service Provider - Schütze dein Android-Gerät mit einer Firewall - Kein Netzwerk + Schütze dein Android mit einer Firewall + kein Netzwerk Dunkel Plus Biometrische Authentifizierung Nach 5 Minuten Nach 15 Minuten Split DNS (experimentell) + DNS-Regeln als Firewall-Regeln behandeln (experimentell) (experimentell) Manuell Internet mit WireGuard absichern Verschlüsselt deinen Internetverkehr mit WireGuard. Für unterschiedliche Apps lassen sich verschiedene Routen auswählen. Kontrolliere die Internetnutzung pro App und schränke Verbindungen basierend auf der Netzwerkaktivität oder je nach App ein. - Werbung und Malware mit DNS blockieren + Blockiere Werbung und Malware über DNS Wähle aus über 190 Listen, um Werbung, Tracker und Malware zu stoppen. Kostenpflichtiges mobiles Netz Nur Mobilfunknetze als „kostenpflichtig“ behandeln, den Rest als „ohne Datenlimit“. @@ -1096,16 +1100,17 @@ Relay-Fehler: %1$s -> %2$s Mobile-only-Modus wird für Relays nicht unterstützt Deaktiviere den Mobile-only-oder-SSID-Modus, um Relays zu nutzen - Ausweichlösung + Fallback Filterung + DNS-Blockierung wird während der Auflösung umgangen; die Entscheidung wird zum Zeitpunkt der Verbindung getroffen. Alle lokalen Host-Verbindungen blockieren Proxy umgehen App angehalten Lockdown-Proxy privaten DNS-Server, der nicht existiert.]]> - Quellanwendung die Regeln für Proxy umgehen festgelegt sind.

Um dies zu ändern, gehe zum Bildschirm Anwendungsspezifische Firewall.]]> + Quellanwendung die Regeln für Proxy umgehen festgelegt sind.

Um dies zu ändern, gehen Sie zum Bildschirm Anwendungsspezifische Firewall.]]> App im Pausiert-Status ist.]]> - Sperrmodus befindet.

Um dies zu ändern, gehe zum Bildschirm WireGuard.]]> + Lockdown-Modus ist.

Um dies zu ändern, wechseln Sie zum WireGuard-Bildschirm.]]> \"WireGuard Relais\" kann nicht deaktiviert werden Ungültige WireGuard-Konfiguration App Protokolle @@ -1148,8 +1153,8 @@ Relay hinzufügen / entfernen Nutzungsbedingungen Erreichbarkeitsprüfungen umgehen alle Netzwerkbeschränkungen. Im Auto-Modus verwendet Rethink zufällig zuvor verbundene IPs und Hostnamen. - meist kontaktierte Anbieter - meist blockierte Anbieter + Meistkontaktierten Anbieter + Meist blockierte Anbieter Paketnamen eingeben (kommagetrennt), die Rethink starten oder stoppen dürfen. Anleitung:\nErforderliche Extras in der Broadcast-Nachricht:\n • Schlüssel: sender\n • Wert: Der Paketname der aufrufenden App\n\n Beispiel: key:sender value:com.termux\n\n Unterstützte Aktionen:\n • VPN starten – com.celzero.bravedns.intent.action.VPN_START\n • VPN stoppen – com.celzero.bravedns.intent.action.VPN_STOP Paketnamen eingeben (Beispiel: net.dinglisch.android.taskerm) @@ -1169,7 +1174,7 @@ Smart DNS Verarbeitung Bitte warte, während wir die Anfrage bearbeiten. - Smart DNS verwendet nach dem Zufallsprinzip einen dieser DNS-Resolver: + Smart DNS verwendet zufällig einen der folgenden DNS-Resolver: Alle Domain-Regeln löschen? Das Löschen dieser Regeln würde es jeder Anwendung gestatten, sich mit den aktuell blockierten Domains zu verbinden. Reagiert auf wichtige Netzwerk- und Verbindungsänderungen. @@ -1202,8 +1207,8 @@ Standort aktivieren %1$s und %2$s können nicht gleichzeitig verwendet werden WLAN-Kennung eingeben (%1$s) - Exakte Übereinstimmung - Teilweise Übereinstimmung + Genau + Teilweise Wi-Fi-Kennungen (%1$s) dürfen maximal 32 Zeichen lang sein. %1$s löschen? Stabilitätsprogramm @@ -1215,11 +1220,10 @@ Wenn aktiviert, werden eingehende Verbindungen von WireGuard-Peers zugelassen. Proxy nicht ausgewählt wurde.

Um dies zu ändern, gehe auf dem Bildschirm Konfigurieren zu Proxy.]]> %1$s dieses WireGuard-VPN, wenn aktiv WLAN-Kennung (%2$s) %3$s. - Der in Android integrierte Download-Manager funktioniert möglicherweise nicht, da sich das VPN im Sperrmodus befindet. Möchtest du stattdessen den Downloader von Rethink aktivieren? + Der in Android integrierte Download-Manager funktioniert möglicherweise nicht, da sich das VPN im Lockdown-Modus befindet. Möchtest du stattdessen den Downloader von Rethink aktivieren? Downloader aktivieren Verwendet Jumbo-Pakete innerhalb des VPN-Tunnels von Rethink. Immer getaktet Markiere den VPN-Tunnel als getaktet, um Apps anzuweisen, weniger Daten zu verbrauchen. Achtung: Dies kann dazu führen, dass Apps große Uploads und Downloads, wie z. B. Backups, unterbrechen. Für das Stabilitätsprogramm für experimentelle Funktionen angemeldet. - Automatisch (Alle Arten) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index bb1efe5ad..dccc89e23 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -118,7 +118,7 @@ προστατεύεται με wireguard & private dns το private dns είναι ενεργοποιημένο δεν προστατεύεται - Συνδέθηκε με το RethinkDNS + Συνδέθηκε με το Re-RethinkDNS Συνδέθηκε με τείχος προστασίας Συνδέθηκε στο RethinkDNS και το Firewall Εφαρμόστε κανόνες τείχους προστασίας σε όλες τις εφαρμογές βάσει συμβάντων της συσκευής, για παράδειγμα, τείχος προστασίας όταν η συσκευή είναι κλειδωμένη ή όταν μια συγκεκριμένη εφαρμογή δεν χρησιμοποιείται. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 10f87c87c..f43f28192 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,14 +1,14 @@ - RethinkDNS + Re-Rethink rethink ¿Bloquear las conexiones en la red sin límites (WiFi) para las aplicaciones en la lista\? ❔ Sin nombre (%1$s) La exclusión de %1$s para %2$s en modo de bloqueo puede causar problemas de conectividad a Internet. - No se puede cambiar de modo cuando la VPN está en bloqueo. Pulse para <u>editar los ajustes de la VPN</u>. + No se puede cambiar de modo cuando la VPN está en bloqueo. Pulse para editar los ajustes de la VPN. Aislamiento - UDP.

Para cambiarla, vaya a la pestaña Universal.]]> + Una regla del cortafuegos activada por el usuario bloqueó esta conexión UDP.

Para cambiarla, vaya a la pestaña Universal. IP omitida https://www.rethinkdns.com/ https://docs.rethinkdns.com/ @@ -112,7 +112,7 @@ Rethink es la forma más sencilla de supervisar la actividad de las aplicaciones, eludir la censura en Internet y utilizar cortafuegos en su dispositivo Android. No se han podido obtener los registros de fallos. ¿Quiere informar manualmente de su error\? Normativa de privacidad - contacto + Contacto Autores Rethink utiliza el servicio de accesibilidad para detectar y bloquear aplicaciones en segundo plano. Rethink no recopila ni vende ninguna información. Finalizar @@ -141,7 +141,7 @@ protegido con proxy el dns privado está activado no protegido - Conectado a RethinkDNS + Conectado a Re-RethinkDNS Conectado a RethinkDNS y al cortafuegos Conectado al cortafuegos Aplique reglas de cortafuegos en todas las aplicaciones en función de los eventos del dispositivo, p.ej., bloqueándolas cuando el dispositivo está bloqueado o cuando una determinada aplicación no está en uso. @@ -190,7 +190,7 @@ Las normas aplicadas para %1$s también serán aplicables para %2$s u otras aplicaciones Atrás Borrar registros - ]]> + \u0020]]> \u0020 +%1$s Otras IPs Sin respuesta resuelto de forma anónima %1$s por %2$s a través de %3$s @@ -241,13 +241,13 @@ Bloquear en redes con límites Permitir en redes con límites ¿Permitir las conexiones en la red con límites (móvil) para las aplicaciones en la lista\? - %1$s %2$s aplicaciones]]> - %1$s %2$s aplicaciones en las categorías: %3$s]]> + Mostrando aplicaciones %1$s %2$s + Mostrando aplicaciones %1$s %2$s en las categorías: %3$s ❌ ⚠ Nota No se han encontrado reglas de cortafuegos - recargar + Recargar Desconocido Error conectando al servidor DNSCrypt. Error conectando al servidor proxy DNS. @@ -284,14 +284,14 @@ HTTP inseguro Bloqueo Ninguna regla del cortafuegos coincide con esta conexión. - .

Para cambiarla, vaya a la pestaña Todas las aplicaciones.]]> - primera vez.

Para cambiar vaya a la pestaña Universal.]]> - aplicación al intentar conectarse a la red Sin límites.

Para cambiarla, vaya a la pestaña Todas las aplicaciones.]]> - aplicación al intentar conectarse a la red Con límites.

Para cambiarla, vaya a la pestaña Todas las aplicaciones.]]> - aplicación que está conectando a otras IPs omitidas.

Para cambiarla, vaya a la pestaña Todas las aplicaciones.]]> - IP destino .

Para cambiarla vaya a la pantalla Cortafuegos específico de la aplicación.]]> - no esta en primer plano.

Para cambiar este comportamiento vaya a la pestaña Universal.]]> - aplicación de origen.

Para cambiar este comportamiento, vaya a la pestaña Universal.]]> + Una regla del cortafuegos activada por el usuario ha bloqueado esta aplicación .

Para cambiarla, vaya a la pestaña Todas las aplicaciones. + Esta aplicación hizo la conexión la primera vez.

Para cambiar vaya a la pestaña Universal. + Una regla del cortafuegos activada por el usuario ha bloqueado esta aplicación al intentar conectarse a la red Sin límites.

Para cambiarla, vaya a la pestaña Todas las aplicaciones. + Una regla del cortafuegos activada por el usuario ha bloqueado esta aplicación al intentar conectarse a la red Con límites.

Para cambiarla, vaya a la pestaña Todas las aplicaciones. + Una regla del cortafuegos activada por el usuario ha bloqueado esta aplicación que está conectando a otras IPs omitidas.

Para cambiarla, vaya a la pestaña Todas las aplicaciones. + Una regla del cortafuegos activada por el usuario ha bloqueado la IP destino .

Para cambiarla vaya a la pantalla Cortafuegos específico de la aplicación. + Esta conexión estaba bloqueada porque la aplicación de origen no esta en primer plano.

Para cambiar este comportamiento vaya a la pestaña Universal. + Esta conexión fue bloqueada porque no se pudo determinar la aplicación de origen.

Para cambiar este comportamiento, vaya a la pestaña Universal. Rethink bloqueó %1$s nuevas aplicaciones. Pulse para ver o modificar. Rethink bloqueó la aplicación recientemente instalada, %1$s. VPN inactiva @@ -315,17 +315,17 @@ Ninguna regla B Ninguna regla - No hay registros de red para esta categoría. + No hay registros de red para esta aplicación. se permite está bloqueado se bloquea en las redes sin límites (wifi) - %1$s .]]> + Esta aplicación %1$s . Conectado a %1$s dirección(es) IP 0 Dirección IP se bloquea en las redes con límites (móvil) omitirá las reglas del cortafuegos universal se excluye del dns y cortafuegos - está aislada; sólo se permiten IPs y dominios de confianza + está aislada; sólo se permiten IPs de confianza es desconocido Aislamiento Configuración DNS @@ -341,11 +341,11 @@ Actualización disponible Seleccionadas Mostrando todas las listas de bloqueo - %1$s]]> + Mostrando listas de bloqueo %1$s Descargue las listas de bloqueo (alrededor de 60MB) para utilizar esta función. ⛅ Sky 🪂 Max - %1$s listas de bloqueo en el grupo: %2$s y el subgrupo: %3$s]]> + Mostrando %1$s listas de bloques en el grupo: %2$s y el subgrupo: %3$s Limpiar DNSCrypt Proxy DNS @@ -359,12 +359,12 @@ Configurar más de 195 listas de bloqueo Restaurar Restaurar desde un archivo de copia de seguridad - Copia de seguridad de la configuración de la aplicación, red y registros DNS + Copia de seguridad de la configuración de la aplicación, la red y los registros DNS Hacer un respaldo Realiza una copia de seguridad de la configuración de la aplicación, la red y los registros DNS en un archivo. Esto reiniciará la VPN. - Copia de seguridad + Respaldo Restaurar copia de seguridad - Restaurar la configuración de la aplicación, red y registros DNS desde un archivo de copia de seguridad. Esto reiniciará la aplicación. + Restaurar la configuración de la aplicación, la red y los registros DNS desde un archivo de copia de seguridad. Esto reiniciará la aplicación. Falló la copia de respaldo No se ha podido realizar la copia de seguridad. ¿Intentar de nuevo\? Reintentar la copia de seguridad @@ -374,7 +374,7 @@ Copia de seguridad completa Apariencia Reenvía las conexiones al punto de acceso SOCKS5. - sistema + Sistema Novedades en %1$s Autores Obtener los iconos del sitio web nextdns.io y duckduckgo.com. Consume hasta 350 mb de espacio en disco @@ -411,7 +411,7 @@ DNS (ahorro de batería) DNS VPN - vpn + VPN Dirección IP copiada. URL copiada Copiada URL como RDNS+ DNS-sobre-HTTPS @@ -455,11 +455,12 @@ Proxy activo Activar RDNS+ Proxy eliminado + Parando… Cerrando… Activando… Tema: %1$s No se puede pausar: Rethink no está activo - tipo + Tipo Otros DNS La exclusión no es posible en el modo bloqueo de VPN Mostrar el icono del sitio web en los registros de DNS (en pruebas) @@ -472,14 +473,14 @@ Informe de errores Enviar correo electrónico Enviar correo electrónico - enlaces + Enlaces Visite rethinkdns.com Contribuir en GitHub Leer documentación Patrocinadores Envíenos un correo electrónico Configuración de notificaciones - Rethink cuenta con el apoyo de Mozilla Builders, FOSS United Foundation y FLOSS/fund. + Rethink cuenta con el apoyo de Mozilla Builders, FOSS United Foundation, OSOM Products Inc. Buscar actualizaciones de la aplicación Traducir Vamos @@ -517,14 +518,14 @@ Tor-como-un-proxy Sin límites (WiFi) Con límites (Universal) - aplicación al intentar conectarse a la red Con límites (Móvil).

Para cambiarla, vaya a la pestaña Universal.]]> + Una regla del cortafuegos universal activada por el usuario ha bloqueado esta aplicación al intentar conectarse a la red Con límites (Móvil).

Para cambiarla, vaya a la pestaña Universal. Aplicación bloqueada IP Confiable - IP destino está configurada como IP de confianza.

Para cambiarla, vaya a la pantalla del Cortafuegos específico de la aplicación..]]> + Esta conexión fue permitida porque la IP destino está configurada como IP de confianza.

Para cambiarla, vaya a la pantalla del Cortafuegos específico de la aplicación.. IP / Puerto (Universal) - IP destino / Puerto.

Para cambiarla vaya a la pestaña Universal.]]> - Tor-como-un-proxy en un clic a través de Orbot estaba en curso.]]> -
Para cambiarlo vaya a la pestaña Universal.]]> + Una regla del cortafuegos activada por el usuario ha bloqueado la IP destino / Puerto.

Para cambiarla vaya a la pestaña Universal. + Esta conexión fue permitida porque la configuración Tor-como-un-proxy en un clic a través de Orbot estaba en curso. + Esta conexión fue bloqueada porque el bloqueo universal está configurado.

Para cambiarlo vaya a la pestaña Universal. Conexión de red permitida para la aplicación Alertas de cortafuegos Alertas de proxy @@ -600,7 +601,7 @@ Conectado. %1$s listas de bloqueo en uso Pausar / Detener (por defecto) Proxy DNS - reglas + Reglas Seguir bloqueando Atención Proxy DNS personalizado @@ -610,8 +611,8 @@ bloqueadas Activar el modo cortafuegos. Ver preguntas frecuentes - %1$s: %2$s lista(s) de bloqueo%3$s.

]]> - aplicación + \u0020%1$s: %2$s lista(s) de bloqueo%3$s.

]]> \u0020 + Aplicación El registro de solicitudes DNS ha sido desactivado. Para volver a activarlo, vaya a Ajustes y habilite Activar el registro en el dispositivo. Reenviando %1$s a Orbot, Proxy HTTP también configurado. Aplicación @@ -711,7 +712,7 @@ bloqueado %1$s por %2$s bloqueado %1$s en el dispositivo Bloquear, confiar en esta IP para esta aplicación - #1: Bloquea una aplicación para que no se conecte a Internet. \n #2: Bloquea cualquier aplicación para que no se conecte a una IP concreta.\n #3: Bloquea todas las conexiones cuando el dispositivo está bloqueado (Cortafuegos Universal).\n #4: Bloquea cualquier aplicación que no esté en uso (Cortafuegos Universal).\n #5: Bloquea las conexiones cuando la aplicación de origen es desconocida (Cortafuegos Universal).\n #6: Bloquea todo el tráfico UDP excepto DNS (Cortafuegos Universal).\n #7: Bloquea las conexiones cuando se omite el DNS (Cortafuegos Universal). + #1: Bloquea una aplicación para que no se conecte a Internet. \n #2: Bloquea cualquier aplicación para que no se conecte a una IP concreta. \n #3: Bloquea todas las conexiones cuando el dispositivo está bloqueado (Cortafuegos Universal). \n #4: Bloquea cualquier aplicación que no esté en uso (Cortafuegos Universal). \n #5: Bloquea las conexiones cuando la aplicación de origen es desconocida (Cortafuegos Universal). \n #6: Bloquea todo el tráfico UDP excepto DNS (Cortafuegos Universal). \n #7: Bloquea las conexiones cuando se omite el DNS (Cortafuegos Universal). permitido en %1$s %2$s bloqueado en %1$s %2$s La \"VPN siempre activa\" está activada en este dispositivo. Para iniciar Rethink, dirígete a los Ajustes de la aplicación y desactiva \"VPN siempre activa\". @@ -728,81 +729,14 @@ Borra el Proxy DNS de la configuración guardada. Una nueva versión de la aplicación está disponible para su descarga en el sitio web. ¿Quiere continuar\? O bien nuestros servidores están caídos o no se ha podido establecer la conexión. Por favor, inténtelo de nuevo mas tarde. - Proyecto de Código Abierto Rethink debe su existencia a estos voluntarios que dedican incontables horas a su desarrollo.
-
🛡️ Aplicación Android
- Anthony Ryan / - BayLee4 / - Ch4t4r / - CodingAttack / - HrBDev / - hussainmohd-a / - ignoramous / - ironveil / - markwmuller / - Mohammaduvez / - Mygod / - Poussinou / - pjosingh / - RohitSurwase / - Shantanu / - Uldiniad
/ - yurtpage
-
🚂 Motor de red
- alalamav / - bemasc / - dmcardle / - fortuna / - ignoramous / - PeterDaveHello / - santhosh-ponnusamy / - SeanBurford
-
📚 Resolver
- ahmed-tasaly / - amithm7 / - arfshl / - badmojr / - bongochong / - elliotwutingfeng / - georgyo / - GiddyGoatGaming / - Harish-Narayan / - ignoramous / - JakeChampion / - MasterKia / - mtxadmin / - neneeen / - PeterDaveHello / - santhosh-ponnusamy / - shruuub / - shuvashish76
-
⚜ Mods de la comunidad
- amithm7 / - Andersen / - ppatra / - InFamous23 / - TheTr1ckst3r / - Ch4t4r / - Billi_ance / - kaliangel / - PoneyClairDeLune
-
📌 Geo-IP
- db-ip.com / IPinfo Lite
-
❇ Traducciones
- Weblate
-
🦆 Iconos
- Icons
-
📦 Servidores de compilación
- JitPack / - GitHub / - Sonatype
- ]]> + El <i>Proyecto de Código Abierto Rethink</i> debe su existencia a estos voluntarios que dedican incontables horas a su desarrollo.<br/> <br/>🛡️ Aplicación Android <br/> <a href=https://github.com/BayLee4>BayLee4</a><br/> <a href=https://github.com/Ch4t4r>Ch4t4r</a><br/> <a href=https://github.com/HrBDev>HrBDev</a><br/> <a href=https://github.com/hussainmohd-a>hussainmohd-a</a><br/> <a href=https://github.com/ignoramous>ignoramous</a><br/> <a href=https://github.com/markwmuller>markwmuller</a><br/> <a href=https://github.com/Mygod>Mygod</a><br/> <a href=https://github.com/Uldiniad>Uldiniad</a><br/> <a href=https://github.com/Poussinou>Poussinou</a><br/> <a href=https://github.com/pjosingh>pjosingh</a><br/> <br/>🚂 Motor de red <br/> <a href=https://github.com/alalamav>alalamav</a><br/> <a href=https://github.com/bemasc>bemasc</a><br/> <a href=https://github.com/dmcardle>dmcardle</a><br/> <a href=https://github.com/fortuna>fortuna</a><br/> <a href=https://github.com/ignoramous>ignoramous</a><br/> <a href=https://github.com/Lanius-collaris>Lanius-collaris</a><br/> <a href=https://github.com/PeterDaveHello>PeterDaveHello</a><br/> <a href=https://github.com/santhosh-ponnusamy>santhosh-ponnusamy</a><br/> <a href=https://github.com/SeanBurford>SeanBurford</a><br/> <br/>📚 Resolvedor <br/> <a href=https://github.com/ahmed-tasaly>ahmed-tasaly</a><br/> <a href=https://github.com/amithm7>amithm7</a><br/> <a href=https://github.com/arfshl>arfshl</a><br/> <a href=https://github.com/badmojr>badmojr</a><br/> <a href=https://github.com/bongochong>bongochong</a><br/> <a href=https://github.com/elliotwutingfeng>elliotwutingfeng</a><br/> <a href=https://github.com/georgyo>georgyo</a><br/> <a href=https://github.com/GiddyGoatGaming>GiddyGoatGaming</a><br/> <a href=https://github.com/Harish-Narayan>Harish-Narayan</a><br/> <a href=https://github.com/ignoramous>ignoramous</a><br/> <a href=https://github.com/JakeChampion>JakeChampion</a><br/> <a href=https://github.com/MasterKia>MasterKia</a><br/> <a href=https://github.com/mtxadmin>mtxadmin</a><br/> <a href=https://github.com/neneeen>neneeen</a><br/> <a href=https://github.com/PeterDaveHello>PeterDaveHello</a><br/> <a href=https://github.com/santhosh-ponnusamy>santhosh-ponnusamy</a><br/> <a href=https://github.com/shruuub>shruuub</a><br/> <a href=https://github.com/shuvashish76>shuvashish76</a><br/> <br/>⚜ Mods comunitarios <br/> <a href=https://t.me/amithm7>amithm7</a><br/> <a href=https://t.me/TronSlayer>Andersen</a><br/> <a href=https://t.me/ppatra>ppatra</a><br/> <a href=https://t.me/InFamous23>InFamous23</a><br/> <a href=https://t.me/TheTr1ckst3r>TheTr1ckst3r</a><br/> <a href=https://t.me/Ch4t4r>Ch4t4r</a><br/> <a href=https://t.me/Billi_ance>Billi_ance</a><br/> <a href=https://t.me/kaliangel>kaliangel</a><br/> <a href=https://github.com/PoneyClairDeLune>PoneyClairDeLune</a><br/> <br/>📌 Geoposicionamiento IP <br/> <a href=https://db-ip.com>db-ip.com</a><br/> <br/>❇ Traducciones <br/> <a href=https://weblate.org/en/>Weblate</a><br/> <br/>🦆 Iconos <br/> <a href=https://github.com/celzero/rethink-app/issues/346>Icons</a><br/> <br/>📦 Compilar servidores <br/> <a href=https://jitpack.io/>JitPack</a><br/> <a href=https://github.com/>GitHub</a><br/> Bloquea las aplicaciones para que no se conecten a Internet. Limitando el acceso a Internet se evita el uso de datos injustificado y se ahorra batería. - dispositivo estaba bloqueado en ese momento.

Para cambiar este comportamiento vaya a la pestaña Universal.]]> - IP destino está configurada para omitir todas las reglas del cortafuegos universal.

Para cambiarla vaya a Reglas IP en la pestaña Universal.]]> - aplicación de origen omitió el DNS preferido por el usuario.

Para cambiar este comportamiento, vaya a la pestaña Universal.]]> -
Para cambiarlo desactive Prevenir las fugas DNS desde la pantalla Configurar DNS.]]> - aplicación de origen está configurada para omitir las reglas del cortafuegos universal.

Para cambiarlo, vaya a la pantalla Cortafuegos específico de la aplicación.]]> - HTTP inseguro.

Para cambiarlo vaya a la pestaña Universal.]]> + Esta conexión estaba bloqueada porque el dispositivo estaba bloqueado en ese momento.

Para cambiar este comportamiento vaya a la pestaña Universal. + Esta conexión se ha permitido porque la IP destino está configurada para omitir todas las reglas del cortafuegos universal.

Para cambiarla vaya a Reglas IP en la pestaña Universal. + Esta conexión se bloqueó porque la aplicación de origen omitió el DNS preferido por el usuario.

Para cambiar este comportamiento, vaya a la pestaña Universal. + Esta conexión DNS fue desviada y reenviada al punto de acceso DNS preferido por el usuario.

Para cambiarlo desactive Prevenir las fugas DNS desde la pantalla Configurar DNS. + Esta conexión se ha permitido porque la aplicación de origen está configurada para omitir las reglas del cortafuegos universal.

Para cambiarlo, vaya a la pantalla Cortafuegos específico de la aplicación. + Esta conexión fue bloqueada porque probablemente utilizó HTTP inseguro.

Para cambiarlo vaya a la pestaña Universal. Permitir (omitir) o bloquear la dirección IP, la subred (rango) IP, el puerto. P.ej.: 10.10.10.10, 10.1.1.*, 10.2.2/24, ffff::/104, [::]:80, [10.1.0.0/16]:80, *.*:80 Estadísticas Cambiar idioma @@ -819,9 +753,9 @@ Aislamiento de aplicaciones ¿Excluir las aplicaciones en la lista del DNS y Firewall\? Confiar - aplicaciones más permitidas - aplicaciones más bloqueadas - dominios más contactados + Aplicaciones más permitidas + Aplicaciones más bloqueadas + Dominios más contactados IPs más contactadas Iniciar Rethink para continuar Mostrar todo @@ -831,7 +765,7 @@ Utilice la autenticación biométrica para desbloquear Rethink Permitir aplicaciones Excluir aplicaciones - dominios más bloqueados + Dominios más bloqueados Omite las reglas del cortafuegos universal. ¿Omitir las reglas del cortafuegos universal para las aplicaciones de la lista\? Permitir/Bloquear en red sin límites (WiFi). @@ -851,12 +785,12 @@ Cancelar Bloqueadas Dominio de confianza (App) - dominio.

Para cambiarla, vaya a la pantalla Cortafuegos específico de la aplicación.]]> + Una regla de cortafuegos establecida por el usuario bloqueaba el dominio.

Para cambiarla, vaya a la pantalla Cortafuegos específico de la aplicación. Bloquear, confiar en este dominio - dominio está configurado como Dominio de confianza.

Para cambiarlo, vaya a la pantalla Cortafuegos específico de la aplicación.]]> + Esta conexión se permitió porque el dominio está configurado como Dominio de confianza.

Para cambiarlo, vaya a la pantalla Cortafuegos específico de la aplicación. No hay reglas de dominio. Dominio (App) - reglas + Reglas Configurar omitir dns y cortafuegos personalizar @@ -870,7 +804,7 @@ Asignar una IP única por solicitud DNS. DNS bloqueado Dominio (Univ) - aplicación de origen está configurada para omitir las reglas de dns y cortafuegos.

Para cambiar, vaya a la pantalla Cortafuegos específico de la aplicación.]]> + Se permitió esta conexión porque la aplicación de origen está configurada para omitir las reglas de dns y cortafuegos.

Para cambiar, vaya a la pantalla Cortafuegos específico de la aplicación. registros Bloquear, confiar en dominio(s) para esta aplicación Elegir DNS alternativo @@ -886,9 +820,9 @@ Filtrado DNS avanzado (experimental) Omitir las reglas universales de DNS y cortafuegos para las aplicaciones de la lista\? Dominio de confianza (Univ) - dominio está bloqueado por el DNS preferido del usuario.

Para cambiar este comportamiento, vaya a la pestaña Configurar DNS.]]> - dominio está configurado como confiable en las reglas de dominio universal.

Para cambiar este comportamiento, vaya a la pestaña Configurar DNS.]]> - dominio está configurado como bloqueado en las reglas de dominio universal.

Para cambiar este comportamiento, vaya a la pestaña Configurar DNS.]]> + Esta conexión se bloqueó porque el dominio está bloqueado por el DNS preferido del usuario.

Para cambiar este comportamiento, vaya a la pestaña Configurar DNS. + Esta conexión se permitió porque el dominio está configurado como confiable en las reglas de dominio universal.

Para cambiar este comportamiento, vaya a la pestaña Configurar DNS. + Esta conexión se bloqueó porque el dominio está configurado como bloqueado en las reglas de dominio universal.

Para cambiar este comportamiento, vaya a la pestaña Configurar DNS. omitirá las reglas universales de dns y cortafuegos Cortafuegos Omitir DNS y cortafuegos @@ -942,7 +876,7 @@ protegido con wireguard protegido con wireguard y dns privado Clave pública copiada. - Orbot es una aplicación proxy gratuita que permite a otras aplicaciones utilizar Internet de forma más segura.\nOrbot utiliza Tor para cifrar su tráfico de Internet, lo que le ayuda a evitar la censura y a defenderse de formas de vigilancia en la red que amenazan la libertad personal y la privacidad. \nProxy TCP: Rethink reenvía a Orbot solo las conexiones TCP de las aplicaciones incluidas.\nProxy HTTP: Rethink establece un túnel HTTP CONNECT hacia Orbot y reenvía solo las conexiones TCP de las aplicaciones incluidas. + Orbot es una aplicación proxy gratuita que permite a otras aplicaciones utilizar Internet de forma más segura. \nOrbot utiliza Tor para cifrar su tráfico de Internet, lo que le ayuda a evitar la censura y defenderse de las formas de vigilancia de la red que amenazan la libertad personal y la privacidad. \nProxy TCP: Rethink reenvía a Orbot sólo las conexiones TCP de las aplicaciones incluidas. \nProxy HTTP: Rethink establece un túnel de CONEXIÓN HTTP a Orbot y reenvía solo las conexiones TCP de las aplicaciones incluidas. Escuchar el puerto Mostrar los primeros 20.000 caracteres No validar los certificados TLS del servidor (habilitar sólo si sabes lo que está haciendo) @@ -952,7 +886,7 @@ Reglas IP/Dominio por aplicación Modificar las reglas IP / Dominio por aplicación. Omitir las reglas DNS y el cortafuegos. - países más bloqueados + Países más bloqueados Clave no válida Número no válido Valor no válido @@ -966,8 +900,8 @@ Longitud de clave incorrecta Direcciones IP Eliminadas todas las reglas de dominio -
Para cambiarlo vaya a Proxy en la pantalla Configurar.]]> - países más contactados + Esta conexión se ha desviado al proxy preferido por el usuario.

Para cambiarlo vaya a Proxy en la pantalla Configurar. + Países más contactados Por proxy número : Debe ser positivo y no más de 65535 @@ -1016,7 +950,7 @@ Relé DNS anónimo alojado en París, Francia, proporcionado por https://cryptostrom.is/. Relé DNS anónimo alojado en los Países Bajos WireGuard VPN no se conecta - DNS se reenvía a %1$s. + DNS se reenvía a %1$s, ICMP (ej: ping) se envía a la red subyacente. No bloquear ninguna petición DNS. Utiliza el punto final de la DNS 1.1.1.1 de Cloudflare. Relé DNS anónimo alojado en Suecia proporcionado por https://cryptostrom.is/. Relé DNS anónimo alojado en EE.UU. - Los Ángeles, CA proporcionado por https://cryptostrom.is/. @@ -1053,6 +987,8 @@ Enrutar todas las aplicaciones Siempre activo Enrutamiento de las aplicaciones restantes + Bucle invertido (experimental) + También activa el ajuste de %1$s. ¿Quiere proceder? Excluye %1$s aplicaciones Detener WireGuard Aplicaciones restantes @@ -1062,9 +998,9 @@ parte de %1$s incluye %1$s aplicaciones Inactivo - Dividir + Dividir (Split) ¡Protegido! Conectado a DNS + Firewall + Proxy. - Nunca usar proxy para DNS + Nunca un proxy DNS No utilice DNS a través de servidores proxy WireGuard siempre activo, SOCKS5 o HTTP. %1$s está deshabilitado porque los servidores proxy están activos en el dispositivo @@ -1073,10 +1009,10 @@ No seleccionado %1$s puede provocar la pérdida de conectividad. Cambia la configuración para permitir que Rethink utilice datos y otros recursos cuando esté en segundo plano. Optimización de la batería - Desactivar %1$s - Aplicaciones reenviadoras de proxy en loopback - Si se desactiva, excluye las aplicaciones reenviadoras de proxy (SOCKS5, HTTP, DNS) del túnel VPN de Rethink. - Excluir la aplicación de todos los proxies + Deshabilitar %1$s + Aplicaciones de reenvío proxy en bucle invertido + Si se desactiva, excluye las aplicaciones proxy (SOCKS5, HTTP, DNS) del túnel VPN de Rethink. + Omitir la aplicación desde todos los proxies Esta aplicación evita los servidores proxy notification Rethink tiene poca memoria. Las acciones del sistema pueden estar limitadas. @@ -1096,7 +1032,7 @@ Autenticación Biométrica Después de 5 minutos Después de 15 minutos - filtrando + Filtrando ¿Eliminar todas las Reglas de Dominio? DNS Privado Aplicación Pausada @@ -1112,8 +1048,8 @@ ultra seguro Para actualizar las listas de bloqueo, descarga la última versión de la app. Términos de Servicio - proveedores más contactados - proveedores más bloqueados + Proveedores más contactados + Proveedores más bloqueados Mostrar información del proveedor Automatización Configurar aplicaciones que pueden iniciar o detener Rethink. @@ -1129,7 +1065,7 @@ Considera solo las redes móviles como medidas, el resto como no medidas. Ninguna Usar el DNS del sistema para dominios no delegados - Instrucciones:\n Al enviar el broadcast es requerido:\n • Key: sender\n • Value: Nombre del paquete de la app\n\n Ejemplo: key:sender value:com.termux\n\n Acciones disponibles:\n • Iniciar VPN – com.celzero.bravedns.intent.action.VPN_START\n • Detener VPN – com.celzero.bravedns.intent.action.VPN_STOP + Instrucciones:\nAl enviar el broadcast es requerido:\n• Key: sender\n• Value: Nombre del paquete de la app.\n\nEjemplo: key:sender value:com.termux\n\nAcciones disponibles:\n\n• Iniciar VPN – com.celzero.bravedns.intent.action.VPN_START\n\n• Detener VPN – com.celzero.bravedns.intent.action.VPN_STOP Introduce los nombres de paquete (separado por comas) se les permite iniciar o detener Rethink. Sin estadísticas Tiempo de espera inactivo @@ -1139,103 +1075,4 @@ Conectar Parámetro Alternativa - Relés - Claro Plus - Oscuro Plus - Escarcha - Has estado usando Rethink durante %1$s días, lo que equivale a un coste de uso de $%2$s. ¿Considerarías hacer una aportación para ayudar a mantener su desarrollo? - Usar el DNS del sistema para dominios no delegados como .lan, .internal, etc. - DNS dividido (experimental) - Reenviar las consultas DNS de las aplicaciones proxificadas a los servidores DNS del proxy. - Automático (Todos los tipos) - Bloquear todas las conexiones al host local - Eliminar estas reglas permitiría que cualquier aplicación se conecte a los dominios que están bloqueados actualmente. - Omitir proxy - Proxy en modo bloqueo - Error de proxy - DNS privado que no existe.]]> - aplicación de origen está configurada paraomitir las reglas del proxy.

Para cambiarlo vaya a la pantallaCortafuegos específico de la aplicación.]]> - aplicación está en estadopausado.]]> - bloqueo.

Para cambiarlo vaya a la pantallaWireGuard.]]> - proxy seleccionado para la aplicación no está elegido.

Para cambiarlo vaya aProxy desde la pantallaConfigurar.]]> - \"Relay WireGuard\" no se puede desactivar - Registros de la aplicación - No aleatorizar el puerto de escucha de WireGuard - Mantener fijos los puertos de escucha de WireGuard (sin aleatorización) en el modo Avanzado. - Mapeo independiente del extremo - Cuando está activado, los sockets UDP mantienen una dirección y un puerto fijos para todos los destinos. - Elija entre varias técnicas anticensura. - Keep-alive TCP más corto - Cerrar rápidamente los sockets TCP sin actividad reciente. - No alterar los paquetes. - Alterar los paquetes según sea necesario. - Alterar los paquetes TCP. - TCP/TLS - Alterar los paquetes TCP o TLS. - Desincronización - Enviar paquetes señuelo según sea necesario. - Configurar cómo funcionan los reintentos en conexiones censuradas. - En caso de fallo, no volver a intentar técnicas anticensura. - Aplicar técnicas anticensura cuando sea necesario. - Elija cualquier opción anticensura para seleccionar una estrategia. - Excluir aplicaciones requiere un nombre de paquete. - No se puede retransmitir, ya está %1$s - No hay WireGuard disponible para retransmitir; añada más. - Desactive “Solo móvil” o la opción SSID para usar retransmisiones - No se pueden cambiar los modos cuando hay proxies en uso. Toque para editar la configuración del proxy. - Cerrar los sockets TCP y UDP inactivos después de esta duración. - Error de retransmisión: %1$s -> %2$s - Solo móvil - Usar esta VPN WireGuard sobre datos móviles. - Añadir / eliminar retransmisión - Las comprobaciones de alcance omiten todas las restricciones de red. En modo Auto, Rethink usa aleatoriamente IPs y nombres de host conectados previamente. - Introduzca el nombre del paquete (ejemplo: net.dinglisch.android.taskerm) - Obtiene detalles del proveedor de servicios para sitios web desde rethinkdns.com, con tecnología de%1$s - principales conexiones activas - Cargar todo - ¿Eliminar las listas de bloqueo en el dispositivo? - Detenerse ante pérdida de red - Cuando está activado, Rethink detiene todos los datos cuando no hay conectividad, como en el modo avión. - Cerrar todo - Espere mientras procesamos su solicitud. - Smart DNS usa aleatoriamente cualquiera de estos resolutores DNS: - El modo Solo móvil no es compatible con las retransmisiones - Reacciona a cambios importantes de red y conectividad. - Sensible - Reacciona a todos los cambios de red y conectividad. - Reacciona a cambios de conectividad relevantes. - Conservador - Reacciona mínimamente a los cambios de red. - Política de cambios de conexión - Usar DNS de respaldo como bypass - Cuando está activado, siempre usa el DNS de respaldo para aplicaciones, dominios e IPs excluidos. - Base de datos - Solo Wi‑Fi - Activar esta VPN WireGuard solo cuando esté conectado a Wi‑Fi o a los identificadores Wi‑Fi especificados (%1$s). - Rethink necesita permiso de ubicación para acceder a los identificadores Wi‑Fi (%1$s). - Para acceder a los identificadores Wi‑Fi (%1$s), active el servicio de ubicación. - Active el servicio de ubicación - Conceder permiso - Activar ubicación - No se pueden usar %1$s y %2$s a la vez - %1$s esta VPN WireGuard cuando esté activo el identificador Wi‑Fi (%2$s)%3$s. - Introduzca el identificador Wi‑Fi (%1$s) - Coincidencia exacta - Coincidencia parcial - Los identificadores Wi‑Fi (%1$s) deben tener 32 caracteres o menos. - ¿Eliminar %1$s? - Programa de estabilidad - Capturar registros de errores para ayudar a mejorar la estabilidad. - Recordar aplicaciones desinstaladas - Cuando está activado, conserva las reglas de la aplicación durante 7 días. - Predeterminado del sistema - WireGuard P2P - Cuando está activado, permite conexiones entrantes iniciadas por pares de WireGuard. - El Gestor de descargas integrado de Android puede fallar porque la VPN está en modoBloqueo. ¿Activar en su lugar el descargador de Rethink? - Activar descargador - Impulsor de ancho de banda - Usa paquetes jumbo dentro del túnel VPN de Rethink. - Siempre medido - Marcar el túnel VPN de Rethink como medido para indicar a las aplicaciones que consuman menos datos. Precaución: esto puede hacer que algunas aplicaciones pausen cargas y descargas grandes, como copias de seguridad. - Inscrito en el programa de estabilidad parafunciones experimentales. diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index a67b32d4e..d96ab77cd 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -10,7 +10,7 @@ متوقف شد! برنامه های مسدود شده همچنان دیوار آتش می شوند. Orbot ویژگی ها و عملکرد Tor را به اندروید می آورد. متوقف شده - RethinkDNS + Re-Rethink DNS و فایروال بسیار قابل تنظیم نصب شناسایی و مسدود کردن تهدیدات امنیتی شبکه @@ -178,7 +178,7 @@ جستجوی نامهای دامنه جستجوی فهرست‌های مسدود VPN (شبکه خصوصی مجازی) - vpn + VPN فعال کردن گزارش‌گیری روی دستگاه حالت را انتخاب کنید به‌روزرسانی جدید! diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9dba2fe74..3aca43702 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -81,7 +81,7 @@ Jaa laitteessa Rethink on avoimen lähdekoodin ohjelmisto, jota tukee Mozilla Builders MVP -ohjelma. - säännöt + Säännöt WireGuard Vapaa ja avoin lähde anonyymi diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 160bd7dc2..68fd4ba44 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,6 +1,6 @@ - RethinkDNS + Re-Rethink rethink À propos Paramètres @@ -25,7 +25,7 @@ protégé par proxy & DNS privé protégé par proxy HTTP & DNS privé protégé par proxy SOCKS5 & DNS privé - Connecté via RethinkDNS + Connecté via Re-RethinkDNS Connecté via pare-feu Appliquer des règles de pare-feu à toutes les applications en fonction des événements survenant sur l’appareil, par exemple, lorsque l’appareil est verrouillé ou lorsqu’une application particulière n’est pas utilisée. DNS @@ -206,7 +206,7 @@ Thème : %1$s %1$s entrées » Rethink DNS - type + Type application lors de la tentative de connexion sur un réseau Sans abonnement.

Pour la modifier, allez dans l’onglet Toutes les applications.]]> Empêchez les applications de se connecter à l’Internet. Limiter l’accès à Internet permet d’éviter une utilisation injustifiée des données et d’économiser la batterie. L’exclusion de %1$s pour %2$s en mode confinement peut provoquer des problèmes de connectivité à Internet. @@ -232,7 +232,7 @@ Type Catégories %1$s %2$s]]> - contact + Contact À jour ! %1$s Activer la visibilité du réseau @@ -389,14 +389,14 @@ Application en pause ! DNS Rethink Montrer toutes les apps - système + Système Supprimer la règle IP \? Un problème est survenu. Essayez à nouveau plus tard ! Définir le proxy HTTP(S) de connection DNS (économise la batterie) Auto Icône de l’application - règles + Règles https://builders.mozilla.community/alumni.html DNSCrypt %1$s Relais DNS %1$s @@ -445,7 +445,7 @@ %1$s.]]> Retenter la restauration Restauration terminée, redémarrage de l’application… - app + App Mise à jour complète VPN inactif N @@ -548,7 +548,7 @@ est bloquée sur les réseaux sans abonnement (Wi-Fi) %1$s %2$s dans les catégories : %3$s]]> ⚠ - recharger + Recharger DNS contourné Aucune règle de pare-feu ne s’applique à cette connexion. Téléchargement des listes de blocage… @@ -636,7 +636,7 @@ Restaurer Une URL ou un nom de domaine avec un joker optionnel : *.test.com, test.com/test Supprimer le proxy DNS de la configuration sauvegardée. - vpn + VPN Transférer les connexions vers le point de terminaison SOCKS5. Arrêter Orbot Afficher l’icône du site web dans les logs DNS (expérimental) @@ -705,7 +705,7 @@ Apparence inconnu Attention ! - liens + Liens hello@celzero.com %1$s listes de blocage en cours d’utilisation Version : v%1$s @@ -770,14 +770,14 @@ Confiner les applications listées \? Confiner Faire confiance - applications les plus bloquées - domaines les plus contactés - domaines les plus bloqués + Applications les plus bloquées + Domaines les plus contactés + Domaines les plus bloqués IP les plus contactées Lancer Rethink pour procéder IP les plus bloquées L\'authentification biométrique n\'est pas prise en charge ou est désactivée sur cet appareil - applications les plus autorisées + Applications les plus autorisées Erreur lors de l\'authentification biométrique Tout afficher Domaine (Appli) @@ -798,7 +798,7 @@ le domaine est autorisé.

Pour modifier cela, accédez à l’écran Pare-feu de l’application.]]> domaine.

Pour la modifier, accédez à l’écran Pare-feu de l’application.]]> Bloquer, tolérer ce domaine - règles + Règles Configurer journaux contourner dns & firewall @@ -1063,7 +1063,7 @@ Vous utilisez Rethink depuis %1$s jours, ce qui correspond à un coût d\'utilisation de $%2$s. Envisageriez-vous de devenir sponsor afin de soutenir son développement ? Utiliser le système DNS pour les domaines non délégués Utilisez le système DNS pour les domaines non délégués tels que .lan, .internal, etc. - filtrage + Filtrage Séparer le DNS (expérimental) Transférer les requêtes DNS des applications proxy vers les serveurs DNS du proxy. Bloquer toutes les connexions locales @@ -1120,15 +1120,15 @@ Utiliser ce VPN WireGuard via les données mobiles. Ajouter/Supprimer un relais Les tests d\'accessibilité contournent toutes les restrictions réseau. En mode Auto, Rethink utilise aléatoirement les adresses IP et les noms d\'hôte précédemment utilisés. - fournisseurs les plus contactés - fournisseurs les plus bloqués + Fournisseurs les plus contactés + Fournisseurs les plus bloqués Saisir les noms des paquets (séparés par des virgules) autorisés à démarrer ou à arrêter Rethink. Instructions :\nÉléments requis pour la diffusion :\n• Clé : sender\n• Valeur : Nom du package de l’application appelante\n\nExemple : key : sender value : com.termux\n\nActions prises en charge :\n• Démarrer le VPN : com.celzero.bravedns.intent.action.VPN_START\n• Arrêter le VPN : com.celzero.bravedns.intent.action.VPN_STOP Saisir le nom du package (exemple : net.dinglisch.android.taskerm) Afficher les informations du fournisseur Récupère les informations du fournisseur de services pour les sites web depuis rethinkdns.com, propulsé par %1$s Configurer les applications qui peuvent démarrer ou arrêter Rethink. - connexions actives principales + Connexions actives principales Tout charger Fermer les connexions Fermer toutes les connexions pour %1$s ? diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 98f4d67d9..3bb95bdbc 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1,6 +1,6 @@ - रीथिंकडीएनएस + Re-Rethink रीथिंक हमारे बारे में सेटिंग्स diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 125d056fd..926b1fc5a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1,9 +1,9 @@ - RethinkDNS + Re-Rethink Rólunk Hálózatbiztonsági fenyegetések észlelése és blokkolása - szabályok + Szabályok Beállítások Pihenés… Kezdőlap @@ -316,7 +316,7 @@ Domain nevek keresése DNS Tűzfal - vpn + VPN Nyilvános kulcs másolva. RDNS+ DNS-over-HTTPS URL-ként másolva A DNS- és tűzfal-naplók helyi tárolása az eszközön. @@ -430,8 +430,8 @@ Nem lehet szüneteltetni: RethinkDNS nem aktív %1$s letiltása A(z) %1$s kapcsolatvesztést okozhat. Módosítsa a beállítást, hogy a Rethink a háttérben is használhassa az adatforgalmat és egyéb erőforrásokat. - szabályok - típus + Szabályok + Típus Egyéb DNS Rethink DNS %1$s bejegyzések 🔗 @@ -456,17 +456,17 @@ Hibajelentés Nem sikerült lekérni az összeomlási naplókat. Szeretné manuálisan jelenteni a hibát? Email küldése - linkek + Linkek Látogasson el a rethinkdns.com oldalra Hozzájárulás a GitHubon GYIK megtekintése Dokumentumok olvasása Adatvédelmi irányelvek elolvasása - kapcsolat + Kapcsolat Szponzor - alkalmazás + Alkalmazás Írjon nekünk e-mailt - rendszer + Rendszer Alkalmazás adatai VPN profil Értesítési beállítások @@ -1048,7 +1048,7 @@ Ön már %1$s napja használja a Rethink alkalmazást, ami %2$s USD használati költséget jelentene. Megfontolná, hogy támogatásával hozzájáruljon a fejlesztés fenntartásához? A rendszer DNS használata a nem delegált tartományokhoz A rendszer DNS használata a nem delegált tartományokhoz, mint például .lan, .internal stb. - szűrés + Szűrés Split DNS (kísérleti) A proxyn keresztül irányított alkalmazások DNS-lekérdezéseinek továbbítása a proxy DNS-kiszolgálóihoz. Helyi kapcsolatok blokkolása diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 01e2ad264..c96310daa 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -13,7 +13,7 @@ Setel Orbot Berhenti Cari aplikasi berdasarkan uid, nama - vpn + VPN Hentikan Orbot Orbot\t❯ dns pribadi telah aktif @@ -134,7 +134,7 @@ Profil VPN Perhatian! Firewall - muat ulang + Muat ulang Catatan: %1$s aplikasi yang diblokir akan terus diblokir. Menutup… DNSCrypt %1$s @@ -171,14 +171,14 @@ Perangkat Terkunci Tidak ada aturan firewall sesuai koneksi ini. Tetap memblok - tautan + Tautan Yang baru di versi %1$s - RethinkDNS + Re-Rethink ❔ ikon_fav Sumber Tidak Diketahui Aplikasi yang Terpasang - aplikasi + Aplikasi hello@celzero.com v%1$s (%2$s) Ikon Aplikasi @@ -195,18 +195,18 @@ DNS + Firewall fdroid Koneksi jaringan app diabaikan - tipe + Tipe Kirimkan email ke : hello@celzero.com DoH ⚠ Perhatian - sistem + Sistem https://github.com/celzero/rethink-app https://www.rethinkdns.com/ Beralih ke mode DNS/DNS+Firewall untuk mengaktifkan pengaturan ini https://docs.rethinkdns.com/ Terhubung dengan RethinkDNS dan Firewall - Terhubung dengan RethinkDNS + Terhubung dengan Re-RethinkDNS Terhubung dengan Firewall Rethink memblokir %1$s aplikasi baru. Ketuk untuk melihat atau mengubah. Izinkan (pintas/bypass) atau blokir alamat IP, subnet IP (dalam rentang tertentu), Port. Contoh: 10.10.10.10, 10.1.1.*, 10.2.2/24, ffff::/104, [::]:80, [10.1.0.0/16]:80, *.*:80 @@ -393,7 +393,7 @@ Alamat IP: %1$s \n \nNomor port: %2$s - aturan-aturan + Aturan-aturan Koneksi ke host gagal. Coba lagi. Rethink memblokir aplikasi yang baru dipasang, %1$s. Aturan firewall universal dilewati (di-bypass) @@ -403,7 +403,7 @@ DNS dan Firewall (bawaan) Mulai Rethink untuk melanjutkan. Meneruskan ke %1$s - kontak + Kontak Dalam Atur KONEKSI Proksi HTTP(S) Proksi HTTP telah diatur @@ -808,7 +808,7 @@ Mengisolasi aplikasi T IP yang paling banyak terhubung - domain yang paling banyak terhubung + Domain yang paling banyak terhubung Ganti Bahasa Amankan aplikasi ini menggunakan kunci layar Anda Pilih bahasa pilihan Anda @@ -822,9 +822,9 @@ Izinkan / Blokir pada jaringan terukur (Data Seluler). Lewati (Bypass) aturan firewall universal untuk aplikasi yang terdaftar \? Kecualikan dari keduanya, DNS + Firewall. - aplikasi yang paling banyak diblokir - aplikasi yang paling banyak diizinkan - domain yang paling banyak diblokir + Aplikasi yang paling banyak diblokir + Aplikasi yang paling banyak diizinkan + Domain yang paling banyak diblokir IP yang paling banyak diblokir Blokir semua kecuali IP tepercaya. Izinkan aplikasi @@ -855,7 +855,7 @@ Aturan IP Aturan Domain Blokir, percayai domain ini - aturan + Aturan Konfigurasikan catatan lewati (bypass) dns & firewall @@ -1103,7 +1103,7 @@ Anda telah menggunakan Rethink selama %1$s hari, yang berarti Anda harus mengeluarkan biaya penggunaan sebesar $%2$s. Apakah Anda akan mempertimbangkan untuk mensponsori untuk mempertahankan pengembangannya? Gunakan DNS Sistem untuk domain yang tidak didelegasikan Gunakan DNS Sistem untuk domain yang tidak didelegasikan seperti .lan, .internal, dll. - penyaringan + Penyaringan DNS Terpisah (pengujian) Meneruskan kueri DNS dari aplikasi yang diproksi ke server DNS proxy. Blokir semua sambungan host lokal @@ -1144,7 +1144,7 @@ Tutup soket TCP dan UDP yang tidak aktif setelah durasi ini. Ketentuan Layanan Pemeriksaan jangkauan melewati semua batasan jaringan. Dalam mode Otomatis, Rethink secara acak menggunakan IP dan nama host yang terhubung sebelumnya. - penyedia yang paling banyak dihubungi + Penyedia yang paling banyak dihubungi Masukkan nama paket (dipisahkan koma) yang diizinkan untuk memulai atau menghentikan Rethink. Instruksi:\nTambahan yang diperlukan dalam siaran:\n• Kunci: pengirim\n• Nilai: Nama paket aplikasi pemanggil\n\nContoh: kunci:pengirim nilai:com.termux\n\nTindakan yang didukung:\n• Mulai VPN – com.celzero.bravedns.intent.action.VPN_START\n• Hentikan VPN – com.celzero.bravedns.intent.action.VPN_STOP Masukkan nama paket (contoh: net.dinglisch.android.taskerm) @@ -1189,9 +1189,9 @@ Hanya seluler Gunakan VPN WireGuard ini melalui data seluler. Tambahkan / Hapus Relay - penyedia yang paling banyak diblokir + Penyedia yang paling banyak diblokir Tampilkan informasi penyedia - koneksi aktif teratas + Koneksi aktif teratas Mode khusus seluler tidak didukung untuk Relay Tidak bisa relay, sudah %1$s Kesalahan relay: %1$s -> %2$s diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 16ff99797..731990d36 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -12,7 +12,7 @@ blocca errore dell\'app errore del dns - RethinkDNS + Re-Rethink rethink Info Impostazioni @@ -39,7 +39,7 @@ in attesa protetto con tor non protetto - Connesso a RethinkDNS + Connesso a Re-RethinkDNS RIATTIVA PAUSA DISATTIVA @@ -117,7 +117,7 @@ Firewall DNS e Firewall (predefinito) VPN - vpn + VPN Indirizzo IP copiato. URL copiato Copiato come URL RDNS+ DNS-over-HTTPS @@ -378,8 +378,8 @@ Avvio… Tema: %1$s Impossibile mettere in pausa: Rethink non è attivo - regole - tipo + Regole + Tipo Altro DNS Rethink DNS %1$s elementi » @@ -402,17 +402,17 @@ Segnala bug Impossibile reperire il registro degli arresti anomali. Vuoi segnalare il tuo bug manualmente\? Invia email - collegamenti + Collegamenti Visita rethinkdns.com Contribuisci su GitHub Visualizza le domande frequenti Leggi la documentazione - contatti + Contatti Rethink fa parte del programma Mozilla Builders MVP, FOSS United Foundation, OSOM Products Inc. Sostienici - app + App Scrivici una email - sistema + Sistema Info applicazione Profilo VPN Impostazioni notifiche @@ -532,7 +532,7 @@ %1$s %2$s app elencate delle categorie: %3$s Nota Nessuna regola del firewall trovata - ricarica + Ricarica Sconosciuto Senza nome (%1$s) Errore di connessione al server DNS Proxy. @@ -769,13 +769,13 @@ Aggira app Escludi app IP più contattati - app più bloccate + App più bloccate Escludere le applicazioni elencate da DNS e Firewall\? Isola app Isolare le applicazioni elencate\? - app più consentite - domini più contattati - domini più bloccati + App più consentite + Domini più contattati + Domini più bloccati Mostra tutto Annulla Applica @@ -798,7 +798,7 @@ Questa connessione è stata bloccata perché il dominio è bloccato dal DNS preferito dall\'utente.

Per modificare questo comportamento, accedere alla scheda Configura DNS. Aggira DNS e firewall Forse bloccato - regole + Regole rete bypassare dns e firewall Non instradare IP privati (sperimentale) diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 26dfc119c..53cc1324a 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -63,7 +63,7 @@ %1$s נחסם על המכשיר מותר ב-%1$s %2$s חסום ב-%1$s %2$s - מחובר ל-RethinkDNS + מחובר ל-Re-RethinkDNS מחובר ל-RethinkDNS ולחומת האש המשך DNS @@ -85,7 +85,7 @@ חומת אש DNS וחומת אש (ברירת מחדל) VPN - vpn + VPN כתובת ה-IP הועתקה. כתובת האתר הועתקה בחר מצב diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a2fde7b6c..46a0ba055 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -124,7 +124,7 @@ DNS ファイアウォール DNSとファイアウォール（デフォルト） - vpn + VPN RDNS+ DNS over HTTPS URL としてコピー モードの選択 HTTP3 @@ -578,7 +578,7 @@ パケット キャプチャがアクティブ パケット キャプチャが無効 閉じる.. - RethinkDNS + Re-RethinkDNS 更新情報 プロキシがアクティブ ルール diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e1a0133e5..54d73ea44 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -263,7 +263,7 @@ 기능 제안하기 브라우저에서 웹페이지를 열 수 없습니다. DNS over HTTPS - vpn + VPN 새로운 업데이트! URL 복사됨 모드 선택 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index c459861ac..8d3cd9fc6 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1,11 +1,11 @@ Nustatymai - Prisijungta prie RethinkDNS + Prisijungta prie Re-RethinkDNS Prisijungta prie ugniasienės rethink Taikykite ugniasienės taisykles visoms programėlėms pagal įrenginio įvykius, pvz., ugniasienę, kai įrenginys užrakintas arba kai tam tikra programėlė nenaudojama. - RethinkDNS + Re-Rethink Apie Aptik ir blokuok tinklo saugumo grėsmes Pagrindinis @@ -83,7 +83,7 @@ DNS DNS ir ugniasienė (numatytasis) VPN - vpn + VPN Įgalinti registravimą įrenginyje Pasirinkti režimą HTTP3 @@ -188,10 +188,10 @@ Įgalinama… Tema: %1$s Nepavyksta pristabdyti: RethinkDNS neaktyvus - taisyklės - tipas + Taisyklės + Tipas Kitas DNS - RethinkDNS + Re-RethinkDNS %1$s įrašai 🔗 Galite rinktis iš daugiau nei 185 blokavimo sąrašų. Spustelėkite čia, jei norite atsisiųsti arba konfigūruoti blokavimo sąrašus. Leisti arba neleisti atskirų domenų @@ -203,7 +203,7 @@ Siųsti el. laišką Peržiūrėti DUK Parašyti mums el. laišką - sistema + Sistema Programėlės informacija VPN profilis Pranešimų nustatymai @@ -294,7 +294,7 @@ fav_icon Pastaba Nerasta ugniasienės taisyklių - perkrauti + Perkrauti Nežinoma Be pavadinimo (%1$s) Klaida jungiantis prie DNSCrypt serverio. @@ -511,7 +511,7 @@ nežinoma Programėlės informacija nerasta %1$s programėlės - programėlė + Programėlė Gedimo ataskaitai nerasta RethinkDNS reikia leidimo nustatyti vietinį VPN, kad būtų galima užšifruoti įrenginio DNS užklausas, įdiegti tinklo monitorių ir vykdyti ugniasienės taisykles. \n @@ -537,9 +537,9 @@ Siųsti el. laišką Pranešimas apie klaidą Pranešimas apie klaidą - susisiekti + Susisiekti Nepavyko gauti gedimų žurnalų. Ar norite rankiniu būdu pranešti apie klaidą\? - nuorodos + Nuorodos Paremti https://twitter.com/rethinkdns Pasiūlyti funkcijas @@ -622,7 +622,7 @@ play Pridėti domeną RethinkDNS užblokavo %1$s naujas (-ą) programėles (-ę). Bakstelėkite norėdami peržiūrėti arba keisti. - Informuoti, kai Android arba kita VPN programa sustabdo RethinkDNS + Informuoti, kai Android arba kita VPN programa sustabdo Re-RethinkDNS Įspėti apie įrenginio blokavimo sąrašų atsisiuntimo eigą fdroid Įspėti apie ugniasienės klaidas ir anomalijas diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 922f170d8..362fe2a6a 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -3,7 +3,7 @@ Hjem blokker Velkommen - RethinkDNS + Re-Rethink Innstillinger Om tar en lur … diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f70c91e2c..1467321de 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -68,7 +68,7 @@ RethinkDNS is gestopt met het doorsturen van verbindingen naar Orbot, maar Orbot draait misschien op de achtergrond. Ongeldige poort SOCKS5 (TCP) proxy instellen - vpn + VPN HTTP3 VPN altijd aan uitschakelen Altijd VPN @@ -93,7 +93,7 @@ Gekopieerd als RDNS+ DNS-over-HTTPS URL Sla DNS- en firewall-logs lokaal op het apparaat op. Kies de modus - RethinkDNS + Re-Rethink rethink Instellingen een dutje doen… @@ -110,7 +110,7 @@ beschermd met socks proxy beschermd met http proxy niet beschermd - Verbonden met RethinkDNS + Verbonden met Re-RethinkDNS Verbonden met Firewall DNS + Firewall DNS @@ -257,16 +257,16 @@ Begin Kan niet pauzeren: RethinkDNS niet actief Proxy actief - regels + Regels Andere DNS - RethinkDNS + Re-RethinkDNS Blokkeringslijsten op het apparaat Haalt website iconen op van duckduckgo.com. Verbruikt tot 350 mb aan schijfruimte Blokkeren wanneer DNS wordt omzeild Controleer eenmaal per drie dagen of de blocklist is bijgewerkt RethinkDNS is de eenvoudigste manier om de activiteit van apps te controleren, internetcensuur te omzeilen en apps op uw Android-toestel te firewarden. - app - systeem + App + Systeem RethinkDNS is een gratis en open-source project, geleid door ex-ingenieurs van Amazon, IBM en Scientific Games. Privacybeleid App-informatie @@ -319,7 +319,7 @@ \nPoortnummer: %3$s Toont %1$s %2$s apps in categorieën: %3$s Wissen - herladen + Herladen Oke fav_icon Onbekend @@ -410,7 +410,7 @@ Verzend e-mail Kon geen crash logs ophalen. Wilt u uw bug handmatig rapporteren\? Verzend e-mail - links + Links Bezoek rethinkdns.com Bijdragen op GitHub Bekijk FAQ\'s @@ -511,7 +511,7 @@ Uitgeschakeld Domein Misschien geblokkeerd - regels + Regels Configureren netwerk QR Code @@ -577,7 +577,7 @@ PCAP Sluiten… Aanzetten… - type + Type Omzeil Universeel website Domein succesvol toegevoegd @@ -660,7 +660,7 @@ \nOm Rethink\'s DNS te gebruiken moet je in de Android Instellingen \"Privé DNS\" uitschakelen. Up-to-date! Biometrische authenticatie is niet ondersteund of uitgeschakeld op dit apparaat - contact + Contact Functies voorstellen De eerste 20.000 karakters laten zien IP toegevoegd aan de lijst diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 968e8a624..810d9cf26 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,6 +1,6 @@ - RethinkDNS + Re-Rethink O Rethink Ustawienia RethinkDNS to najłatwiejszy sposób monitorowania aktywności sieciowej, omijania cenzury Internetu i zapory sieciowej na urządzeniu z Androidem. @@ -11,7 +11,7 @@ błąd aplikacji prywatne dns włączone brak zabezpieczienia - Połączone z RethinkDNS + Połączone z Re-RethinkDNS zabezpieczone przez tor & prywatnym dns zabezpieczone przez socks proxy zabezpieczone przez proxy @@ -113,10 +113,10 @@ Usunąć DNSCrypt Relay\? Usuń przekaźnik DNSCrypt z zapisanej konfiguracji. %1$s listy blokowania - najbardziej dozwolone aplikacje - najczęściej blokowane aplikacje - domeny, z którymi najczęściej się łączono - najczęściej blokowane domeny + Najbardziej dozwolone aplikacje + Najczęściej blokowane aplikacje + Domeny, z którymi najczęściej się łączono + Najczęściej blokowane domeny Uruchom Rethink, aby kontynuować Pokaż Wszystko rethink @@ -161,7 +161,7 @@ Albo nasze serwery są wyłączone, albo nie można nawiązać połączenia. Spróbuj ponownie za jakiś czas. VPN Zkopiowano adres IP. - vpn + VPN Skopiowano URL Coś poszło nie tak. Spróbuj ponownie później! DNSCrypt @@ -286,9 +286,9 @@ Temat: %1$s Przeczytaj dokumenty Polityka prywatności - kontakt + Kontakt Napisz do nas - system + System Informacje o aplikacji Profil VPN Ustawienia powiadomień @@ -348,7 +348,7 @@ wykluczone z dns i firewalla omija reguły DNS i firewalla %1$s reguła(y) domeny - typ + Typ Komunikat o aktualizacji listy bloków v%1$s Błąd ładowania pliku dziennika @@ -363,7 +363,7 @@ DNS zablokowany Połączenie zostało dopuszczone, ponieważ aplikacja źródłowa jest ustawiona na obchodzenie reguł dns i zapory.

Aby to zmienić, przejdź do ekranu App-specific Firewall. To połączenie zostało zablokowane, ponieważ domena jest ustawiona jako zablokowana w regułach domeny uniwersalnej.

Aby zmienić to zachowanie przejdź do zakładki Configure DNS. - najczęściej kontaktowane adresy IP + Najczęściej kontaktowane adresy IP Niestandardowy adres URL serwera Wewnętrzny Zewnętrzny @@ -386,7 +386,7 @@ Wyświetlam wszystkie aplikacje Wyświetlanie %1$s %2$s aplikacji Nie znaleziono żadnych reguł firewalla - przeładuj + Przeładuj DNS Proxy Pobierz Wersja: %1$s @@ -578,7 +578,7 @@ Pobierz ponownie listy blokujące Wykonuje kopię zapasową ustawień aplikacji, sieci i logów dns do pliku. Spowoduje to ponowne uruchomienie sieci VPN. Przywracanie nie powiodło się - większość zablokowanych adresów IP + Większość zablokowanych adresów IP Przechwytywanie pakietów Wyjście do Logcata Wyjście do folderu Pobrane @@ -590,12 +590,12 @@ Przechwytywanie pakietów aktywne Przechwytywanie pakietów wyłączone Nie można wstrzymać: Rethink nie jest aktywny - zasady - RethinkDNS + Zasady + Re-RethinkDNS Zapobieganie wyciekom DNS RethinkD to najprostszy sposób na monitorowanie aktywności aplikacji, obchodzenie cenzury internetowej i zapory aplikacji na urządzeniu z systemem Android. Wesprzyj nas - aplikacja + Aplikacja Przechwytywanie… Autorzy DNSCrypt @@ -782,14 +782,14 @@ Niebo Wyświetlanie wszystkich list blokujących Ustawiane przez system - linki + Linki resolwery Aplikacja Obejście uniwersalne Brak reguł IP lub portów. BU Skopiuj jako adres URL RDNS+ - reguły + Reguły Włącz blokadę aplikacji PCAP Wył. (domyślnie) @@ -896,7 +896,7 @@ Kraje, z którymi najczęściej się kontaktowano Nie blokuje żadnych żądań DNS. Używa punktu końcowego DNS Cloudflare 1.1.1.1. Ustawianie powiadomienia jako trwałego - najczęściej blokowane kraje + Najczęściej blokowane kraje na aplikację "chroniony za pomocą wireguard" Klucz publiczny diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 308f36a02..4836c9bd0 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -37,75 +37,7 @@ Não foi possível iniciar o perfil VPN. Externo Adicionar resolvedor ou relé DNSCrypt - Projeto Rethink Open Source deve sua existência a esses voluntários que dedicam inúmeras horas ao seu desenvolvimento.
-
🛡️ Aplicativo Android
-Anthony Ryan / -BayLee4 / -Ch4t4r / -CodingAttack / -HrBDev / -hussainmohd-a / -ignorante / -véu de ferro / -markwmuller / -Mohammaduvez / -Meu Deus / -Poussinou / -pjosingh / -RohitSurwase / -Shantanu / -Uldiniad
/ -yurtpage
-
🚂 Motor de rede
-alalamav / -bemasc / -dmcardle / -fortuna / -ignoramous / -PeterDaveHello / -santhosh-ponnusamy / -SeanBurford
-
📚 Resolver
-ahmed-tasaly / -amithm7 / -arfshl / -badmojr / -bongochong / -elliotwutingfeng / -georgyo / -GiddyGoatGaming / -Harish-Narayan / -ignoramous / -JakeChampion / -MasterKia / -mtxadmin / -neneeen / - -PeterDaveHello / -santhosh-ponnusamy / -shruuub / -shuvashish76
-
⚜ Moderadores da comunidade
-amithm7 / -Andersen / -ppatra / -InFamous23 / -TheTr1ckst3r / -Ch4t4r / -Billi_ance / -kaliangel / -PoneyClairDeLune
-
📌 Geo-IP
-db-ip.com / IPinfo Lite
-
❇ Traduções
-Weblate
-
🦆 Ícones
-Ícones
-
📦 Servidores de compilação
-JitPack / -GitHub / -Sonatype
-]]> + The <i>Rethink Open Source Project</i> owes its existence to these volunteers who devote countless hours on its development.<br/> <br/>🛡️ Android app <br/> <a href=https://github.com/BayLee4>BayLee4</a><br/> <a href=https://github.com/Ch4t4r>Ch4t4r</a><br/> <a href=https://github.com/HrBDev>HrBDev</a><br/> <a href=https://github.com/hussainmohd-a>hussainmohd-a</a><br/> <a href=https://github.com/ignoramous>ignoramous</a><br/> <a href=https://github.com/markwmuller>markwmuller</a><br/> <a href=https://github.com/Mygod>Mygod</a><br/> <a href=https://github.com/Uldiniad>Uldiniad</a><br/> <a href=https://github.com/Poussinou>Poussinou</a><br/> <a href=https://github.com/pjosingh>pjosingh</a><br/> <br/>🚂 Network engine <br/> <a href=https://github.com/alalamav>alalamav</a><br/> <a href=https://github.com/bemasc>bemasc</a><br/> <a href=https://github.com/dmcardle>dmcardle</a><br/> <a href=https://github.com/fortuna>fortuna</a><br/> <a href=https://github.com/ignoramous>ignoramous</a><br/> <a href=https://github.com/Lanius-collaris>Lanius-collaris</a><br/> <a href=https://github.com/PeterDaveHello>PeterDaveHello</a><br/> <a href=https://github.com/santhosh-ponnusamy>santhosh-ponnusamy</a><br/> <a href=https://github.com/SeanBurford>SeanBurford</a><br/> <br/>📚 Resolver <br/> <a href=https://github.com/ahmed-tasaly>ahmed-tasaly</a><br/> <a href=https://github.com/amithm7>amithm7</a><br/> <a href=https://github.com/arfshl>arfshl</a><br/> <a href=https://github.com/badmojr>badmojr</a><br/> <a href=https://github.com/bongochong>bongochong</a><br/> <a href=https://github.com/elliotwutingfeng>elliotwutingfeng</a><br/> <a href=https://github.com/georgyo>georgyo</a><br/> <a href=https://github.com/GiddyGoatGaming>GiddyGoatGaming</a><br/> <a href=https://github.com/Harish-Narayan>Harish-Narayan</a><br/> <a href=https://github.com/ignoramous>ignoramous</a><br/> <a href=https://github.com/JakeChampion>JakeChampion</a><br/> <a href=https://github.com/MasterKia>MasterKia</a><br/> <a href=https://github.com/mtxadmin>mtxadmin</a><br/> <a href=https://github.com/neneeen>neneeen</a><br/> <a href=https://github.com/PeterDaveHello>PeterDaveHello</a><br/> <a href=https://github.com/santhosh-ponnusamy>santhosh-ponnusamy</a><br/> <a href=https://github.com/shruuub>shruuub</a><br/> <a href=https://github.com/shuvashish76>shuvashish76</a><br/> <br/>⚜ Community mods <br/> <a href=https://t.me/amithm7>amithm7</a><br/> <a href=https://t.me/TronSlayer>Andersen</a><br/> <a href=https://t.me/ppatra>ppatra</a><br/> <a href=https://t.me/InFamous23>InFamous23</a><br/> <a href=https://t.me/TheTr1ckst3r>TheTr1ckst3r</a><br/> <a href=https://t.me/Ch4t4r>Ch4t4r</a><br/> <a href=https://t.me/Billi_ance>Billi_ance</a><br/> <a href=https://t.me/kaliangel>kaliangel</a><br/> <a href=https://github.com/PoneyClairDeLune>PoneyClairDeLune</a><br/> <br/>📌 Geo-IP <br/> <a href=https://db-ip.com>db-ip.com</a><br/> <br/>❇ Translations <br/> <a href=https://weblate.org/en/>Weblate</a><br/> <br/>🦆 Icons <br/> <a href=https://github.com/celzero/rethink-app/issues/346>Icons</a><br/> <br/>📦 Build servers <br/> <a href=https://jitpack.io/>JitPack</a><br/> <a href=https://github.com/>GitHub</a><br/> excluído do dns e firewall Proxy %1$s 127.0.0.1 @@ -114,7 +46,7 @@ Informações do aplicativo não encontradas %1$s aplicativos Atenção! - tipo + Tipo Outros DNS para: Você está a um passo de ter um Android seguro e protegido: Veja instantaneamente atividade da rede, bloquear sites, IPs e aplicativos suspeitos. @@ -123,6 +55,7 @@ %1$s entradas » Proxy removido Listas de bloqueio no dispositivo + Encerrando… Vamos começar Encerrando… Rethink DNS @@ -130,16 +63,16 @@ Tema: %1$s Escolha entre mais de 195 listas de bloqueio. Clique aqui para baixar ou configurar listas de bloqueio. Regras de domínio - regras + Regras Mostrar ícone de sites em registros de DNS (experimental) Contribuir no GitHub - O Rethink conta com o apoio da Mozilla Builders, da FOSS United Foundation e do FLOSS/fund. - links + O Rethink é apoiado pela Mozilla Builders, FOSS United Foundation. + Links Acessar rethinkdns.com Perguntas frequentes - aplicativo + Aplicativo Detalhes do aplicativo - sistema + Sistema Novidades na versão %1$s Perfil de VPN Configurações de notificação @@ -168,7 +101,7 @@ Endereço IP inválido Porta inválida Nenhuma regra de firewall encontrada - recarregar + Recarregar Novo aplicativo Permitir em redes Wi-Fi Erro @@ -184,8 +117,8 @@ Nenhuma regra de firewall correspondeu a esta conexão. DNS ignorado Restrito - aplicativo ao tentar se conectar à rede Medida.

Para alterar, acesse a guia Todos os Aplicativos.]]> - aplicativo ao tentar se conectar à rede Móvel (Móvel).

Para alterar, acesse a guia Universal.]]> + Uma regra de firewall definida pelo usuário bloqueou este aplicativo ao tentar se conectar em uma rede móvel.

Para alterar, acesse a guia Todos os aplicativos. + Uma regra de firewall universal definida pelo usuário bloqueou este aplicativo ao tentar se conectar em uma rede móvel.

Para alterar, acesse a guia Universal. Esta conexão foi permitida porque o IP de destino está configurado como IP confiável.

Para alterar, acesse a tela Firewall específico do aplicativo. Esta conexão foi bloqueada porque o dispositivo estava bloqueado naquele momento.

Para mudar este comportamento, acesse a guia Universal. Uma regra de firewall definida pelo usuário bloqueou esta conexão UDP.

Para alterar, acesse a guia Universal. @@ -236,7 +169,7 @@ bloquear sem internet Sobre - RethinkDNS + Re-Rethink Configurações Rethink usa o serviço de acessibilidade para detectar e implementar firewall para aplicativos em segundo plano. Rethink não coleta nem vende qualquer tipo de informação. Rethink está executando a VPN no modo Restrito. Ao interrompê-lo você perderá a conexão com a internet neste perfil de usuário. Você quer continuar mesmo assim? @@ -279,7 +212,7 @@ protegido com tor protegido com dns privado protegido com tor e dns privado - Conectado ao RethinkDNS + Conectado ao Re-RethinkDNS protegido com proxy e dns privado protegido com socks5 e dns privados Orbot é um aplicativo de proxy gratuito que permite que outros aplicativos usem a internet com mais segurança. \nOrbot usa o Tor para criptografar seu tráfego de internet, o que ajuda você a ignorar a censura e a se defender contra formas de vigilância de rede que ameaçam a liberdade e a privacidade pessoais. \nProxy TCP: Rethink encaminha apenas conexões TCP de aplicativos incluídos para Orbot. \nProxy HTTP: Rethink estabelece o túnel HTTP CONNECT para Orbot e encaminha apenas conexões TCP de aplicativos incluídos. @@ -396,7 +329,7 @@ Firewall DNS + Firewall (padrão) VPN - vpn + VPN Endereço IP copiado. URL copiada Copiado como URL de RDNS+ DNS-over-HTTPS @@ -532,7 +465,7 @@ Enviar email Evitar vazamentos de DNS Documentação - contato + Contato Patrocinar Envie-nos um e-mail Não foi encontrado nenhum relatório de erro @@ -639,7 +572,7 @@ DoH Dnscrypt Proxy DNS - Não é possível alterar os modos quando a VPN está bloqueada. Toque para editar as configurações da VPN. + Não é possível alterar entre modos quando a VPN está em modo restrito. Toque para editar configurações da VPN. Sem regras Aplicativo bloqueado Wi-Fi @@ -652,10 +585,10 @@ Aplicativo não está em uso Fonte desconhecida UDP bloqueado - aplicativo.

Para alterar, acesse a guia Todos os Aplicativos.]]> - primeira vez.

Para alterar, acesse a guia Universal.]]> - aplicativo ao tentar se conectar à rede Ilimitada.

Para alterar, acesse a guia Todos os Aplicativos.]]> - aplicativo com IPs que não sejam IPs ignorados.

Para alterar, acesse a guia Todos os Aplicativos.]]> + Uma regra de firewall definida pelo usuário bloqueou este aplicativo.

Para alterar, acesse a guia Todos os aplicativos. + Este aplicativo fez uma conexão pela primeira vez.

Para alterar, acesse a guia Universal. + Uma regra de firewall definida pelo usuário bloqueou este aplicativo ao tentar se conectar em uma rede Wi-Fi.

Para alterar, acesse a guia Todos os aplicativos. + Uma regra de firewall definida pelo usuário bloqueou a conexão deste aplicativo com outros IPs ignorados.

Para alterar, acesse a guia Todos os aplicativos. Uma regra de firewall definida pelo usuário bloqueou o IP / Porta de destino.

Para alterar, acesse a guia Universal. Uma regra de firewall definida pelo usuário bloqueou o IP de destino.

Para alterar, acesse a tela Firewall específico do aplicativo. Esta conexão foi permitida porque o <i>IP de destino</i> está configurado para ignorar todas as regras universais de firewall.<br/><br/> Para alterar, acesse a guia <i>Regras de IP<i> em <i>Universal</i>. @@ -797,7 +730,7 @@ Ir para as configurações Aplicar Desativado - Status + Estatísticas Bloquear todos, exceto IPs de confiança. Isolar aplicativos Cancelar @@ -811,7 +744,7 @@ Curinga Descartar Configurar - regras + Regras Escolha o seu idioma preferido Ajude a traduzir este aplicativo registros @@ -903,8 +836,8 @@ Isolar aplicativos listados\? Confiável Mostrar todos - domínios mais contatados - aplicativos mais bloqueados + Domínios mais contatados + Aplicativos mais bloqueados DNS bloqueado Domínio (Univ) MTU @@ -918,7 +851,7 @@ Não é possível configurar proxies quando a VPN está sendo executada somente no modo DNS. Saída para a pasta Downloads Limpar todos os registros relacionados a este aplicativo. - países mais bloqueados + Países mais bloqueados Atributo ausente Valor inválido Seção ausente @@ -939,8 +872,8 @@ Atualização concluída Impulsionar DNS Não funciona em todas as versões do aplicativo - ips mais contatados - ips mais bloqueados + Ips mais contatados + Ips mais bloqueados Erro de sintaxe : As chaves hexadecimais do WireGuard devem ter 64 caracteres (32 bytes) número @@ -971,8 +904,8 @@ Bloquear, confiar neste domínio Agrupar solicitações, respostas de cache, tratamento de erros resiliente %1$s lista(s) de bloqueio - países mais contactados - domínios mais bloqueados + Países mais contactados + Domínios mais bloqueados Chave inválida Número inválido : As chaves base64 do WireGuard devem ter 44 caracteres (32 bytes) @@ -1006,7 +939,7 @@ Sem regras de domínio. T Bloquear conteúdo adulto e pirateado, jogos e encontros on-line e mídias sociais. - aplicativos mais permitidos + Aplicativos mais permitidos Inicie o Rethink para continuar Nenhuma configuração encontrada O arquivo deve ser \".conf\" ou \".zip\" @@ -1053,6 +986,8 @@ Encaminhando aplicativos restantes Incluir aplicativos restantes parte de %1$s + Loopback (experimental) + Também ativa a configuração de %1$s. Continuar? Encaminhar todos os aplicativos Incluir %1$s aplicativo(s) Excluir %1$s aplicativo(s) @@ -1105,9 +1040,11 @@ Você usa o Rethink há %1$s dias, o que representa um custo de uso de $%2$s. Você consideraria patrocinar para sustentar seu desenvolvimento? Use DNS do sistema para domínios não delegados Use o DNS do sistema para domínios não controlados, como .lan, .internal, etc. - filtragem + Filtragem DNS dividido (experimental) Encaminhe consultas DNS de aplicativos proxy para os servidores DNS do proxy. + Tratar regras de DNS como regras de firewall (experimental) + O bloqueio de DNS será ignorado durante a resolução; a decisão será tomada no momento da conexão. Bloquear todas as conexões de host local Excluir todas as regras de domínio? A exclusão dessas regras permitirá que qualquer aplicativo se conecte aos domínios atualmente bloqueados. @@ -1117,11 +1054,4 @@ Proxy de bloqueio Luz Plus Escuro Plus - Padrão - Ação - Conectar - Criteria - Geada - Automático (todos os tipos) - Erro de proxy diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a99e1c78f..e524b9897 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -22,7 +22,7 @@ protegido com socks5 e dns privado protegido com proxy http e dns privado Parar - Conectado a RethinkDNS + Conectado a Re-RethinkDNS Conectado a firewall Monitorizar, bloquear e cifrar pedidos DNS. Para além dos anteriores (DNS e Firewall), evitar também a censura na Internet. @@ -102,13 +102,13 @@ Definido pelo sistema Preto profundo \nPausar/Parar (predefinição):\n\nMostra dois botões, para pausar ou parar Rethink rapidamente. - tipo + Tipo IPv4 \nDNS / DNS + Firewall:\nMostra dois botões para mudar rapidamente entre o modo DNS para poupar bateria e o modo normal DNS + Firewall. Rethink necessita da sua permissão para criar uma VPN local para cifrar os pedidos DNS, implementar um monitor de rede e impor as regras da firewall. \n \nRethink não recolhe informações nem monitoriza as suas atividades. - regras + Regras IPv6 excluída de dns e da firewall Ativar modo firewall. @@ -174,7 +174,7 @@ DNS Firewall VPN - vpn + VPN Ativar registo no dispositivo Escolha o modo HTTP3 @@ -240,7 +240,7 @@ Isto elimina os registos da rede mas não as regras de firewall. Esta operação não é reversível. Continuar? URL copiado contorno universal - RethinkDNS + Re-Rethink Acerca A configurar Orbot… Instalar Orbot? @@ -336,7 +336,7 @@ Não foi possível obter os registos de falhas. Deseja reportar manualmente o seu erro? Envie um e-mail Política de privacidade - aplicação + Aplicação Info da aplicação Definições de notificação Rethink é apoiado por Mozilla Builders, FOSS United Foundation, OSOM Products Inc. @@ -359,14 +359,14 @@ Reportar erros Relatório de erros Enviar e-mail - ligações + Ligações Visitar rethinkdns.com Contribuir no GitHub FAQ Documentação - contactos + Contactos Patrocinador - sistema + Sistema Perfil VPN Novidades da versão %1$s Siga-nos no Twitter @@ -565,7 +565,7 @@ ❔ fav_icon Não foram encontradas regras - recarregar + Recarregar Desconhecido Erro ao ligar ao servidor DNSCrypt. Erro ao ligar ao servidor DNS Proxy. @@ -767,10 +767,10 @@ Isolar aplicações Isolar aplicações da lista\? Confiar - aplicações mais permitidas - aplicações mais bloqueadas - domínios mais contactados - domínios mais bloqueados + Aplicações mais permitidas + Aplicações mais bloqueadas + Domínios mais contactados + Domínios mais bloqueados IPs mais contactados IPs mais bloqueados Inicie Rethink para continuar @@ -797,7 +797,7 @@ Configurar Bloquear, confiar domínio(s) para esta aplicação registos - regras + Regras ignorar dns e firewall personalizar Em casos raros, quando o DNS preferencial do utilizador não pode ser usado, é utilizado o DNS de recurso. @@ -934,8 +934,8 @@ Por regras de IP/Domínio da aplicação Regras universais de firewall Modificar regras de IP/Domínio da aplicação. - países mais contactados - países mais bloqueados + Países mais contactados + Países mais bloqueados %1$s em %2$s Erro desconhecido “%s” Erro desconhecido diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 1cf013f2f..7b34a6ac5 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -89,7 +89,7 @@ Domeniu Metacaracter Actiune ceruta - reguli + Reguli Configureaza jurnale retea @@ -200,7 +200,7 @@ protejat cu WireGuard și DNS privat DNS-ul privat este activat neprotejat - Conectat la RethinkDNS + Conectat la Re-RethinkDNS Conectat la Firewall Conectat la RethinkDNS și Firewall Aplică regulile Firewall-ului la toate aplicațiile în funcție de evenimentele de pe dispozitiv; de exemplu, protejează când dispozitivul este blocat sau când o anumită aplicație nu rulează. @@ -246,7 +246,7 @@ DNS (economizor baterie) DNS și Firewall (prestabilit) VPN - vpn + VPN Adresă IP copiată. URL copiat Cheie publică copiată. @@ -450,8 +450,8 @@ Tema: %1$s Optimizare baterie Dezactivare %1$s - reguli - tip + Reguli + Tip Alte DNS Rethink DNS %1$s intrări » @@ -470,13 +470,13 @@ Telegram Raport bug Trimite e-mail - link-uri + Link-uri Vizitează rethinkdns.com Contribuie pe GitHub Vezi documentația Vezi Politica de confidențialitate Sponsor - aplicatia + Aplicatia Scrie-ne Informații aplicație Profil VPN @@ -519,8 +519,8 @@ Trimite e-mail Nu am reușit să colectez jurnalele de erori. Dorești să raportezi manual un bug? Vezi Întrebări Frecvente - contact - sistem + Contact + Sistem Autori Să începem Trimite acest e-mail la: hello@celzero.com @@ -727,7 +727,7 @@ Blochezi conexiunile în rețelele contorizate (mobile) pentru aplicațiile din listă\? Aplicații cu ocolire Nu ai fost găsite reguli pentru Firewall - reîncărcare + Reîncărcare Fără nume (%1$s) Eroare de conectare la serverul DNSCrypt. Eroare de conectare la serverul DNS Proxy. @@ -965,14 +965,14 @@ Copie de rezervă reușită Restaurare nereușită, încearcă din nou %1$s liste de blocat - cele mai contactate tari - cele mai contactate domenii - cele mai blocate aplicatii - cele mai permise aplicatii - cele mai blocate domenii - cele mai contactate IP-uri - cele mai blocate IP-uri - cele mai blocate tari + Cele mai contactate tari + Cele mai contactate domenii + Cele mai blocate aplicatii + Cele mai permise aplicatii + Cele mai blocate domenii + Cele mai contactate IP-uri + Cele mai blocate IP-uri + Cele mai blocate tari Pornește Rethink pentru a începe Valoarea nu e validă Numărul nu e valid @@ -1055,7 +1055,7 @@ Ai utilizat Rethink de %1$s days, care înseamnă un cost de utilizare de $%2$s. Consideri oportună o sponsorizare pentru susținerea dezvoltării sale? Utilizează DNS de sistem pentru domenii nedelegate Utilizează DNS de sistem pentru domenii nedelegate precum .lan, .internal, etc. - filtrare + Filtrare DNS ramificat (experimental) Redirecționează cererile DNS de la aplicațiile care folosesc proxy către serverele DNS proxy. Blochează toate conexiunile la localhost @@ -1114,8 +1114,8 @@ Adaugă / Elimină releu Termeni serviciu Verificările de accesibilitate ocolesc toate restricțiile de rețea. În modul Auto, Rethink utilizează la întâmplare IP-uri și nume-gazdă conectate anterior. - cei mai contactați ISP - cei mai blocați ISP + Cei mai contactați ISP + Cei mai blocați ISP Introdu numele pachetelor (separate prin virgulă) admise să pornească sau să oprească Rethink. Instructiuni:\n Extras cerute la transmitere:\n • Key: expeditor\n • Value: Numele de pachet al aplicației solicitante\n\n Exemplu: key:expeditor value:com.termux\n\n Acțiuni suportate:\n • Start VPN – com.celzero.bravedns.intent.action.VPN_START\n • Stop VPN – com.celzero.bravedns.intent.action.VPN_STOP Introdu numele de pachet (example: net.dinglisch.android.taskerm) @@ -1123,7 +1123,7 @@ Oferă detalii ISP-ului pentru website-uri de la rethinkdns.com, cu sprijinul %1$s Automatizare Configurează aplicațiile care pot porni sau opri Rethink. - top conexiuni active + Top conexiuni active Încarcă tot Închide conexiunile Închizi toate conexiunile pentru %1$s? diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fc60e69a2..e55feb10b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -5,11 +5,11 @@ Ссылки Приложения Настройки - защищено с помощью tor и приватного dns + защищено с помощью tor и персонального DNS Брандмауэр Порт Orbot - включен приватный DNS + частные днс включены ПАУЗА Универсальные правила Приложение @@ -23,7 +23,7 @@ Легко настраиваемый DNS и брандмауэр исключить СТОП - приложение + Приложение Настройка TCP Внешний вид @@ -32,27 +32,27 @@ Общее Главная блокировать - Защищено с помощью прокси и персонального dns + защищено с помощью прокси и персонального dns DNS https://docs.rethinkdns.com/ Имя хоста - защищено http-прокси и приватного dns + защищено http-прокси и персональным DNS ПРОДОЛЖИТЬ - правила + Правила Остановить Установить RDNS Plus - Подключен к RethinkDNS + Подключен к Re-RethinkDNS Система изолировать Предупреждение: Rethink был деактивирован DNS + Брандмауэр Внешний вид - тип + Используемый DNS Ничего Пропустить неотслеживаемый - vpn + VPN защищено с помощью tor защищено http-прокси Авторы @@ -60,16 +60,16 @@ Rethink использует службу специальных возможностей для обнаружения и блокирования фоновых приложений. Rethink не собирает и не продает какую-либо информацию. RethinkDNS — это самый простой способ обходить интернет-цензуру, отслеживать и блокировать сетевую активность приложений на вашем Android устройстве. О приложении - Далее + Следующий Свободный и с открытым исходным кодом ожидание dns-сервер не работает защищено прокси - RethinkDNS + Re-Rethink rethink Настройки Обнаружение и блокировка угроз сетевой безопасности - Готово + Закончить Rethink — это программное обеспечение с открытым исходным кодом, поддерживаемое программой MVP Mozilla Builders, FOSS United Foundation. Защищен! Подключен к DNS + брандмауэр. сплю… @@ -78,7 +78,7 @@ Защищено! Подключен к быстрому и безопасному DNS. Защищено! Подключен к брандмауэру. Приостановлен! Заблокированные приложения по-прежнему защищены брандмауэром. - защищено с помощью socks5 и приватного dns + защищено с помощью socks5 и персонального DNS защищено ошибка приложения ошибка dns @@ -246,6 +246,7 @@ добавить fav_icon Удалить все сетевые журналы\? + Остановка… Авторы Удалить резолвер DNSCrypt\? Удалить DNS-прокси из сохраненной конфигурации. @@ -360,7 +361,7 @@ Новое приложение Обход DNS Прокси-сервер DNS - Для этого соединения нет правил брандмауэра. + Никакие правила брандмауэра не соответствуют этому соединению. приложение при попытке подключения в сети Metered.

Для изменения перейдите на вкладку Все приложения.]]> приложение при попытке подключения в сети Metered (Mobile).

Для изменения перейдите на вкладку Universal.]]> Невозможно изменить режим когда VPN заблокирован. Нажмите для<u>изменения настроек VPN</u>. @@ -422,7 +423,7 @@ блокируется в (мобильных) сетях с тарификацией В этой категории нет журналов сети. исключен из dns и брандмауэра - изолировано; разрешено только доверенным IP и доменам + изолирован; разрешено только доверенным IP Системный DNS Загрузка не удалась. Попробуйте еще раз. Загрузка списка блокировки @@ -473,8 +474,8 @@ \nНет:\nНе показывает кнопку.\n обходит универсальные правила брандмауэра Включить режим брандмауэра. - Документация - Twitter + Читать документацию + Посетите нашу страницу в Twitter блокируется в сетях без тарификации (wifi) Информация о приложении не найдена Включить разрешение на уведомления на экране Настройки @@ -490,9 +491,9 @@ Rethink — это самый простой способ обходить интернет-цензуру, отслеживать и блокировать сетевую активность приложений на вашем Android устройстве. Отправить письмо При включении этой функции, Rethink перехватывает все пакеты на 53-м порту и перенаправляет их на заданную пользователем конечную точку DNS - Сайт - FAQ - Почта + Посетите rethinkdns.com + Просмотреть часто задаваемые вопросы + Отправьте нам электронное письмо Параметры уведомлений Rethink поддерживается благодаря Mozilla Builders, FOSS United Foundation, FLOSS/fund. Поехали @@ -513,7 +514,7 @@ \n \nНомер порта: %2$s ]]> - Блокировать, если приложение неизвестно + Блокировать, когда исходное приложение неизвестно Имя доверенного лица Установленные Исключено @@ -638,8 +639,8 @@ Отправить письмо Сообщить об ошибке Не удалось получить лог файл сбоя. Вы хотите вручную сообщить о ошибке\? - GitHub - Конфиденциальность + Внесение вклада на GitHub’е + Ознакомиться с политикой конфиденциальности О приложении Профиль VPN Что нового в %1$s @@ -800,7 +801,7 @@ Блокировка вредоносного ПО, фишинга, программ-вымогателей, криптософта и прочих угроз. Блокировка вредоносного ПО, привлекающего внимание, программ шпионов и программ-страшилок. Списков блокировок: %1$s - Не удалось запустить настройки приватного dns. + Не удалось отправить настройки персонального DNS. Очистить журналы Статистика Изменить язык @@ -827,17 +828,17 @@ Изолировать перечисленные приложения\? T Доверять - Чаще всего разрешаемые приложения - Часто блокируемые приложения - самые посещаемые домены - Часто блокируемые домены + Самые разрешаемые приложения + Самые блокируемые приложения + Самые посещаемые домены + Самые блокируемые домены Запустите Rethink, чтобы продолжить Показать все Выберите предпочтительный язык Помогите перевести это приложение - Часто блокируемые IP + Самые блокируемые IP Доверенный - самые встречающиеся ip + Самые встречающиеся IP Домен (приложение) Отмена Применить @@ -864,7 +865,7 @@ Выкл. (по умолчанию) Вывод в Logcat Вывод в папку загрузок - обходит правила dns и брандмауэра + обходит правила DNS и брандмауэра %1$s универсальное(ых) правил(а) %1$s правил(а) домена %1$s подключения(й) @@ -966,13 +967,13 @@ Слушать порт выбрать все Активно - Выключено + Деактивировано SOCKS5 HTTP HTTPS & SOCKS5 быстро медленно - Правила для приложений + Правила для каждого приложения сек мин Постоянно активированный @@ -982,14 +983,14 @@ Публичный ключ скопирован. Показать первые 20,000 символов Не проверять TLS-сертификаты сервера (включайте только если знаете, что делаете) - IP и доменные правила для приложений + IP на каждое приложение / Правила домена Универсальные правила брандмауэра - Настройка IP и доменных правил для приложений. + Изменение IP для каждого приложения / Правил домена. Проксировано
Чтобы изменить зайдите в Proxy из меню Настроить.]]> Все правила домена были удалены - большинство связываемых стран - большинство заблокированных стран + Большинство связываемых стран + Большинство заблокированных стран : Ключи WireGuard в base64 должны иметь 44 символа (32 байта) : Ключи WireGuard должны занимать 32 байта : Ключи WireGuard в hex должны иметь 64 символа (32 байта) @@ -1050,6 +1051,8 @@ Loopback (экспериментальный) Проверки подключений отправляются для определения достижимости. Маршрутизация собственного трафика через туннель. Если вы не знаете что делаете, выключите его. + Также включает настройку %1$s Вы хотите продолжить? + Loopback (экспериментальный) Изменить правило домена Маршрутизация всех приложений Отредактировано @@ -1075,12 +1078,12 @@ Когда этот параметр отключен, приложения для пересылки прокси-серверов (SOCKS5, HTTP, DNS) исключаются из VPN-туннеля Rethink. Обход приложения со всех прокси-серверов Это приложение обходит прокси-серверы - Уведомление + уведомление Rethink испытывает нехватку памяти. Системные действия могут быть ограничены. %1$s может привести к потере подключения. Измените настройки, чтобы разрешить Rethink использовать данные и другие ресурсы в фоновом режиме. Невыбранный тест - Протоколы + протос (эксперементально) Релеи Вручную @@ -1091,8 +1094,8 @@ Блокируйте рекламу и вредоносы с помощью DNS Выбирайте из 190+ списков, чтобы остановить рекламу, трекеры и вредоносное ПО. нет подключения к сети - Платная мобильная сеть - Рассматривать только мобильные сети как платные, остальные - как не платные. + измерить мобильные сети + Рассматривайте мобильные сети только как платные, остальные - как не платные. светлая plus тёмная plus Биометрическая аутентификация @@ -1106,6 +1109,8 @@ Фильтрация Разделенный DNS (экспериментальный) Перенаправляйте DNS-запросы из прокси-приложений на DNS-серверы прокси-сервера. + Относитесь к правилам DNS как к правилам брандмауэра (экспериментально) + Блокировка DNS будет обойдена во время разрешения; решение будет принято во время подключения. Блокировка всех локальных подключений приватный DNS Обход прокси @@ -1127,7 +1132,7 @@ Выбирайте из различных методов антицензуры. Более короткий TCP keep alive Быстро закрывать TCP-сокеты без какой-либо активности в последнее время. - Антицензура + антицензура Инструменты антицензуры могут обеспечить свободу в интернете, но они могут работать не везде. Используется только при подключению не через прокси. Не изменять пакеты. При необходимости изменять пакеты. @@ -1137,7 +1142,7 @@ Изменять TCP или TLS пакеты. Рассинхронизация При необходимости отправляйте пакеты-приманки. - Стратегия + стратегия Укажите, как будут работать повторные попытки для подключений с цензурой. В случае неудачи никогда не повторяйте попыток борьбы с цензурой. При необходимости применять методы антицензуры. @@ -1157,10 +1162,10 @@ только мобильный Использовать этот VPN WireGuard только при передаче по мобильной связи. Добавить / Удалить relay - Условия + Условия использования Проверки доступности обходят все сетевые ограничения. В режиме Авто Rethink случайным образом использует ранее подключенные IP-адреса и имена хостов. - Популярные провайдеры - Часто блокируемые провайдеры + Самые соеденяемые провайдеры + Самые блокируемые провайдеры Введите имена пакетов (через запятую), которым разрешено запускать или остановливать Rethink. Инструкции:\n Обязательные дополнительные услуги в трансляции:\n • keK: sender\n • Value: имя пакета вызывающего приложения.\n\n Пример: key:sender value:com.termux\n\n Поддерживаемые действия:\n • Запустить VPN – com.celzero.bravedns.intent.action.VPN_START\n • Остановить VPN – com.celzero.bravedns.intent.action.VPN_STOP Введите имя пакета (пример: net.dinglisch.android.taskerm) @@ -1168,7 +1173,7 @@ Получает данные провайдеров для веб-сайтов с сайта rethinkdns.com, работающего на %1$s Автоматизация Настройте приложения, которые могут запускать или останавливать Rethink. - самые активные соеденения + Самые активные соеденения Загрузить все закрыть соеденения Закрыть все соединения за %1$s? @@ -1218,8 +1223,8 @@ Нельзя использовать сразу оба %1$s и %2$s Включено когда сеть Wi-Fi (%2$s) равен %3$s, тогда этот VPN WireGuard %1$s. Введите название сети Wi-Fi (%1$s) - Совпадает точно - Совпадает частично + Точно + Частично Идентификаторы Wi-Fi (%1$s) должны быть до 32 символов. Удалить %1$s? Программа стабилизации @@ -1236,18 +1241,4 @@ Всегда лимитированное Теперь вы участник программы тестирования экспериментальных функций. Обозначать VPN-туннель Rethink как лимитированное подключение, чтобы сократить трафик от приложений. Внимание: может привести к проблемам с загрузкой больших файлов, таких как резервные копии. - Искать по событиям и сообщениям - Выберите файлы, которые вы хотите включить в отчёт об ошибках - Снять выделение - Пожалуйста, выберите хотя бы один файл - Создание архива… - Файл не найден - Невозможно открыть этот тип файла - Вы уверены что хотите удалить \"%1$s\"? - Файл «%1$s» удалён - Не удалось удалить «%1$s» - Нету файлов отчетёв об ошибках - Разрешённые типы записей DNS - Выберите, какие типы записей ресурсов DNS разрешить. - Авто (Все типы) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index ca9ff2400..0b546870a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -13,7 +13,7 @@ Doména Divoká karta (*) Vyžaduje sa akcia - pravidlá + Pravidlá Nastaviť bezpečnostné záznamy sieť @@ -93,7 +93,7 @@ chránený s Wireguardom chránený s Wireguardom a súkromným DNS súkromne DNS je zapnuté - Pripojený s RethinkDNS + Pripojený s Re-RethinkDNS Pripojený s Firewalom Pripojený s RethinkDNS a Firewalom POKRAČOVAŤ @@ -226,7 +226,7 @@ Firewall DNS a Firewall (predvolené) VPN - vpn + VPN IP adresa skopírovaná. URL skopírované Verejný kľúč skopírovaný. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index d88097cd4..4cd4b031c 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -181,7 +181,7 @@ DNS (чувар батерије) Заштитни зид DNS и заштитни зид (подразумевано) - vpn + VPN IP адреса је ископирана. URL је ископиран Јавни кључ је ископиран. @@ -339,8 +339,8 @@ Тема: %1$s Није могуће паузирање: Rethink није активан Оптимизација батерије - правила - врста + Правила + Врста Други DNS Rethink DNS %1$s уноси » @@ -363,16 +363,16 @@ Пошаљи е-поруку Извештај о грешки Није успело сакупљање записа о грешки. Да ли желите да ручно пријавите ваш проблем? - везе + Везе Посети rethinkdns.com Допринеси на GitHub-у Погледај ЧПП Прочитај документацију Прочитај полису приватности Спонзориши - апликација + Апликација Пошаљи нам е-поруку - системске + Системске Информације о апликацији VPN профил Подешавања обавештења @@ -665,13 +665,13 @@ Прављење копије је завршено Враћање није успело; покушај поново %1$s блок листи - нејвише дозвољених апликација - највише блокираних апликација - највише контактираних домена + Нејвише дозвољених апликација + Највише блокираних апликација + Највише контактираних домена 280+ локација; висока поузданост; разрешивач се извршава на cloudflare.com Спаја захтеве, кешира одговоре, отпорно решавање грешака - највише контактираних ip-јева - највише блокираних земаља + Највише контактираних ip-јева + Највише блокираних земаља Покрени Rethink за наставак Прикажи све Неисправан кључ @@ -817,7 +817,7 @@ %1$s може резултирати у губитку конекције. Промените подешавање да би сте дозволили Rethink-у да користи податке и друге ресурсе када је у позадини. Rethink је најлакши начин за надгледање активности апликације, заобилажења цензуре интернетам, и блокирање интернета апликацијама на вашем Андроид уређају. Пошаљи е-поруку - контактирај + Контактирај Није било могуће покренути информације о апликацији. Релеји Није било могуће покренути екран са обавештењем апликације. @@ -936,10 +936,10 @@ Ниј могуће направити копију. Покушати поново? Враћање завршено, поновно покретање апликације… Поново покушај враћање - највипе контактираних земаља - највише блокираних ip-јева + Највипе контактираних земаља + Највише блокираних ip-јева Непознати атрибут - највише блокираних домена + Највише блокираних домена Неисправна вредност Недостаје атрибут Грешка у синтакси diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index ea67be27c..2db43ed64 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -8,7 +8,7 @@ மிகவும் தனிப்பயனாக்கக்கூடிய டிஎன்எச் மற்றும் ஃபயர்வால் டிஎன்எச் அமைப்புகள் - "மறுபரிசீலனை டிஎன்எஸ்" + Re-Rethink மறுபரிசீலனை பற்றி அமைப்புகள் @@ -826,7 +826,7 @@ ஃபயர்வால் டி.என்.எச் மற்றும் ஃபயர்வால் (இயல்புநிலை) Vpn - vpn + VPN பொது விசை நகலெடுக்கப்பட்டது. Rdns+ dns-over-https முகவரி ஆக நகலெடுக்கப்பட்டது டி.என்.எச் மற்றும் ஃபயர்வால் பதிவுகளை உள்நாட்டில் சாதனத்தில் சேமிக்கவும். diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index eb196118b..f837cb7a4 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -62,7 +62,7 @@ ข้อผิดพลาดของแอป แอปพลิเคชั่น VPN - vpn + VPN คัดลอกคีย์สาธารณะแล้ว เลือกโหมด วันนี้ @@ -370,7 +370,7 @@ ได้รับการปกป้องด้วยพร็อกซี HTTP ได้รับการปกป้องด้วยพร็อกซี ได้รับการปกป้องด้วย wireguard และ dns ส่วนตัว - เชื่อมต่อกับ RethinkDNS + เชื่อมต่อกับ Re-RethinkDNS เชื่อมต่อกับไฟร์วอลล์ ประวัติย่อ หยุดชั่วคราว diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml index db2696452..b9cbdd61c 100644 --- a/app/src/main/res/values-tl/strings.xml +++ b/app/src/main/res/values-tl/strings.xml @@ -20,7 +20,7 @@ Dominyo Wildcard Kailangan ng Aksyon - mga patakaran + Mga patakaran I-configure tala Mga Patakaran sa IP @@ -60,7 +60,7 @@ error ng aplikasyon hindi nasusundan Lusutan ang DNS at firewall - Paalala: Na-deactivate na ang RethinkDNS + Paalala: Na-deactivate na ang Re-RethinkDNS Pindutin upang baguhin ang mga setting ng proteksyon Nakasegurong nakakabit sa mabilis at ligtas na DNS. Nakaseguro! Nakakonekta sa Firewall. @@ -71,7 +71,7 @@ DNS Mga Patakaran sa Network Private DNS ay pinagana - Nakakonekta sa RethinkDNS + Nakakonekta sa Re-RethinkDNS Nakakonekta sa Firewall hindi protektado Nakakonekta sa RethinkDNS at Firewall diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 647b4e706..26cfc9983 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -16,7 +16,7 @@ Koruma ayarını değiştirmek için dokunun Korunuyor! Hızlı ve Güvenli DNS\'e Bağlandı. Korunuyor! Güvenlik Duvarına Bağlandı. - RethinkDNS + Re-Rethink Korunuyor! DNS ve Güvenlik Duvarına Bağlandı. Ayarlar Ağ güvenliği tehditlerini tespit edin ve engelleyin @@ -91,7 +91,7 @@ Bağlantı noktası IP sürümünü seçin Etkinleştiriliyor… - iletişim + Iletişim Yenilikler %1$s E-posta sağlayıcısını seçin DNSCrypt Çözümleyici veya Aktarıcı Ekleme @@ -164,7 +164,7 @@ E-posta gönder Katkıda bulunanlar Bağlandı. %1$s kullanımdaki blok listeleri - yeniden yükle + Yeniden yükle IP / Bağlantı Noktası (Uygulama) Kaynak Bilinmiyor DNS Bypass Edildi @@ -249,7 +249,7 @@ Şu anki tema: %1$s Yenilikler E-posta gönder - app, uygulama + App, uygulama VPN profili başlatılamadı. +%1$s Diğer IP\'ler Hariç tutulan @@ -395,7 +395,7 @@ DNS Vekil Sunucusu silinsin mi\? Uygulamaları, IP\'leri, alan adlarını arayın VPN - vpn + VPN %1$s\'a bağlandı. Devam etmek için kapatın. Sunucu adı Hiçbiri @@ -484,7 +484,7 @@ izole edilmiş Devam Et rethinkdns.com adresini ziyaret edin - sistem + Sistem Özel DNS Proxy Harici Port aralığı 1024-65535 arasında olmalıdır @@ -508,7 +508,7 @@ Otomatik Hiçbiri Proxy kaldırıldı - kurallar + Kurallar Blok listesi güncellemeleri hakkında bilgi istemi Telegram %1$s + %2$s diğer uygulama(lar) @@ -577,7 +577,7 @@ Bir şeyler ters gitti. Daha sonra tekrar deneyin! DNSCrypt çözümleyici silindi. Bu özelliği kullanmak için gereken engelleme listeleri (~60MB) indirilsin mi\? - tür + Tür İsteyen uygulamaların bütün kullanılabilir ağlara bağlanmasına izin verin. Bu uygulamalar Rethink’in VPN tünelini isteğe bağlı olarak atlayabilir. Zoom ve Meet gibi bazı sesli/görüntülü konferans uygulamalarının düzgün çalışması için gerekebilir. Uygulamanın yeni sürümü web sitesinden indirilebilir. Devam etmek istiyor musunuz\? Zaten en son sürümü kullanıyorsunuz. @@ -678,7 +678,7 @@ ]]> Özel Sunucu URL\'si Her üç günde bir blok listesi güncellemelerini kontrol edin - bağlantılar + Bağlantılar Hata raporu Yakalanıyor… Gizlilik @@ -801,7 +801,7 @@ Dikkat yazılımlarını, casus yazılımları, korkutucu yazılımları engelleyin. Kötü amaçlı yazılımları, fidye yazılımlarını, kripto yazılımlarını, kimlik avcılarını ve diğer tehditleri engelleyin. %1$s engel listesi - kurallar + Kurallar Engelle, bu uygulama için alan adlarına güven Belki Engellendi Yapılandır @@ -896,7 +896,7 @@ Gelişmiş DNS filtreleme (deneysel) QR kod %1$s yalnızca Rethink\'in DNS\'si ile çalışır - en çok i̇leti̇şi̇me geçi̇len i̇p\'ler + En çok i̇leti̇şi̇me geçi̇len i̇p\'ler Güvenilir IP\'ler hariç tümünü engelleyin. Uygulama başına IP / Etki alanı kurallarını değiştirin. HTTPS & SOCKS5 @@ -905,7 +905,7 @@ : WireGuard base64 anahtarları 44 karakter (32 bayt) olmalıdır Evrensel güvenlik duvarı kurallarını atlayın. DNS %1$s adresine yönlendirildi. - en çok engellenen IP\'ler + En çok engellenen IP\'ler Ölçülmemiş (WiFi) ağda İzin Ver / Engelle. Biyometrik kimlik doğrulama bu cihazda desteklenmiyor veya devre dışı bırakılmış Uygulamaları hariç tut @@ -931,7 +931,7 @@ Güvenlik Duvarı %1$s sorgular alan adı Güvenilir alan adı olarak ayarlandı. Değiştirmek için Uygulamaya Özel Güvenlik Duvarı ekranına gidin.]]> - en çok iletişim kurulan alan adları + En çok iletişim kurulan alan adları gün hızlı Bilinmeyen hata @@ -946,9 +946,9 @@ listelenen uygulamalarını izole edin\? Tüm uygulamaları dahil et DNS Sunucuları - en çok iletişim kurulan ülkeler + En çok iletişim kurulan ülkeler Herhangi bir DNS isteğini engellemez. Cloudflare\'in 1.1.1.1 DNS uç noktasını kullanır. - en çok engellenen ülkeler + En çok engellenen ülkeler uygulama başına Engelle, bu alan adına güven Alan adı (Univ) @@ -986,7 +986,7 @@ Alan adı (Uygulama) Kapalı (varsayılan) VPN yalnızca DNS modunda çalışırken proxy\'ler kurulamıyor. - en çok engellenen alan adları + En çok engellenen alan adları tümünü seç alan adı kullanıcının tercih ettiği DNS tarafından engellendi. Bu davranışı değiştirmek için DNS Yapılandır sekmesine gidin.]]> Yetişkin filtresi, tüm yetişkin, pornografik ve açık sitelere erişimi engeller. Proxy veya VPN\'leri, karışık içerikli siteleri engellemez. Reddit gibi sitelere izin verir. Google ve Bing Güvenli Mod\'a ayarlanmıştır. @@ -1111,7 +1111,7 @@ Rethink\'i %1$s gündür kullanıyorsunuz, bu da $%2$s kullanım maliyetine denk geliyor. Gelişimini sürdürmek için sponsor olmayı düşünür müsünüz? Yetkisiz alanlar için Sistem DNS\'i kullan .lan, .internal gibi yetkisiz alanlar için Sistem DNS\'i kullan. - filtreleme + Filtreleme Bölünmüş DNS (deneysel) Proxy kullanan uygulamaların DNS sorgularını proxy\'nin DNS sunucularına yönlendir. Tüm yerel ana bilgisayar bağlantılarını engelle @@ -1172,8 +1172,8 @@ Aktarım Ekle / Kaldır Hizmet Şartları Erişilebilirlik kontrolleri tüm ağ kısıtlamalarını atlar. Otomatik modda, Rethink daha önce bağlandığı IP\'leri ve ana bilgisayar adlarını rastgele kullanır. - en çok iletişime geçilen sağlayıcılar - en çok engellenen sağlayıcılar + En çok iletişime geçilen sağlayıcılar + En çok engellenen sağlayıcılar Rethink\'i başlatmasına veya durdurmasına izin verilen paket adlarını girin (virgülle ayrılmış). Talimatlar:\n Yayında gerekli ekstralar:\n • Anahtar: sender\n • Değer: Çağıran uygulamanın paket adı\n\nÖrnek: anahtar:sender değer:com.termux\n\n Desteklenen eylemler:\n • VPN Başlat – com.celzero.bravedns.intent.action.VPN_START\n • VPN Durdur – com.celzero.bravedns.intent.action.VPN_STOP Paket adını girin (örnek: net.dinglisch.android.taskerm) @@ -1181,7 +1181,7 @@ Web siteleri için hizmet sağlayıcı bilgilerini rethinkdns.com\'dan alır, %1$s tarafından desteklenir Otomasyon Rethink\'i başlatabilecek veya durdurabilecek uygulamaları yapılandırın. - en aktif bağlantılar + En aktif bağlantılar Tümünü Yükle Bağlantıları Kapat %1$s için tüm bağlantıları kapatmak ister misiniz? diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 6c56970fb..bcce235de 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -19,7 +19,7 @@ Захищено! Підключено до Брандмауера. Зупинити Налаштуваннях - RethinkDNS + Re-Rethink rethink DNS та брандмауер, що легко налаштовуються Rethink запускає VPN у режимі Блокування. Його зупинка призведе до втрати підключення до Інтернету для цього профілю користувача. Ви все одно хочете продовжити\? @@ -51,7 +51,7 @@ захищено проксі ввімкнено приватний dns не захищено - Підключено до RethinkDNS + Підключено до Re-RethinkDNS Підключено до Брандмауера Підключено до RethinkDNS та Брандмауера ПРОДОВЖИТИ @@ -130,7 +130,7 @@ Відмовлено в підключенні до мережі для застосунку Застосунок призупинено! Застосунок у стані паузи, відновити, щоб продовжити - Повідомляти, коли Android або інший VPN-застосунок зупиняє RethinkDNS + Повідомляти, коли Android або інший VPN-застосунок зупиняє Re-RethinkDNS Системні застосунки Немає такого застосунку Інформація про застосунок відсутня. Можливо, цей застосунок було видалено\? @@ -166,7 +166,7 @@ Інформація про застосунок не знайдено Тема: %1$s Rethink — це найпростіший спосіб відстежувати активність застосунків, обходити інтернет-цензуру та брандмауери на вашому пристрої Android. - застосунок + Застосунок Інформація про застосунок Перекласти Відсутнє @@ -313,8 +313,8 @@ Правила застосовуються лише до цього застосунку. домен встановлено як довірений домен.

Щоб змінити, перейдіть на екран Брандмауер для конкретного додатка.]]> RethinkDNS заблокував новий застосунок %1$s . Натисніть, щоб переглянути або змінити. - найбільш дозволені застосунки - найбільш заблоковані застосунки + Найбільш дозволені застосунки + Найбільш заблоковані застосунки Вимкнути Постійно ввімкнений VPN Перейти до налаштуваннях Постійно ввімкнений VPN @@ -433,7 +433,7 @@ Спонсорувати Блокувати UDP, крім DNS та NTP Правила IP та портів - посилання + Посилання допомога та зворотний зв\'язок Блокувати у разі обходу DNS Зміна заблокованих та довірених правил для доменів, IP чи портів. @@ -444,7 +444,7 @@ Читати політику конфіденційності Відвідайте вебсайт Звіт про помилку - зв\'язок + Зв\'язок Telegram Переглянути ЧаПи Зробити внесок на GitHub @@ -456,21 +456,21 @@ Виберіть бажану мову DNS проксі Вибрати резервний DNS - найбільш контактуючі ip + Найбільш контактуючі ip Підключенно до %1$s - найбільш заблоковані ip + Найбільш заблоковані ip Встановити HTTP(S) ПІДКЛЮЧЕННЯ проксі - найбільш контактуючі домени + Найбільш контактуючі домени Логування DNS запитів вимкнено. Для повторного увімкнення перейдіть у Налаштування та увімкніть Увімкнути логування на пристрої. Пошук застосунків за назвою Виберати версію IP - найбільш контактуючі країни - найбільш заблоковані країни + Найбільш контактуючі країни + Найбільш заблоковані країни У рідкісних випадках, коли бажаний користувачем DNS неможливо встановити, використовується резервний DNS. DNSCrypt Блоклисти на пристрої вже мають останню версію v%1$s. DNSCrypt: %1$s розв\'язувачів імен (розв\'язуют доменні імена в IP-адреси) - найбільш заблоковані домени + Найбільш заблоковані домени DNS через HTTPS Показати усе Нове оновлення! @@ -484,7 +484,7 @@ Оновлення неможливо виконати зараз, будь ласка, спробуйте пізніше. Пошук доменів Неможливо оновити зараз - vpn + VPN Ви вже використовуєте останню версію. Пошук IP Актуально! @@ -541,7 +541,7 @@ Стан Вилучити HTTP3 - тип + Тип Невідома помилка Захищено! Підключений до DNS + брандмауер + проксі. Інший DNS @@ -694,7 +694,7 @@ Користувкий DNS-проксі Ім\'я хосту порожнє Помилка з\'єднання з host-вузлом. Спробуйте ще раз. - система + Система Почнемо Резолвер Діапазон портів повинен бути від 1024-65535 @@ -837,7 +837,7 @@ Не вдається призупинити: Rethink неактивнен Rethink потрібен дозвіл для налаштування локального VPN-сервісу та шифрування запитів DNS з вашого пристроя, розгортання мережевого монітора та забезпечення функціонування фаєрволу. \n\nRethink не збирає жодних даних і жодним чином не шпигує за вами. %1$s може призвести до втрати підключення. Змініть налаштування, щоб дозволити Rethink використовувати дані та інші ресурси у фоновому режимі. - правила + Правила %1$s записів Доменні правила Блоклисти пристроя @@ -1074,7 +1074,7 @@ Ви користуєтеся Rethink протягом %1$s днів, що перекладається як вартість використання $%2$s. Чи розглядаєте ви можливість спонсорування для підтримки його розвитку? Використовувати системний DNS для неделегованих доменів Використовуйте системний DNS для неделегованих доменів, таких як .lan, .internal, тощо. - фільтрація + Фільтрація Розділений DNS (експериментальний) Пересилати DNS-запити від проксі-програм на DNS-сервери проксі-сервера. Блокувати всі підключення до локального хоста @@ -1130,8 +1130,8 @@ Додати /Вилучити реле Умови надання послуг Перевірки досяжності обходять усі мережеві обмеження. В режимі Auto Rethink випадковим чином використовує раніше підключені IP-адреси та імена хостів. - найчастіше контактовані постачальники - більшість заблокованих провайдерів + Найчастіше контактовані постачальники + Більшість заблокованих провайдерів Введіть назви пакетів (розділені комами), яким дозволено запускати або зупиняти Rethink. Інструкції:\nНеобхідні додаткові елементи в трансляції:\n• Ключ: відправник\n• Значення: Назва пакета програми, що викликає\n\nПриклад: ключ: відправник значення: com.termux\n\nПідтримувані дії:\n• Запустити VPN – com.celzero.bravedns.intent.action.VPN_START\n• Зупинити VPN – com.celzero.bravedns.intent.action.VPN_STOP Введіть назву пакета (приклад: net.dinglisch.android.taskerm) @@ -1139,7 +1139,7 @@ Отримує інформацію про постачальників послуг для веб-сайтів з rethinkdns.com, що працює на %1$s Автоматизація Налаштуйте програми, які можуть запускати або зупиняти Rethink. - найактивніші з\'єднання + Найактивніші з\'єднання Завантажити все Тісні зв\'язки Закрити всі з’єднання для %1$s? diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index b3fedcb38..de475db50 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -1,6 +1,6 @@ - ریتھینک ڈی این ایس + Re-Rethink کے بارے میں ترتیبات اعدادوشمار diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 20a906217..6fa24f208 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -63,7 +63,7 @@ đang chờ máy chủ dns ngừng hoạt động "đã được bảo vệ bởi proxy & dns riêng tư" - Đã kết nối với RethinkDNS + Đã kết nối với Re-RethinkDNS NGƯNG DNS Tất cả những điều trên + bỏ qua kiểm duyệt Internet. @@ -155,7 +155,7 @@ Tường lửa DNS và Tường lửa (mặc định) VPN - vpn + VPN Đã sao chép địa chỉ IP. Đã sao chép URL Bật ghi nhật ký trên thiết bị @@ -263,7 +263,7 @@ bị chặn không rõ Không tìm thấy thông tin ứng dụng - Mở khoá RethinkDNS + Mở khoá Re-RethinkDNS Sử dụng xác thực sinh trắc học để mở khóa Rethink Lỗi xác thực sinh trắc học ứng dụng %1$s @@ -289,7 +289,7 @@ Thiết lập Tor-as-a-Proxy (Orbot) chỉ bằng một cú nhấp. Rethink đã ngừng chuyển tiếp kết nối tới Orbot, nhưng Orbot có thể đang chạy nền. Rethink được thiết lập để chuyển tiếp các truy vấn DNS tới Orbot. Thay đổi theo yêu cầu. - Orbot là ứng dụng proxy miễn phí hỗ trợ các ứng dụng khác sử dụng Internet an toàn hơn. \nOrbot sử dụng Tor để mã hóa lưu lượng truy cập Internet giúp bạn vượt qua kiểm duyệt và chống lại các hình thức giám sát mạng đe dọa quyền tự do và quyền riêng tư cá nhân. \nTCP Proxy: RethinkDNS chỉ chuyển tiếp các kết nối TCP của tất cả trừ các ứng dụng bị loại trừ tới Orbot. \nProxy HTTP: RethinkDNSđặt proxy HTTP nhưng không bắt buộc các ứng dụng phải sử dụng nó. Thông thường, các trình duyệt như Chrome và Firefox sử dụng nó. Các ứng dụng sử dụng proxy HTTP(S) sẽ bỏ qua cả quy tắc Tường lửa và DNS. + Orbot là ứng dụng proxy miễn phí hỗ trợ các ứng dụng khác sử dụng Internet an toàn hơn. \nOrbot sử dụng Tor để mã hóa lưu lượng truy cập Internet giúp bạn vượt qua kiểm duyệt và chống lại các hình thức giám sát mạng đe dọa quyền tự do và quyền riêng tư cá nhân. \nTCP Proxy: RethinkDNS chỉ chuyển tiếp các kết nối TCP của tất cả trừ các ứng dụng bị loại trừ tới Orbot. \nProxy HTTP: Re-RethinkDNSđặt proxy HTTP nhưng không bắt buộc các ứng dụng phải sử dụng nó. Thông thường, các trình duyệt như Chrome và Firefox sử dụng nó. Các ứng dụng sử dụng proxy HTTP(S) sẽ bỏ qua cả quy tắc Tường lửa và DNS. Tắt proxy HTTP(S) và/hoặc SOCKS5 để tiếp tục thiết lập Tor-as-a-proxy. Khi bật nguồn thiết bị, khởi động Rethink nếu nó vẫn đang chạy trước khi tắt máy. Khi được bật, Rethink sẽ sử dụng tất cả các mạng khả dụng để kết nối với Internet. Nếu không, nó sẽ sử dụng bất kỳ mạng nào được Android coi là đang hoạt động. @@ -309,7 +309,7 @@ bỏ qua các quy tắc tường lửa phổ quát Xác thực sinh trắc học không được hỗ trợ hoặc bị tắt trên thiết bị này Kích hoạt chế độ tường lửa. - quy tắc + Quy tắc Cấu hình bỏ qua phổ quát bỏ qua dns & tường lửa @@ -343,7 +343,7 @@ Kích hoạt RDNS+ Đang đóng… Đang bật… - loại + Loại Quy tắc tên miền Đóng góp trên GitHub DoH @@ -406,7 +406,7 @@ hello@celzero.com Cài đặt thông báo Rethink DNS - quy tắc + Quy tắc %1$s mục » Tác giả Chọn từ hơn 195 danh sách chặn. Nhấn vào đây để tải xuống hoặc định cấu hình danh sách chặn. @@ -422,18 +422,18 @@ Báo cáo lỗi Gửi email Xem câu hỏi thường gặp - liên hệ + Liên hệ Gửi email cho chúng tôi Gửi email - liên kết + Liên kết Báo cáo lỗi Truy cập rethinkdns.com Đọc chính sách bảo mật Lỗi khi tải tệp nhật ký DoH %1$s Nhà tài trợ - ứng dụng - hệ thống + Ứng dụng + Hệ thống Thông tin ứng dụng Có gì mới trong %1$s Nội bộ @@ -503,7 +503,7 @@ Không rõ Ghi chú Không tìm thấy quy tắc tường lửa nào - tải lại + Tải lại (ngẫu nhiên) MTU SOCKS5 @@ -842,7 +842,7 @@ Giá trị không hợp lệ Khóa không hợp lệ Khởi động Rethink để tiếp tục - các quốc gia bị chặn nhiều nhất + Các quốc gia bị chặn nhiều nhất Các IP bị chặn nhiều nhất Các IP được liên hệ nhiều nhất Các tên miền bị chặn nhiều nhất diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d9459bc57..3db10e467 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -441,7 +441,7 @@ 无效 IP 地址、子网或端口。 排除 继续 - vpn + VPN 允许应用请求访问所有可用网络。这些应用可能按需绕过 RethinkDNS 的 VPN 隧道。一些如 Zoom 和 Meet 的音频/视频会议应用可能会需要按需绕行以正常运行。 HTTP 代理已设置。 在非 VPN 模式下使用 HTTPS/SOCKS5 的 Orbot。 @@ -568,7 +568,7 @@ https://docs.rethinkdns.com/ 已放行 复制为 RDNS+ URL - RethinkDNS + Re-Rethink 一款可高度自定义的 DNS 与防火墙软件 rethink 关于 @@ -587,7 +587,7 @@ 已由 Tor 保护 受私人 DNS 保护 私人 DNS 已启用 - 已连接至 RethinkDNS + 已连接至 Re-RethinkDNS 根据设备事件应用防火墙规则，如在设备被锁定时或未使用某一应用程序时拦截。 恢复 #1：阻止某应用联网。 \n #2：阻止任意应用连接至某特定 IP 。 \n #3：在设备锁定时阻止所有连接（全局拦截规则）。 \n #4：阻止任意未使用的应用程序连接（全局拦截规则）。 \n #5：阻止未知应用的连接（全局拦截规则）。 \n #6：拦截除 DNS 外的所有 UDP 流量（全局拦截规则）。 \n #7：拦截绕过 DNS 的流量（全局拦截规则）。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 489b00fe8..f9f4dc37e 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -74,7 +74,7 @@ 排除 超過 280 個地方；更長嘅在線時間；喺 cloudflare.com 上面行嘅中間解析服務 Rethink DNS - RethinkDNS + Re-Rethink rethink 關於 設定 @@ -104,7 +104,7 @@ 被代理保護住 私人 DNS 開着咗 未保護 - 連線咗去 RethinkDNS + 連線咗去 Re-RethinkDNS 連線咗去防火牆 連線咗去 RethinkDNS 同防火牆 恢復 @@ -171,7 +171,7 @@ 搵網域或者 IP 搵 IP 搵網域 - vpn + VPN 複製咗 URL HTTP3 揀 IP 版本 @@ -331,7 +331,7 @@ 睇文檔 聯繫我哋 贊助 - app + App 電郵聯繫 系統 App 資料 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 538785734..0dad0c246 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,6 +1,6 @@ - RethinkDNS + Re-Rethink rethink 關於 設定 @@ -106,7 +106,7 @@ 防火牆 DNS 與防火牆（預設） VPN - vpn + VPN 已複製 IP 位址。 已複製 URL 已作為 RDNS+ DNS-over-HTTPS URL 複製 @@ -153,7 +153,7 @@ 攔截 權限 - 無障礙設定 已連線至 RethinkDNS 與防火牆 - 已連線至 RethinkDNS + 已連線至 Re-RethinkDNS 已由 HTTP 代理與私人 DNS 保護 已由 SOCKS5 代理保護 已由 HTTP 代理保護 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2be402fd3..3fd121f91 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,11 +1,9 @@ - Rethink + Re-Rethink rethink - RETHINK α About Settings Stats - Proc taking a nap… A highly customizable DNS and Firewall Detect and block network security threats @@ -24,6 +22,7 @@ Cancel Apply Dismiss + Done All Allowed Maybe Blocked @@ -32,7 +31,7 @@ Domain Wildcard Action Required - rules + Rules Configure Logs Network @@ -47,6 +46,10 @@ IP Rules Domain Rules Delete + Filter + Refresh + Generate keys + Copy public key Proceed Private key (generated) @@ -55,11 +58,47 @@ MTU (auto) Include - select all + Select All + Unselect All Active Inactive - Checking… - Connecting… + RPN availability + Live status of reachable RPN locations. + Create custom IP and domain firewall rules. + All locations + (Max %1$d) + server + servers + %1$d servers available + Maximum 5 servers can be selected + At least one server should be selected + IP and port + Host and port + Strength + TCP Proxy + Fast proxy servers combined with affordability. Ideal solution for individuals. A reliable and secure way to access the internet anonymously. + Choose a plan + 1 Month / 1.99 + ( 1.99 / month ) + 3 Months / 3.99 + ( 1.33 / month ) + 6 Months / 5.99 + ( 0.99 / month ) + purchase + Restore Purchase + Terms and Conditions + Rethink DNS + Firewall are anti-surveillance tools first and foremost: It is absolutely against our ethos, then, to track users of our apps and services, or sell any information whatsoever to any third-party in any form, pseudo-anonymized, de-anonymized, anonymized, aggregated, or otherwise. We do not collect, sell, license, share any data (personally identifiable or otherwise) from the Rethink DNS + Firewall Android app. The code is open source so you may inspect it yourself or deploy to your servers.\nPersonally identifiable information: Any data that can be traced back to the user including (but not limited to) a combination of IP addresses, name, device-id, advertisement-id, and location.\n\nNon personally identifiable information: Aggregated (summarized) data and anonymized data scrubbed off any personally identifiable information.\nCollect: Data stored by Rethink.\nSell: Data sold to third parties.\nLicense: Restricted access to data collected by Rethink to third parties.\nShare: Data shared with third parties.\nAggregate: Data combined with other data to form a summary of information.\nAnonymize: Data scrubbed off any personally identifiable information.\nDe-anonymize: Data scrubbed off any personally identifiable information.\nShare: Permanent access to data collected by Rethink to third parties.\n\nWe do not collect, sell, license, share any data (personally identifiable or otherwise) from the Rethink DNS + Firewall Android app. The code is open source so you may inspect it yourself or deploy to your servers. + Payment Successful + Your payment was successful. You can now enjoy the proxy features of Rethink. + continue + Awaiting payment + Please wait while we process your payment. This may take a few seconds. + Payment Failed + Your payment failed. Please try again. + try again + TCP Proxy icon + VPN not active + Rethink VPN is not active. Start it to run the test. SOCKS5 HTTP HTTPS & SOCKS5 @@ -71,6 +110,12 @@ sec min hr + Countries + Low + Medium + High + Critical + Source day Preshared key (insecure) @@ -78,17 +123,10 @@ Persistent keepalive Allowed IPs Save - Saving… DoT ODoH Cache Status - Plan - Valid until - Cancelled - Expired - Grace Period - Paused Remove Last DNS-over-TLS @@ -100,6 +138,9 @@ RDNS Starting Overall + Upload + Info + Data Stopped Idle private @@ -110,11 +151,11 @@ on-device IP Unselected - Notification + notification Mastodon Matrix Reddit - Test + test protos (experimental) Service Providers @@ -127,7 +168,6 @@ Action Connect Criteria - All Apps Rethink is experiencing low memory. System actions may be limited. @@ -139,9 +179,6 @@ %1$s %2$s %1$s: %2$s %1$s / %2$s - %1$s · %2$s - %1$s (%2$s) - %1$s, %2$s %1$s %2$s %3$s %1$s:%2$s:%3$s 🐘 @@ -202,17 +239,17 @@ Block (unmetered) Block (metered) Isolate - Bypass DNS and Firewall + Bypass DNS & Firewall Bypass Universal Exclude - Allow - Block + allow + block Bypass Universal - Exclude - Isolate - Untracked + exclude + isolate + untracked Bypass DNS & Firewall @@ -274,6 +311,7 @@ protected with proxy & private dns protected with socks5 & private dns + protected with http proxy & private dns protected with socks proxy @@ -282,7 +320,6 @@ protected with proxy - protected with rpn protected with wireguard protected with wireguard & private dns @@ -295,7 +332,7 @@ not protected - Connected to RethinkDNS + Connected to Re-RethinkDNS Connected to Firewall @@ -374,7 +411,7 @@ Settings Turn off Private DNS - Rethink\'s DNS settings are overridden by Android\'s Private DNS.\n\nTo use Rethink\'s DNS go to Android Settings and turn off "Private DNS". + Rethink\'s DNS settings are overridden by Android\'s Private DNS.\n\nTo use Rethink\'s DNS go to Android Settings and turn off \"Private DNS\". Go to Settings Universal @@ -445,7 +482,8 @@ Search IPs Search domain names Search blocklists - Search apps by name + Search apps + Search %1$d apps DNS (battery saver) DNS @@ -453,7 +491,7 @@ DNS and Firewall (default) VPN - vpn + VPN IP address copied. URL copied @@ -462,6 +500,36 @@ Store DNS and Firewall logs locally on-device. Enable on-device logging + Logging is disabled. Enable on-device logging in Settings. + No logs yet. + Delete all logs? + This deletes on-device logs. This operation is not reversible. Do you want to proceed? + Rethink + Loading... + More options + View + Unable to open Orbot install page. + Invalid port. + Invalid IP address. + Block UDP (except DNS) + Exclude proxy apps + Exclude apps that act as proxy providers. + Protocol translation + Translate UDP traffic to TCP when needed. + Ping IPs + Treat mobile data as metered + Apply metered network behavior to mobile data. + WireGuard listen port + Allow setting a custom listen port. + WireGuard lockdown + Restrict traffic to the WireGuard interface only. + Endpoint-independent mapping + Prefer endpoint-independent NAT behavior. + TCP keep-alive + Keep idle TCP connections alive. + Use metered VPN + Treat the VPN connection as metered. + Dial timeout Choose mode @@ -494,6 +562,7 @@ Do not route Private IPs (experimental) Exclude LAN, loopback, multicast, link-local routes from Rethink\'s VPN tunnel. + Meter mobile networks Only treat mobile networks as metered, rest as unmetered. @@ -596,6 +665,21 @@ Appearance Dark/light theme + Color style + Choose a color style for the app. + Dynamic color is unavailable on this device. + Auto + Dynamic + Coral + Rose + Teal + Blue + Purple + Orange + Green + Amber + Cyan + Indigo Log level For debugging purposes @@ -604,9 +688,8 @@ Route Rethink\'s own traffic, like blocklist downloads, connectivity checks, DNS connections, back into the tunnel. Routing Rethink\'s own traffic through the tunnel. Unless you know what you\'re doing, turn it off. - Loopback (experimental) - In Loopback mode, Rethink can reroute its own network traffic. This means, Rethink can apply IP and domain rules, universal firewall rules, and proxying rules on Rethink\'s traffic as if it were any other regular app. Even so Loopback offers more control, the resulting behavior may not always desirable.\n\n\nIt is recommended to exempt Rethink from firewall, DNS, and proxying rules. Doing so doesn\'t affect network monitoring or logging, but just the rules.\n\n\nIn Loopback mode, Proxy Lockdown will not be enforced, for now. - Exempt Rethink + Loopback (experimental) + Also enables %1$s setting. Do you want to proceed? Very verbose Verbose @@ -631,7 +714,7 @@ Port Number Username Password - Set + set The selected app will be excluded from the VPN to let it proxy connections on your behalf. None @@ -646,7 +729,7 @@ Password (optional) Appearance - Set by System + System Light Dark True Black @@ -770,6 +853,7 @@ Exclude not possible in VPN lockdown mode Proxy removed + Stopping… Packet capture disabled @@ -790,6 +874,10 @@ Rules Type + Use the DNS server configured by the system. + Use a user-selected DNS server. + Use Rethink DNS with in-app blocklists and policies. + Smart DNS picks from a rotating set of resolvers. Other DNS Rethink DNS @@ -809,13 +897,11 @@ Prompt on blocklist updates Check for blocklist updates once every three days + Check for updates every three days. Never proxy DNS Do not proxy DNS over Always-on WireGuard, SOCKS5, HTTP proxies. - Block DNS from Unknown source - Block all DNS requests originating from unknown applications. - Use System DNS for undelegated domains Use System DNS for undelgated domains like .lan, .internal, etc. @@ -836,7 +922,7 @@ Select the files you want to include in the bug report email Deselect All - Select at least one file + Please select at least one file Creating archive… File not found Cannot open this file type @@ -866,11 +952,11 @@ Authors Translate Let\'s Go - hello@celzero.com + bernaferrari2@gmail.com mailto: [Rethink]: [Rethink]: Bug report - Send this email to : hello@celzero.com + Send this email to : bernaferrari2@gmail.com Select email provider https://telegram.me/rethinkdns https://docs.rethinkdns.com/ @@ -888,7 +974,7 @@ https://mastodon.social/@rdns https://www.reddit.com/r/rethinkdns https://matrix.to/#/!jrTSpJiEkFNNBMhSaE:matrix.org - %1$s + %1$s %1$s (%2$s) Suggest features @@ -909,10 +995,8 @@
🛡️ Android app
Anthony Ryan / BayLee4 / - Coding-Young / Ch4t4r / CodingAttack / - dsremo / HrBDev / hussainmohd-a / ignoramous / @@ -923,12 +1007,9 @@ Poussinou / pjosingh / RohitSurwase / - rootshel / Shantanu / - Uldiniad / - VASHvic / - yurtpage / - WhoIsDevelop
+ Uldiniad
/ + yurtpage

🚂 Network engine
alalamav / bemasc / @@ -979,7 +1060,7 @@ Sonatype
]]> - Resolvers + resolvers Custom Server URL DoH DoH %1$s @@ -1019,6 +1100,9 @@ Split DNS (experimental) Forward DNS queries from proxied apps to the proxy\'s DNS servers. + Treat DNS rules as firewall rules (experimental) + DNS blocking will be bypassed during resolution; the decision will be made at connection time. + Allowed DNS record types Select which DNS resource record types to allow. @@ -1064,6 +1148,7 @@ Remind me later + Block all apps when device is locked Block any app not in use @@ -1155,6 +1240,7 @@ Bypass apps Bypass Universal firewall rules for listed apps? + Bypass apps Bypass universal DNS & firewall rules for listed apps? @@ -1183,7 +1269,7 @@ Note No firewall rules found - reload + Reload Unknown Unnamed (%1$s) @@ -1320,14 +1406,13 @@ Firewall Alerts Proxy Alerts Download Alerts - RPN Alerts Inform when Rethink is active and running in the background Inform when Rethink is stopped by Android or by another VPN app Alert on Firewall errors and anomalies Alert on Proxy errors and anomalies Alert on Download Progress for On-device blocklists - Alert on RPN errors and anomalies + Alerts are not available yet. System Components @@ -1413,9 +1498,9 @@ will bypass universal dns & firewall rules is unknown - Firewall rules for this app + firewall rules for this app - Network log for this app + network log for this app Firewall Metered @@ -1481,7 +1566,9 @@ Check for update Re-download blocklists - Simple + simple + Protection + System Advanced Selected @@ -1517,14 +1604,41 @@ Enabled + Blocklist state + Disable blocklists + Enable blocklists + Turn on to use on-device blocklists for DNS filtering. + Blocklist actions Configure Copy as RDNS+ URL Search domains in blocklists + Maintenance Check for update Redownload blocklists Update blocklists Configure 195+ blocklists + + Close search + Open search + Search settings + No matches + Try searching by name, section, or keyword. + + + No apps found + No apps match your current filters. + + + Search apps, IPs, domains + Search domain names or IPs + Search %1$d logs + + + More actions + More actions, expanded + More actions, collapsed + Backup & restore Backup @@ -1551,23 +1665,23 @@ Restore completed, restarting app… Backup completed - Invalid backup file. Please select a %1$s backup file for this build. Restore failed; try again %1$s blocklists - Most Allowed Apps - Most Blocked Apps - Most Contacted Domains - Most Contacted Countries - Most Blocked Domains - Most Contacted IPs - Most Blocked IPs - Most Blocked Countries + Most allowed apps + Most blocked apps + Most contacted domains + Most contacted countries + Most blocked domains + Most contacted ips + Most blocked ips + Most blocked countries Start Rethink to proceed Show All + Show Less Invalid key @@ -1624,8 +1738,6 @@ Always-on All connections and apps not routed by other WireGuard VPNs will be routed by this one. - Selected apps will only be routed through this WireGuard VPN, regardless of whether the VPN is active or disabled. - To switch to Advanced, stop WireGuard in Simple mode Add / Remove (%1$s apps) @@ -1636,9 +1748,6 @@ Delete Done - Are you sure you want to delete ALL WireGuard VPN configurations? This is IRREVERSIBLE. - Delete All - Include all apps Use this WireGuard VPN for all apps? @@ -1704,7 +1813,7 @@ Anti-censorship Choose from various Anti-censorship technique. - Shorter TCP keepalive + Shorter TCP keep alive Quickly close TCP sockets with no recent activity. @@ -1727,7 +1836,16 @@ Hybrid Also uses proxy as necessary. - strategy + + Warp is active. Please disable it first. + Please add at least one app to enable Rethink Proxy. + Rethink\'s Proxy + Enable UDP Relay + Cloudflare WARP + Modern, fast, and secure way to connect to a VPN server. Secure all your internet traffic with an ultra-secure, lightning-quick VPN service that lets you connect with the WireGuard protocol. + Something went wrong + + Strategy Set how retries work for censored connections. On failure, never retry anti-censorship techniques. @@ -1755,7 +1873,7 @@ Close idle TCP and UDP sockets after this duration. Experimental - Experimental features in network engine. + Experimental features in the Network Engine. Select WireGuard proxy @@ -1777,8 +1895,8 @@ Reachability checks bypass all network restrictions. In Auto mode, Rethink randomly uses previously connected IPs and hostnames. - Most Contacted Providers - Most Blocked Providers + Most contacted providers + Most blocked providers Enter package names (comma-separated) allowed to start or stop Rethink. Instructions:\n @@ -1803,7 +1921,7 @@ Automation Configure apps that can start or stop Rethink. - Top Active Connections + Top active connections Load All Close Connections @@ -1825,6 +1943,7 @@ Smart DNS randomly uses any among these DNS resolvers: + Proxy rules Select a proxy to use for this rule. @@ -1921,18 +2040,28 @@ Rethink is blocking a connection View Rethink is blocking a connection--> - Database + Search tables + No database tables available. + Tables + Selected + Select a table to inspect. + %1$s rows + %1$s columns + Refresh + Copying… + Copy full dump + Preview truncated. Copy full dump to see complete output. Copied SSIDs SSID Wi‑Fi only - Enable this WireGuard VPN only when connected to Wi-Fi or to one of the specified WiFi identifiers (%1$s). + Enable this WireGuard VPN only when connected to Wi-Fi or specified WiFi identifiers (%1$s). Rethink needs location permission to access Wi‑Fi identifiers (%1$s). - To access Wi‑Fi identifiers (%1$s), turn on Location Services. - Enable Location Services + To access Wi‑Fi identifiers (%1$s), turn on Location service. + Enable Location service Grant permission Enable location Cannot use both "%1$s" and "%2$s" @@ -1945,31 +2074,26 @@ Matches partially Wi-Fi identifiers (%1$s) must be 32 characters or less. Delete "%1$s"? - Add SSID - SSID name cannot be empty - SSID already exists in the list - Delete SSID - Action - Match Type Stability program - Capture error logs to help improve stability. + Capture error logs to help improve stability. Remember uninstalled apps When enabled, keep app rules for 7 days. Firewall Bubble Review blocked apps and allow them temporarily. - Shows a floating bubble with recently blocked apps. + Show a floating bubble with recently blocked apps. + Firewall Bubble Firewall Bubble Notifications - Shows a bubble notification for recently blocked apps - Tap to view recently blocked apps + Shows bubble notification for blocked apps + Tap to see recently blocked apps Firewall Bubble enabled Permission denied. Firewall Bubble disabled. Recently Blocked Apps No Blocked Apps - Apps blocked by the firewall will appear here. + Apps blocked by the firewall will appear here Allow (15 min) %d blocked Just now @@ -1977,10 +2101,11 @@ %d hr ago Temporarily Allowed Apps + Loading… System default WireGuard P2P - When enabled, allows incoming connections initiated by WireGuard peers. + When enabled, allow incoming connections initiated by WireGuard peers. Android\'s built-in Download Manager may fail as VPN is in Lockdown mode. Enable Rethink\'s downloader instead? Enable Downloader @@ -1989,516 +2114,93 @@ Uses jumbo packets within Rethink\'s VPN tunnel. Always metered - Mark Rethink\'s VPN tunnel as metered to encourage apps to use less data. Caution: This may cause apps to pause large uploads & downloads, like backups. + Mark Rethink\'s VPN tunnel as metered to instruct apps to consume less data. Caution: This may cause apps to pause large uploads & downloads, like backups. Enrolled to the stability program for experimental features. - Stability program enabled - Undo - - Proxy Lockdown (experimental) - When enabled, all traffic is forced through Proxy or blocked. - - Flood WireGuard - When enabled, sends additional WireGuard packets to make tunnel traffic harder to identify and block on restrictive networks. - - Socket Buffer Size - Adjust the network buffer size used by Rethink sockets. Larger buffers may improve network throughput in some conditions but use more memory. - Smart Persistent Keepalive - Proactively maintains WireGuard tunnel connectivity by sending keep-alive probes only when needed, minimizing reconnection delays on intermittent networks. + WireGuard Lockdown + When enabled, all traffic is forced through WireGuard VPN. Event Logs View internal system & debug events + Details No events recorded yet - Event logs will appear here once the app starts recording system activity + Event logs will appear here once the app starts recording system activities + Total Events: %1$d Delete All Events Are you sure you want to delete all event logs? This action cannot be undone. - - Custom Interface IPs for VPN - Override default VPN Interface gateway, router, and DNS addresses. - Use automatically assigned VPN Interface IPs. - Manually configure Interface IPs for gateway, router, and DNS. + + Custom LAN IPs for VPN + Override default VPN LAN gateway, router, and DNS addresses. + Use automatically assigned VPN LAN IPs. + Manually configure LAN IPs for gateway, router, and DNS. + AUTO + MANUAL Gateway Router Reset Prefix - Using automatic Interface IP configuration. - Custom Interface IPs saved - Could not save custom interface IPs - Could not open the Custom Interface IPs dialog + Using automatic LAN IP configuration + Custom LAN IPs saved + Could not save custom LAN IPs + Could not open Custom LAN IPs dialog Invalid IP addresses. Ensure:\n• IPv4 must be private (10.x.x.x, 172.16-31.x.x, or 192.168.x.x)\n• IPv6 must be unique local (fc00::/7)\n• Both IP and prefix must be provided together - VPN not active - Rethink is not started. Please start to use this feature. - - RPN - - troubleshoot - - Run test - Test your connection to RPN proxies. - - Report issue - Report an issue with RPN. - - Device Order History - - Manage Purchase - - Contact Support - - Subscribe - - Resubscribe - - - Failed to launch resubscription. Please try again. - - Error loading purchase details - - Payment processing - Your payment is being processed. You’ll get access once it completes. - By subscribing to RPN you agree to the <a href="https://rethinkdns.com/terms">Rethink Terms of Service</a> and <a href="https://rethinkdns.com/privacy">Privacy Policy</a>. Powered by Windscribe - - - Enhanced privacy, speed, and security - Choose Your Plan - Select the plan that works best for you. - Subscribe Now - Purchase Now - One-Time - Monthly - $0.00 - Was %1$s - Cancel anytime - Save %1$s - Please select a plan first - Your purchase is now active! - - - Processing Purchase - Please wait while we process your purchase… - Verifying Purchase - Verifying with Google Play Store… - Purchase Successful! - Purchase Failed - Something went wrong. Please try again. - Close - Retry - Unable to load plans - - - Choose Countries - Search countries or locations… - Clear search - Select up to 5 servers - Maximum %1$d servers can be selected - No servers found - Try adjusting your search or check back later. - Error fetching locations - There was a problem fetching server locations. This is usually a temporary issue. - Check your connection or try again in a moment. - Try Again - Could not load server locations. Proxy may not be ready yet. - - - Taking a bit longer than expected… - - - Restore Defaults - This will unregister your current session, fetch a fresh entitlement from the server, and re-register your connection. Your server selections will not be preserved. - Restoring connection - This usually completes in a few seconds. Keep your internet connection active. - Unregistering current session… - Fetching fresh entitlement… - Registering with tunnel… - Refreshing server list… - RPN restored successfully - Restore failed: %s - - Restoring… - - Loading… - Start RPN to proceed - - Disconnected - - - %1$d server - %1$d servers - - - - Server Location Removed - This server location is no longer available. - Removed - - - WiFi Settings for %1$s - %1$s to %2$s when connected to %3$s that %4$s match the list below - Add New SSID - Configured SSIDs - No SSIDs configured yet - SSID Icon - - Server Configuration - Not set - - - - %d peer - %d peers - - - Seconds - - - - Quick Actions - - Purchase processing is taking longer than expected. Please check your internet connection and try again. - - - Describe Your Issue - Diagnostic Data - What is your issue about? - Payment - Activation - Connectivity - Refund - Describe the issue you\'re experiencing… - The following data will be included as an attachment. Toggle off anything you don\'t want to share. - Purchase Status - All purchase records - State History - The last 50 purchase state transitions. - VPN / Proxy Stats - RPN proxy connection statistics - Your email will be sent to hello@celzero.com. We only use this data to investigate your issue and never share it with third parties. - Send to Support - Collecting data… - Collecting diagnostic data… - Send support email via… - Please describe your issue or select a category - Failed to collect diagnostic data. Please try again. - Could not open email app. Please email hello@celzero.com directly. - - - Valid until - Cancel, revoke or manage your plan - - - Cancelling… - Revoking… - - - A temporary error occurred. Please try again. - Something went wrong with your purchase. Please try again. - - - On Hold - Ends on - Expired on - %1$dd left - - - Server Settings - DNS Filter - Family - Includes %1$s - No filters - Refresh Servers - Stop RPN - Start RPN - Open server settings - Split DNS is disabled. Enable it to use DNS filtering on your VPN servers. - Enable Split DNS - Proxy Stopped - - - Exclude Countries - Selected countries will be skipped during AUTO server selection - Excluded Countries for AUTO - None excluded - %d countries excluded - At least %d countries must remain available for AUTO selection - Limit reached, at least %d countries must remain available - No countries available - Loading countries… - Search countries… - - - Configure VPN server preferences - Configuration Handling - Choose how connection settings should be managed - AUTO - MANUAL - The app automatically selects the port, identity, and configuration - Manually control the identity, port, and configuration mode - Always Change Identity - Request a new server identity for each connection attempt - Connection Port - Port used for tunnel server connections - Permanent Configuration - Keep the same server configuration across reconnections - Select Connection Port - Valid until today - AUTO is always connected and cannot be removed - Remove Server - Remove %1$s (%2$s) from your server list? - Frequent - %1$s added to favourites - %1$s removed from favourites - N/A - - - Cancel Purchase - Revoke Purchase - Note: You can revoke your purchase for a full refund. Cancelling will stop future charges, but you can continue using your purchase until the end of the current period. - Manage on Google Play - Cancel Purchase? - Are you sure you want to cancel your purchase? You will lose access to premium features at the end of the current period. - Revoke Purchase? - Are you sure you want to revoke your purchase? This action will immediately cancel your purchase and refund your payment. You will lose access to premium features. - Failed to process request. Please try again. - - - Revoked - Yearly - - 2-Year - 5-Year - Revokes the purchase and issues a full refund to the original payment method. - Cancels renewal. Access continues until the end of the current period - - - Connection Test - Run Test - Ready to Test - Enter domains below and tap Run Test. - Testing… - Checking reachability through the proxy. - All Reachable - Every target is reachable through your RPN proxy. - Partial Connectivity - Some targets are unreachable through the proxy. - Unreachable - None of the targets could be reached. Check your RPN proxy. - No Active Proxy - Failed - Run Again - Domains or IPs, comma-separated - Reachable - Enable RPN to run this test. - %1$dms - - - All Transactions - A complete record of every purchase and state change - No history yet - Purchase transactions and state changes will appear here - Failed to load purchase history - Could not open purchase history - %1$s → %2$s - Pending - - - Order History - Server Orders - Purchase records fetched live from the server - No orders found - No purchase records were found for this account - No active subscription found. Please subscribe to view order history. - SUBS - Started %1$s - Until %1$s - Renews %1$s - Order: %1$s - View orders fetched from server - Could not open order history - - - Rethink Proxy Network - Subscribe to route traffic through Rethink servers - - - Last Handshake - Errors - Client IPv4 - Client IPv6 - Never - - - 👁️ - 📍 - 📡 - 🛡️ - - - No recurring charges - Billed monthly - Billed annually - Recurring \u2022 Cancel anytime - %1$d days free trial - - - %1$s • %2$s - \u2014 - - - %1$s \u2022 %2$s - %1$s\u2026 - - - \u2022 - - Purchased - - - Validating purchase - Contacting server - Updating local state - Refreshing billing status - Please do not close the app - - - ⚠ Your access valid until in %1$d day(s). - Buy more access time now so there\'s no interruption. - Extend Access - - - Extending Your Access - Your new purchase adds to your remaining time. Access continues uninterrupted. - - - Access Extended! - Your access has been extended. Enjoy uninterrupted privacy! - - - Welcome to RPN! - Your subscription is now active. Enjoy enhanced privacy and security! - - - %s / mo - - - Purchase Conflict - Refund Conflict - Purchase Already Acknowledged - Purchase Already Consumed - Device Already Registered - Customer Registration - - Your purchase appears to be in a conflicting state on the server. You can request a refund to resolve this, or manage it directly on Google Play. - A refund request for this purchase is already in progress or the purchase is in a conflicting state. You can try again or manage it on Google Play. - This purchase was already acknowledged on the server. No action is needed, your purchase should be active. If you see an issue, contact support. - This purchase has already been consumed. If you believe this is an error, please contact support. - This device is already registered with the server. No action is needed. If access is not working, try again or contact support. - Customer registration failure. Please contact support. - - Request Refund - Retry Refund - - HTTP Code - - Refund requested successfully. Your purchase has been revoked. - Refund request failed: %1$s - - - Action Required: Purchase Conflict - A server conflict was detected with your purchase. Tap to review and request a refund. - - - Device Authorization Failed - Your device could not be authorized by the Rethink server. This may be due to an account issue. Please contact customer support with the details below so we can resolve this quickly. - HTTP 401: Unauthorized - Account ID - Device ID - partial - - - Email Customer Support - - Hello Rethink Support, - I am experiencing a device authorization issue (HTTP 401). My account details are: - Help me resolve this. - - - Device Not Registered - Account ID Mismatch - Your device could not be registered under the account linked to your active subscription. The account ID from Google Play (shown below) could not be resolved to a device on our server. Please contact support with the details below. - Subscription Account ID (Google Play) - master - What this means - Your subscription is active on Google Play but your device could not be linked to it on the Rethink server. This can happen after restoring from a backup or switching devices. Our support team can resolve this quickly once you provide the account details above. - Device Not Registered: Rethink DNS - I have an active subscription but my device cannot be registered. The account details are: - - - Your device could not be linked to your active subscription. Tap to review and contact support. - Your device could not be authorized by the Rethink server (HTTP 401). Tap to view details and contact support. - - - %1$d of %2$d - - - Got it - Skip Tour - - - Reset Guided Tour - Show the guided tour again on next launch. - Tour reset, will show again on next launch ✓ - - - Your Privacy Shield - This button starts and stops Rethink\'s VPN tunnel. When active, all app traffic is routed through your chosen DNS and firewall rules - nothing leaves unguarded. - - - DNS & Blocklists - Configure your DNS resolver and activate on-device blocklists. Block ads, trackers, and malware domains before any connection is made. - - - Per-App Firewall - Decide which apps can reach the internet, which are isolated, and which are blocked entirely even when the VPN is off. - - - Proxy & Routing - Chain a WireGuard, SOCKS5, or HTTP proxy to shape exactly how your traffic exits. Combine with DNS for full control. - - - Connection Logs - Every DNS query and network connection is logged here. Review what your apps are doing and block anything suspicious with one tap. - - - - %d Year - %d Years - - - - Unlock advanced privacy features with RPN: hide your real IP with rotating exits, access anti-censorship servers, and route traffic through private proxy networks for total control. - - Premium Feature - - - Per-app firewall rules and network policy - VPN tunnel mode and network preferences - WireGuard, SOCKS5, and HTTP proxy routing - Appearance, notifications, and more - Developer tools and diagnostics - Review DNS queries and connection logs - - - DNS to bypass - Select the DNS to use for trusted and bypassed apps and domains - Use fallback DNS - Use the fallback DNS for trusted and bypassed connections - Use Global DNS - Use the globally configured DNS for trusted and bypassed connections - Automatic - Automatically select DNS based on other settings - - Include file trace in logs + + Start + Stop + DNS + Download + Connections + Firewall + Proxy + Apps + Bypassed + Isolated + Excluded + Total + Universal Rules + Latency + Connected + Navigate back + Clear search + Host + Port + Username (optional) + Password (optional) + No countries available + No countries available for RPN right now. Try again later. + Proxy details + No proxy found + Proxy information is missing for this proxy. Ensure the proxy is configured and try again. + Select apps for proxy + Apps part of other proxy or excluded from proxy will be listed here. + Apps + Domains + IPs + Proxy name + Who + Error + Country + Latency + Last connected + Status + Connected + IP Address + Port + Protocol + App Name + Response + Response IP + Resolver + 1h + 24h + 7d + Connections: %1$d + who_or_service_email@domain.com + 37 ms + 2 min ago + Checkout is unavailable in this build. diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index bda36c6e8..16e17597e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,120 +1,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/play/java/com/celzero/bravedns/RethinkDnsApplicationPlay.kt b/app/src/play/java/com/celzero/bravedns/RethinkDnsApplicationPlay.kt index 0bc942035..c6c8c597d 100644 --- a/app/src/play/java/com/celzero/bravedns/RethinkDnsApplicationPlay.kt +++ b/app/src/play/java/com/celzero/bravedns/RethinkDnsApplicationPlay.kt @@ -17,17 +17,14 @@ package com.celzero.bravedns import android.app.Application import android.content.pm.ApplicationInfo -import com.celzero.bravedns.scheduler.EnhancedBugReport import com.celzero.bravedns.scheduler.ScheduleManager import com.celzero.bravedns.scheduler.WorkScheduler import com.celzero.bravedns.service.AppUpdater -import com.celzero.bravedns.service.InAppMessageProvider -import com.celzero.bravedns.service.PlayInAppMessageProvider import com.celzero.bravedns.util.FirebaseErrorReporting import com.celzero.bravedns.util.GlobalExceptionHandler -import com.celzero.bravedns.util.GoReportingHandler +import io.github.aakira.napier.DebugAntilog +import io.github.aakira.napier.Napier import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch import org.koin.android.ext.android.get @@ -56,27 +53,20 @@ class RethinkDnsApplicationPlay : Application() { // New Koin override strategy allow to override any definition by default. // don't need to specify override = true anymore in module. single { StoreAppUpdater(androidContext()) } - // Play Billing in-app messaging - single { PlayInAppMessageProvider() } } ) ) } - val appScope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + if (BuildConfig.DEBUG) { + Napier.base(DebugAntilog()) + } - // Initialize exception handlers + // Initialize global exception handler GlobalExceptionHandler.initialize(this) FirebaseErrorReporting.initialize() - GoReportingHandler.initialize(appScope, this) - - // On every app start, report any tombstone files from the previous session - val appCtx = this - appScope.launch(Dispatchers.IO) { - EnhancedBugReport.reportTombstonesToFirebaseOnStartup(appCtx) - } - appScope.launch { + CoroutineScope(SupervisorJob()).launch { scheduleJobs() } } diff --git a/app/src/play/java/com/celzero/bravedns/StoreAppUpdater.kt b/app/src/play/java/com/celzero/bravedns/StoreAppUpdater.kt index cc0cbfe47..0fa6924df 100644 --- a/app/src/play/java/com/celzero/bravedns/StoreAppUpdater.kt +++ b/app/src/play/java/com/celzero/bravedns/StoreAppUpdater.kt @@ -20,6 +20,7 @@ import android.content.Context import android.content.IntentSender import android.util.Log import com.celzero.bravedns.service.AppUpdater +import com.google.android.play.core.appupdate.AppUpdateOptions import com.google.android.play.core.appupdate.AppUpdateManagerFactory import com.google.android.play.core.install.InstallStateUpdatedListener import com.google.android.play.core.install.model.AppUpdateType @@ -61,8 +62,12 @@ class StoreAppUpdater(context: Context) : AppUpdater { AppUpdateType.FLEXIBLE)) { Log.i(LOG_TAG, "Update available, starting flexible update") try { - appUpdateManager.startUpdateFlowForResult(appUpdateInfo, AppUpdateType.FLEXIBLE, - activity, APP_UPDATE_REQUEST_CODE) + appUpdateManager.startUpdateFlowForResult( + appUpdateInfo, + activity, + AppUpdateOptions.newBuilder(AppUpdateType.FLEXIBLE).build(), + APP_UPDATE_REQUEST_CODE + ) } catch (e: IntentSender.SendIntentException) { unregisterListener(listener) Log.e(LOG_TAG, "SendIntentException: ${e.message} ", e) @@ -71,8 +76,12 @@ class StoreAppUpdater(context: Context) : AppUpdater { AppUpdateType.IMMEDIATE)) { Log.i(LOG_TAG, "Update available, starting immediate update") try { - appUpdateManager.startUpdateFlowForResult(appUpdateInfo, - AppUpdateType.IMMEDIATE, activity, APP_UPDATE_REQUEST_CODE) + appUpdateManager.startUpdateFlowForResult( + appUpdateInfo, + activity, + AppUpdateOptions.newBuilder(AppUpdateType.IMMEDIATE).build(), + APP_UPDATE_REQUEST_CODE + ) } catch (e: IntentSender.SendIntentException) { unregisterListener(listener) Log.e(LOG_TAG, "SendIntentException: ${e.message} ", e) diff --git a/app/src/play/java/com/celzero/bravedns/iab/Security.java b/app/src/play/java/com/celzero/bravedns/iab/Security.java index 01a828556..19a66fa66 100644 --- a/app/src/play/java/com/celzero/bravedns/iab/Security.java +++ b/app/src/play/java/com/celzero/bravedns/iab/Security.java @@ -104,7 +104,6 @@ static private Boolean verify(PublicKey publicKey, String signedData, String sig try { signatureBytes = Base64.decode(signature, Base64.DEFAULT); } catch (IllegalArgumentException e) { - Log.w(TAG, "Base64 decoding failed."); return false; } try { @@ -112,7 +111,6 @@ static private Boolean verify(PublicKey publicKey, String signedData, String sig signatureAlgorithm.initVerify(publicKey); signatureAlgorithm.update(signedData.getBytes(StandardCharsets.UTF_8)); if (!signatureAlgorithm.verify(signatureBytes)) { - Log.w(TAG, "Signature verification failed..."); return false; } return true; @@ -120,9 +118,7 @@ static private Boolean verify(PublicKey publicKey, String signedData, String sig // "RSA" is guaranteed to be available. throw new RuntimeException(e); } catch (InvalidKeyException e) { - Log.e(TAG, "Invalid key specification."); } catch (SignatureException e) { - Log.e(TAG, "Signature exception."); } return false; } diff --git a/app/src/test/java/com/celzero/bravedns/data/AppConfigProxyModeTest.kt b/app/src/test/java/com/celzero/bravedns/data/AppConfigProxyModeTest.kt new file mode 100644 index 000000000..8a4eb46b9 --- /dev/null +++ b/app/src/test/java/com/celzero/bravedns/data/AppConfigProxyModeTest.kt @@ -0,0 +1,200 @@ +package com.celzero.bravedns.data + +import android.content.Context +import com.celzero.bravedns.database.ConnectionTrackerRepository +import com.celzero.bravedns.database.DnsCryptEndpointRepository +import com.celzero.bravedns.database.DnsCryptRelayEndpointRepository +import com.celzero.bravedns.database.DnsLogRepository +import com.celzero.bravedns.database.DnsProxyEndpointRepository +import com.celzero.bravedns.database.DoHEndpointRepository +import com.celzero.bravedns.database.DoTEndpointRepository +import com.celzero.bravedns.database.ODoHEndpointRepository +import com.celzero.bravedns.database.ProxyEndpointRepository +import com.celzero.bravedns.database.RethinkDnsEndpointRepository +import com.celzero.bravedns.service.EventLogger +import com.celzero.bravedns.service.PersistentState +import com.celzero.bravedns.util.PcapMode +import androidx.arch.core.executor.testing.InstantTaskExecutorRule +import androidx.lifecycle.MutableLiveData +import io.mockk.every +import io.mockk.mockk +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test + +class AppConfigProxyModeTest { + @get:Rule + val instantTaskExecutorRule = InstantTaskExecutorRule() + + @Test + fun `addProxy merges custom socks5 and http into http_socks5`() { + val backing = Backing() + val appConfig = newAppConfig(backing) + + appConfig.addProxy(AppConfig.ProxyType.SOCKS5, AppConfig.ProxyProvider.CUSTOM) + assertEquals(AppConfig.ProxyType.SOCKS5.name, backing.proxyType) + assertEquals(AppConfig.ProxyProvider.CUSTOM.name, backing.proxyProvider) + + appConfig.addProxy(AppConfig.ProxyType.HTTP, AppConfig.ProxyProvider.CUSTOM) + assertEquals(AppConfig.ProxyType.HTTP_SOCKS5.name, backing.proxyType) + assertEquals(AppConfig.ProxyProvider.CUSTOM.name, backing.proxyProvider) + } + + @Test + fun `removeProxy from http_socks5 keeps other custom proxy`() { + val backing = + Backing( + proxyProvider = AppConfig.ProxyProvider.CUSTOM.name, + proxyType = AppConfig.ProxyType.HTTP_SOCKS5.name + ) + val appConfig = newAppConfig(backing) + + appConfig.removeProxy(AppConfig.ProxyType.HTTP, AppConfig.ProxyProvider.CUSTOM) + assertEquals(AppConfig.ProxyType.SOCKS5.name, backing.proxyType) + + backing.proxyType = AppConfig.ProxyType.HTTP_SOCKS5.name + appConfig.removeProxy(AppConfig.ProxyType.SOCKS5, AppConfig.ProxyProvider.CUSTOM) + assertEquals(AppConfig.ProxyType.HTTP.name, backing.proxyType) + } + + @Test + fun `getTunProxyMode prioritizes provider and maps combined type to socks5`() { + val orbotBacking = + Backing( + proxyProvider = AppConfig.ProxyProvider.ORBOT.name, + proxyType = AppConfig.ProxyType.HTTP.name + ) + val orbotConfig = newAppConfig(orbotBacking) + assertEquals(AppConfig.TunProxyMode.ORBOT, orbotConfig.getTunProxyMode()) + + val customBacking = + Backing( + proxyProvider = AppConfig.ProxyProvider.CUSTOM.name, + proxyType = AppConfig.ProxyType.HTTP_SOCKS5.name + ) + val customConfig = newAppConfig(customBacking) + assertEquals(AppConfig.TunProxyMode.SOCKS5, customConfig.getTunProxyMode()) + } + + @Test + fun `dns-only mode blocks all proxy enablement`() { + val backing = Backing(braveMode = AppConfig.BraveMode.DNS.mode) + val appConfig = newAppConfig(backing) + + assertFalse(appConfig.canEnableProxy()) + assertFalse(appConfig.canEnableSocks5Proxy()) + assertFalse(appConfig.canEnableHttpProxy()) + assertFalse(appConfig.canEnableWireguardProxy()) + assertFalse(appConfig.canEnableTcpProxy()) + assertFalse(appConfig.canEnableOrbotProxy()) + } + + @Test + fun `provider gating allows only matching proxy toggles`() { + val backing = + Backing( + braveMode = AppConfig.BraveMode.DNS_FIREWALL.mode, + proxyProvider = AppConfig.ProxyProvider.ORBOT.name, + proxyType = AppConfig.ProxyType.SOCKS5.name + ) + val appConfig = newAppConfig(backing) + + assertTrue(appConfig.canEnableOrbotProxy()) + assertFalse(appConfig.canEnableHttpProxy()) + assertFalse(appConfig.canEnableSocks5Proxy()) + assertFalse(appConfig.canEnableWireguardProxy()) + assertFalse(appConfig.canEnableTcpProxy()) + } + + @Test + fun `http and socks helpers are based on type while custom checks require custom provider`() { + val backing = + Backing( + proxyProvider = AppConfig.ProxyProvider.CUSTOM.name, + proxyType = AppConfig.ProxyType.HTTP_SOCKS5.name + ) + val appConfig = newAppConfig(backing) + + assertTrue(appConfig.hasHttpProxyTypeEnabled()) + assertTrue(appConfig.hasSocks5ProxyTypeEnabled()) + assertTrue(appConfig.isCustomHttpProxyEnabled()) + assertTrue(appConfig.isCustomSocks5Enabled()) + + backing.proxyProvider = AppConfig.ProxyProvider.ORBOT.name + assertTrue(appConfig.hasHttpProxyTypeEnabled()) + assertTrue(appConfig.hasSocks5ProxyTypeEnabled()) + assertFalse(appConfig.isCustomHttpProxyEnabled()) + assertFalse(appConfig.isCustomSocks5Enabled()) + } + + @Test + fun `isProxyEnabled requires non-none provider`() { + val backing = + Backing( + proxyProvider = AppConfig.ProxyProvider.NONE.name, + proxyType = AppConfig.ProxyType.SOCKS5.name + ) + val appConfig = newAppConfig(backing) + assertFalse(appConfig.isProxyEnabled()) + + backing.proxyProvider = AppConfig.ProxyProvider.CUSTOM.name + assertTrue(appConfig.isProxyEnabled()) + } + + private data class Backing( + var proxyProvider: String = AppConfig.ProxyProvider.NONE.name, + var proxyType: String = AppConfig.ProxyType.NONE.name, + var braveMode: Int = AppConfig.BraveMode.DNS_FIREWALL.mode, + var connectedDnsName: String = "", + var pcapMode: Int = PcapMode.NONE.id, + var pcapFilePath: String = "" + ) + + private fun newAppConfig(backing: Backing): AppConfig { + val persistentState = mockk(relaxed = true) + + every { persistentState.proxyProvider } answers { backing.proxyProvider } + every { persistentState.proxyProvider = any() } answers { + backing.proxyProvider = firstArg() + } + every { persistentState.proxyType } answers { backing.proxyType } + every { persistentState.proxyType = any() } answers { + backing.proxyType = firstArg() + } + every { persistentState.braveMode } answers { backing.braveMode } + every { persistentState.braveMode = any() } answers { + backing.braveMode = firstArg() + } + every { persistentState.connectedDnsName } answers { backing.connectedDnsName } + every { persistentState.connectedDnsName = any() } answers { + backing.connectedDnsName = firstArg() + } + every { persistentState.pcapMode } answers { backing.pcapMode } + every { persistentState.pcapMode = any() } answers { + backing.pcapMode = firstArg() + } + every { persistentState.pcapFilePath } answers { backing.pcapFilePath } + every { persistentState.pcapFilePath = any() } answers { + backing.pcapFilePath = firstArg() + } + every { persistentState.updateProxyStatus() } returns MutableLiveData(0) + + return AppConfig( + context = mockk(relaxed = true), + rethinkDnsEndpointRepository = mockk(relaxed = true), + dnsProxyEndpointRepository = mockk(relaxed = true), + doHEndpointRepository = mockk(relaxed = true), + dnsCryptEndpointRepository = mockk(relaxed = true), + dnsCryptRelayEndpointRepository = mockk(relaxed = true), + doTEndpointRepository = mockk(relaxed = true), + oDoHEndpointRepository = mockk(relaxed = true), + proxyEndpointRepository = mockk(relaxed = true), + persistentState = persistentState, + networkLogs = mockk(relaxed = true), + dnsLogs = mockk(relaxed = true), + eventLogger = mockk(relaxed = true) + ) + } +} diff --git a/app/src/test/java/com/celzero/bravedns/receiver/BraveAutoStartReceiverTest.kt b/app/src/test/java/com/celzero/bravedns/receiver/BraveAutoStartReceiverTest.kt index 263f155ca..d09768b49 100644 --- a/app/src/test/java/com/celzero/bravedns/receiver/BraveAutoStartReceiverTest.kt +++ b/app/src/test/java/com/celzero/bravedns/receiver/BraveAutoStartReceiverTest.kt @@ -17,22 +17,19 @@ package com.celzero.bravedns.receiver import android.content.Intent +import android.content.BroadcastReceiver import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull import org.junit.Assert.assertTrue import org.junit.Assert.fail import org.junit.Before import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.koin.core.component.KoinComponent /** * Unit tests for BraveAutoStartReceiver * Tests the auto-start logic for VPN on boot and Private Space unlock */ -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [28]) class BraveAutoStartReceiverTest { private lateinit var receiver: BraveAutoStartReceiver @@ -52,11 +49,10 @@ class BraveAutoStartReceiverTest { Intent.ACTION_USER_UNLOCKED, Intent.ACTION_MY_PACKAGE_REPLACED ) - + supportedActions.forEach { action -> - val intent = Intent(action) - assertNotNull("Intent with action $action should be valid", intent.action) - assertEquals("Intent action should match", action, intent.action) + assertNotNull("Supported action should not be null", action) + assertTrue("Supported action should be an Android intent action", action.startsWith("android.intent.action.")) } } @@ -72,15 +68,19 @@ class BraveAutoStartReceiverTest { @Test fun `receiver class should extend BroadcastReceiver`() { // Test that the receiver extends the correct base class - assertTrue("BraveAutoStartReceiver should be a BroadcastReceiver", - receiver is android.content.BroadcastReceiver) + assertTrue( + "BraveAutoStartReceiver should be a BroadcastReceiver", + BroadcastReceiver::class.java.isAssignableFrom(receiver.javaClass) + ) } @Test fun `receiver should implement KoinComponent`() { // Test that the receiver implements KoinComponent for dependency injection - assertTrue("BraveAutoStartReceiver should implement KoinComponent", - receiver is org.koin.core.component.KoinComponent) + assertTrue( + "BraveAutoStartReceiver should implement KoinComponent", + KoinComponent::class.java.isAssignableFrom(receiver.javaClass) + ) } @Test @@ -97,9 +97,11 @@ class BraveAutoStartReceiverTest { @Test fun `receiver handles ACTION_USER_UNLOCKED for Private Space unlock`() { // Test that ACTION_USER_UNLOCKED is a valid intent action - val intent = Intent(Intent.ACTION_USER_UNLOCKED) - assertEquals("ACTION_USER_UNLOCKED should be correct action", - Intent.ACTION_USER_UNLOCKED, intent.action) + assertEquals( + "ACTION_USER_UNLOCKED should be correct action", + "android.intent.action.USER_UNLOCKED", + Intent.ACTION_USER_UNLOCKED + ) } @Test @@ -132,4 +134,4 @@ class BraveAutoStartReceiverTest { "BraveAutoStartReceiver", receiver.javaClass.simpleName) } -} \ No newline at end of file +} diff --git a/app/src/test/java/com/celzero/bravedns/receiver/UserPresentReceiverTest.kt b/app/src/test/java/com/celzero/bravedns/receiver/UserPresentReceiverTest.kt index f709b377b..884f16253 100644 --- a/app/src/test/java/com/celzero/bravedns/receiver/UserPresentReceiverTest.kt +++ b/app/src/test/java/com/celzero/bravedns/receiver/UserPresentReceiverTest.kt @@ -16,23 +16,19 @@ package com.celzero.bravedns.receiver +import android.content.Context import android.content.Intent -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNotNull -import org.junit.Assert.assertNull -import org.junit.Assert.assertTrue +import android.content.BroadcastReceiver +import io.mockk.every +import io.mockk.mockk import org.junit.Before import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.junit.Assert.* /** * Unit tests for UserPresentReceiver * Tests the screen unlock event handling */ -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [28]) class UserPresentReceiverTest { private lateinit var receiver: UserPresentReceiver @@ -44,10 +40,8 @@ class UserPresentReceiverTest { @Test fun `receiver should handle ACTION_USER_PRESENT intent`() { - // Test that receiver can handle the ACTION_USER_PRESENT intent - val intent = Intent(Intent.ACTION_USER_PRESENT) - assertNotNull("Intent with ACTION_USER_PRESENT should be valid", intent.action) - assertEquals("Intent action should match", Intent.ACTION_USER_PRESENT, intent.action) + // ACTION_USER_PRESENT constant should be stable and usable in routing logic + assertEquals("ACTION_USER_PRESENT constant", "android.intent.action.USER_PRESENT", Intent.ACTION_USER_PRESENT) } @Test @@ -59,16 +53,21 @@ class UserPresentReceiverTest { @Test fun `receiver class should extend BroadcastReceiver`() { // Test that the receiver extends the correct base class - assertTrue("UserPresentReceiver should be a BroadcastReceiver", - receiver is android.content.BroadcastReceiver) + assertTrue( + "UserPresentReceiver should be a BroadcastReceiver", + BroadcastReceiver::class.java.isAssignableFrom(receiver.javaClass) + ) } @Test fun `receiver should handle unknown actions gracefully`() { - // Test that receiver can handle unknown actions without crashing val unknownAction = "com.example.unknown.action" - val intent = Intent(unknownAction) - assertNotNull("Intent with unknown action should be valid", intent.action) + val intent = mockk() + val context = mockk(relaxed = true) + every { intent.action } returns unknownAction + + // Unknown actions must not crash the receiver. + receiver.onReceive(context, intent) assertEquals("Intent action should match", unknownAction, intent.action) } @@ -90,26 +89,36 @@ class UserPresentReceiverTest { @Test fun `receiver handles null action gracefully`() { - // Test that receiver can handle null action without crashing - val intent = Intent() - intent.action = null + val intent = mockk() + val context = mockk(relaxed = true) + every { intent.action } returns null + + receiver.onReceive(context, intent) assertNull("Intent action should be null", intent.action) } @Test fun `receiver handles various action types`() { - // Test that receiver can handle different action types val testActions = listOf( - Intent.ACTION_USER_PRESENT, Intent.ACTION_SCREEN_ON, Intent.ACTION_SCREEN_OFF, "android.intent.action.UNKNOWN" ) - + + val context = mockk(relaxed = true) testActions.forEach { action -> - val intent = Intent(action) + val intent = mockk() + every { intent.action } returns action + + receiver.onReceive(context, intent) assertEquals("Intent action should match for $action", action, intent.action) } + + assertEquals( + "ACTION_USER_PRESENT should stay stable", + "android.intent.action.USER_PRESENT", + Intent.ACTION_USER_PRESENT + ) } @Test @@ -118,4 +127,4 @@ class UserPresentReceiverTest { assertTrue("Class should be in receiver package", receiver.javaClass.packageName.endsWith(".receiver")) } -} \ No newline at end of file +} diff --git a/app/src/test/java/com/celzero/bravedns/service/ProxyRoutingEngineTest.kt b/app/src/test/java/com/celzero/bravedns/service/ProxyRoutingEngineTest.kt new file mode 100644 index 000000000..04fad1202 --- /dev/null +++ b/app/src/test/java/com/celzero/bravedns/service/ProxyRoutingEngineTest.kt @@ -0,0 +1,352 @@ +package com.celzero.bravedns.service + +import com.celzero.firestack.backend.Backend +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class ProxyRoutingEngineTest { + + @Test + fun `special app should be false outside dns firewall mode`() { + val request = + specialAppRequest( + isDnsFirewallMode = false, + isCustomSocks5Enabled = true, + packageName = "com.test.app", + socks5ProxyAppName = "com.test.app" + ) + + assertFalse(ProxyRoutingEngine.isSpecialApp(request)) + } + + @Test + fun `special app should be true when socks5 proxy app matches`() { + val request = + specialAppRequest( + isCustomSocks5Enabled = true, + packageName = "com.test.app", + socks5ProxyAppName = "com.test.app" + ) + + assertTrue(ProxyRoutingEngine.isSpecialApp(request)) + } + + @Test + fun `resolve base or exit should return base for dns proxy rule`() { + val result = + ProxyRoutingEngine.resolveBaseOrExitProxyId( + doubleLoopback = false, + blockedByRule = FirewallRuleset.RULE9.id, + rinr = false, + uid = 1000, + rethinkUid = 2000, + autoProxyEnabled = true + ) + + assertEquals(Backend.Base, result) + } + + @Test + fun `resolve base or exit should force auto or exit for rethink in rinr`() { + val result = + ProxyRoutingEngine.resolveBaseOrExitProxyId( + doubleLoopback = true, + blockedByRule = FirewallRuleset.RULE9.id, + rinr = true, + uid = 2000, + rethinkUid = 2000, + autoProxyEnabled = true + ) + + assertEquals(Backend.Auto, result) + } + + @Test + fun `determine route should return rethink direct route`() { + val decision = + ProxyRoutingEngine.determineRoute( + routingRequest( + uid = 1000, + rethinkUid = 1000, + rinr = false + ) + ) + + assertEquals(Backend.Exit, decision.proxyIds) + assertEquals(ProxyRoutingEngine.Reason.RETHINK_DIRECT, decision.reason) + } + + @Test + fun `determine route should apply rule15 for excluded app from rule0`() { + val decision = + ProxyRoutingEngine.determineRoute( + routingRequest( + appExcludedFromProxy = true, + blockedByRule = FirewallRuleset.RULE0.id, + baseOrExitProxyId = Backend.Base + ) + ) + + assertEquals(Backend.Base, decision.proxyIds) + assertEquals(FirewallRuleset.RULE15.id, decision.blockedByRuleOverride) + assertEquals(ProxyRoutingEngine.Reason.EXCLUDED_APP, decision.reason) + } + + @Test + fun `determine route should mark block and rule17 for wireguard block candidate`() { + val decision = + ProxyRoutingEngine.determineRoute( + routingRequest( + wireguardProxyIds = listOf(ProxyManager.ID_WG_BASE + "10", Backend.Block) + ) + ) + + assertTrue(decision.markBlocked) + assertEquals(FirewallRuleset.RULE17.id, decision.blockedByRuleOverride) + assertEquals(ProxyRoutingEngine.Reason.WIREGUARD, decision.reason) + } + + @Test + fun `determine route should use orbot proxy id when app assigned`() { + val decision = + ProxyRoutingEngine.determineRoute( + routingRequest( + isOrbotProxyEnabled = true, + orbotProxyAssignedToApp = true + ) + ) + + assertEquals(ProxyManager.ID_ORBOT_BASE, decision.proxyIds) + assertEquals(ProxyRoutingEngine.Reason.ORBOT_PROXY, decision.reason) + } + + @Test + fun `determine route should prefer socks5 over http`() { + val decision = + ProxyRoutingEngine.determineRoute( + routingRequest( + isCustomSocks5Enabled = true, + isCustomHttpProxyEnabled = true + ) + ) + + assertEquals(ProxyManager.ID_S5_BASE, decision.proxyIds) + assertEquals(ProxyRoutingEngine.Reason.SOCKS5_PROXY, decision.reason) + } + + @Test + fun `determine route should use dns direct app when only dns proxy app matches`() { + val decision = + ProxyRoutingEngine.determineRoute( + routingRequest( + isProxyEnabled = false, + isDnsProxyActive = true, + packageName = "com.test.app", + dnsProxyAppName = "com.test.app" + ) + ) + + assertEquals(Backend.Exit, decision.proxyIds) + assertEquals(ProxyRoutingEngine.Reason.DNS_PROXY_DIRECT_APP, decision.reason) + } + + @Test + fun `determine route precedence matrix`() { + data class Case( + val name: String, + val request: ProxyRoutingEngine.RoutingRequest, + val expectedProxy: String, + val expectedReason: ProxyRoutingEngine.Reason, + val expectedOrbotNotIncluded: Boolean? = null + ) + + val wgProxyId = ProxyManager.ID_WG_BASE + "7" + val cases = + listOf( + Case( + name = "wireguard takes precedence", + request = + routingRequest( + wireguardProxyIds = listOf(wgProxyId), + isOrbotProxyEnabled = true, + orbotProxyAssignedToApp = true, + isCustomSocks5Enabled = true, + isCustomHttpProxyEnabled = true + ), + expectedProxy = wgProxyId, + expectedReason = ProxyRoutingEngine.Reason.WIREGUARD + ), + Case( + name = "orbot direct app takes precedence", + request = + routingRequest( + isOrbotProxyEnabled = true, + packageName = "com.test.app", + orbotProxyAppName = "com.test.app", + orbotProxyAssignedToApp = true + ), + expectedProxy = Backend.Exit, + expectedReason = ProxyRoutingEngine.Reason.ORBOT_DIRECT_APP + ), + Case( + name = "orbot proxy takes precedence over socks and http", + request = + routingRequest( + isOrbotProxyEnabled = true, + orbotProxyAssignedToApp = true, + isCustomSocks5Enabled = true, + isCustomHttpProxyEnabled = true + ), + expectedProxy = ProxyManager.ID_ORBOT_BASE, + expectedReason = ProxyRoutingEngine.Reason.ORBOT_PROXY + ), + Case( + name = "socks5 direct app takes precedence over proxy id", + request = + routingRequest( + isCustomSocks5Enabled = true, + packageName = "com.test.app", + socks5ProxyAppName = "com.test.app" + ), + expectedProxy = Backend.Exit, + expectedReason = ProxyRoutingEngine.Reason.SOCKS5_DIRECT_APP + ), + Case( + name = "socks5 proxy takes precedence over http proxy", + request = + routingRequest( + isCustomSocks5Enabled = true, + isCustomHttpProxyEnabled = true + ), + expectedProxy = ProxyManager.ID_S5_BASE, + expectedReason = ProxyRoutingEngine.Reason.SOCKS5_PROXY + ), + Case( + name = "http direct app selected", + request = + routingRequest( + isCustomHttpProxyEnabled = true, + packageName = "com.test.app", + httpProxyAppName = "com.test.app" + ), + expectedProxy = Backend.Exit, + expectedReason = ProxyRoutingEngine.Reason.HTTP_DIRECT_APP + ), + Case( + name = "http proxy selected when app does not match", + request = + routingRequest( + isCustomHttpProxyEnabled = true, + packageName = "com.other.app", + httpProxyAppName = "com.test.app" + ), + expectedProxy = ProxyManager.ID_HTTP_BASE, + expectedReason = ProxyRoutingEngine.Reason.HTTP_PROXY + ), + Case( + name = "fallback base or exit with orbot enabled but app not assigned", + request = + routingRequest( + isOrbotProxyEnabled = true, + orbotProxyAssignedToApp = false, + baseOrExitProxyId = Backend.Base + ), + expectedProxy = Backend.Base, + expectedReason = ProxyRoutingEngine.Reason.FALLBACK_BASE_OR_EXIT, + expectedOrbotNotIncluded = true + ), + Case( + name = "no proxy active returns base or exit", + request = + routingRequest( + isProxyEnabled = false, + isDnsProxyActive = false, + baseOrExitProxyId = Backend.Base + ), + expectedProxy = Backend.Base, + expectedReason = ProxyRoutingEngine.Reason.NO_PROXY_ACTIVE + ) + ) + + cases.forEach { case -> + val decision = ProxyRoutingEngine.determineRoute(case.request) + assertEquals("${case.name} proxy", case.expectedProxy, decision.proxyIds) + assertEquals("${case.name} reason", case.expectedReason, decision.reason) + case.expectedOrbotNotIncluded?.let { + assertEquals("${case.name} orbot-not-included flag", it, decision.orbotProxyEnabledButAppNotIncluded) + } + } + } + + private fun specialAppRequest( + isDnsFirewallMode: Boolean = true, + isOrbotProxyEnabled: Boolean = false, + isCustomSocks5Enabled: Boolean = false, + isCustomHttpProxyEnabled: Boolean = false, + isDnsProxyActive: Boolean = false, + packageName: String? = null, + orbotProxyAppName: String? = null, + socks5ProxyAppName: String? = null, + httpProxyAppName: String? = null, + dnsProxyAppName: String? = null + ): ProxyRoutingEngine.SpecialAppRequest { + return ProxyRoutingEngine.SpecialAppRequest( + isDnsFirewallMode = isDnsFirewallMode, + isOrbotProxyEnabled = isOrbotProxyEnabled, + isCustomSocks5Enabled = isCustomSocks5Enabled, + isCustomHttpProxyEnabled = isCustomHttpProxyEnabled, + isDnsProxyActive = isDnsProxyActive, + packageName = packageName, + orbotProxyAppName = orbotProxyAppName, + socks5ProxyAppName = socks5ProxyAppName, + httpProxyAppName = httpProxyAppName, + dnsProxyAppName = dnsProxyAppName + ) + } + + private fun routingRequest( + uid: Int = 2001, + rethinkUid: Int = 1000, + rinr: Boolean = false, + autoProxyEnabled: Boolean = false, + blockedByRule: String = FirewallRuleset.RULE8.id, + appExcludedFromProxy: Boolean = false, + baseOrExitProxyId: String = Backend.Exit, + wireguardProxyIds: List = emptyList(), + isProxyEnabled: Boolean = true, + isDnsProxyActive: Boolean = false, + isOrbotProxyEnabled: Boolean = false, + isCustomSocks5Enabled: Boolean = false, + isCustomHttpProxyEnabled: Boolean = false, + packageName: String? = null, + orbotProxyAppName: String? = null, + orbotProxyAssignedToApp: Boolean = false, + socks5ProxyAppName: String? = null, + httpProxyAppName: String? = null, + dnsProxyAppName: String? = null + ): ProxyRoutingEngine.RoutingRequest { + return ProxyRoutingEngine.RoutingRequest( + uid = uid, + rethinkUid = rethinkUid, + rinr = rinr, + autoProxyEnabled = autoProxyEnabled, + blockedByRule = blockedByRule, + appExcludedFromProxy = appExcludedFromProxy, + baseOrExitProxyId = baseOrExitProxyId, + wireguardProxyIds = wireguardProxyIds, + isProxyEnabled = isProxyEnabled, + isDnsProxyActive = isDnsProxyActive, + isOrbotProxyEnabled = isOrbotProxyEnabled, + isCustomSocks5Enabled = isCustomSocks5Enabled, + isCustomHttpProxyEnabled = isCustomHttpProxyEnabled, + packageName = packageName, + orbotProxyAppName = orbotProxyAppName, + orbotProxyAssignedToApp = orbotProxyAssignedToApp, + socks5ProxyAppName = socks5ProxyAppName, + httpProxyAppName = httpProxyAppName, + dnsProxyAppName = dnsProxyAppName + ) + } +} diff --git a/app/src/test/java/com/celzero/bravedns/service/TempAllowExpiryWorkerTest.kt b/app/src/test/java/com/celzero/bravedns/service/TempAllowExpiryWorkerTest.kt index c7376cf97..cf1647687 100644 --- a/app/src/test/java/com/celzero/bravedns/service/TempAllowExpiryWorkerTest.kt +++ b/app/src/test/java/com/celzero/bravedns/service/TempAllowExpiryWorkerTest.kt @@ -16,9 +16,6 @@ package com.celzero.bravedns.service import android.content.Context -import androidx.work.WorkManager -import com.celzero.bravedns.database.AppInfoRepository -import io.mockk.clearAllMocks import io.mockk.every import io.mockk.mockk import io.mockk.mockkObject @@ -27,63 +24,39 @@ import io.mockk.verify import org.junit.After import org.junit.Before import org.junit.Test -import org.junit.runner.RunWith -import org.koin.core.context.startKoin -import org.koin.core.context.stopKoin -import org.koin.dsl.module -import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment -import org.robolectric.annotation.Config -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [28]) class TempAllowExpiryWorkerTest { private lateinit var context: Context - private val repo: AppInfoRepository = mockk() @Before fun setup() { - clearAllMocks() - context = RuntimeEnvironment.getApplication() - try { - stopKoin() - } catch (_: Exception) { - } - startKoin { modules(module { single { repo } }) } + context = mockk(relaxed = true) } @After fun tearDown() { - try { - stopKoin() - } catch (_: Exception) { - } + runCatching { unmockkObject(androidx.work.WorkManager) } } @Test - fun `scheduleNext cancels unique work when repo returns null`() { - every { repo.getNearestTempAllowExpiryBlocking(any()) } returns null + fun `cancel cancels unique work`() { + mockkObject(androidx.work.WorkManager) + val wm = mockk(relaxed = true) + every { androidx.work.WorkManager.getInstance(any()) } returns wm - mockkObject(WorkManager.Companion) - val wm = mockk(relaxed = true) - every { WorkManager.getInstance(context) } returns wm - - TempAllowExpiryWorker.scheduleNext(context) + TempAllowExpiryWorker.cancel(context) verify { wm.cancelUniqueWork("fw_temp_allow_expiry") } - unmockkObject(WorkManager.Companion) } @Test - fun `scheduleNext enqueues work when repo returns future expiry`() { - every { repo.getNearestTempAllowExpiryBlocking(any()) } returns System.currentTimeMillis() + 60_000L - - mockkObject(WorkManager.Companion) - val wm = mockk(relaxed = true) - every { WorkManager.getInstance(context) } returns wm + fun `enqueueAt enqueues unique work request`() { + mockkObject(androidx.work.WorkManager) + val wm = mockk(relaxed = true) + every { androidx.work.WorkManager.getInstance(any()) } returns wm - TempAllowExpiryWorker.scheduleNext(context) + TempAllowExpiryWorker.enqueueAt(context, System.currentTimeMillis() + 60_000L) verify { wm.enqueueUniqueWork( @@ -92,6 +65,5 @@ class TempAllowExpiryWorkerTest { any() ) } - unmockkObject(WorkManager.Companion) } } diff --git a/app/src/test/java/com/celzero/bravedns/service/WireguardManagerTest.kt b/app/src/test/java/com/celzero/bravedns/service/WireguardManagerTest.kt index 16069ea08..fd0e8819f 100644 --- a/app/src/test/java/com/celzero/bravedns/service/WireguardManagerTest.kt +++ b/app/src/test/java/com/celzero/bravedns/service/WireguardManagerTest.kt @@ -18,46 +18,29 @@ package com.celzero.bravedns.service import android.content.Context import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.celzero.bravedns.data.AppConfig +import com.celzero.bravedns.data.SsidItem import com.celzero.bravedns.database.WgConfigFilesImmutable import com.celzero.bravedns.database.WgConfigFilesRepository import com.celzero.bravedns.database.WgHopMapRepository import com.celzero.bravedns.service.ProxyManager.ID_WG_BASE +import com.celzero.bravedns.wireguard.Config as WgConfig import com.celzero.bravedns.wireguard.Peer import com.celzero.bravedns.wireguard.WgInterface -import com.celzero.firestack.backend.Backend -import io.mockk.Runs -import io.mockk.coEvery -import io.mockk.every -import io.mockk.just -import io.mockk.mockk -import io.mockk.mockkObject -import io.mockk.unmockkAll -import io.mockk.unmockkObject +import io.mockk.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.runBlocking -import kotlinx.coroutines.test.StandardTestDispatcher -import kotlinx.coroutines.test.resetMain -import kotlinx.coroutines.test.setMain -import org.junit.After -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertNotNull -import org.junit.Assert.assertNull -import org.junit.Assert.assertTrue -import org.junit.Assert.fail -import org.junit.Before -import org.junit.Rule -import org.junit.Test +import kotlinx.coroutines.test.* +import org.junit.* +import org.junit.Assert.* import org.junit.runner.RunWith import org.koin.core.context.startKoin import org.koin.core.context.stopKoin import org.koin.dsl.module import org.koin.test.KoinTest import org.robolectric.RobolectricTestRunner -import java.io.File -import com.celzero.bravedns.wireguard.Config as WgConfig import org.robolectric.annotation.Config as RobolectricConfig +import java.io.File @ExperimentalCoroutinesApi @RunWith(RobolectricTestRunner::class) @@ -77,6 +60,10 @@ class WireguardManagerTest : KoinTest { private lateinit var mockPeer: Peer private lateinit var mockPersistentState: PersistentState + private fun ssidStorage(vararg items: Pair): String { + return SsidItem.toStorageList(items.map { SsidItem(it.first, it.second) }) + } + @Before fun setUp() { Dispatchers.setMain(testDispatcher) @@ -167,7 +154,6 @@ class WireguardManagerTest : KoinTest { configPath: String = "/test/path", isActive: Boolean = false, isCatchAll: Boolean = false, - isLockdown: Boolean = false, oneWireGuard: Boolean = false, useOnlyOnMetered: Boolean = false, isDeletable: Boolean = true, @@ -181,7 +167,6 @@ class WireguardManagerTest : KoinTest { serverResponse = "test-response", isActive = isActive, isCatchAll = isCatchAll, - isLockdown = isLockdown, oneWireGuard = oneWireGuard, useOnlyOnMetered = useOnlyOnMetered, isDeletable = isDeletable, @@ -442,9 +427,8 @@ class WireguardManagerTest : KoinTest { // Note: WireguardManager uses its own injected AppConfig, not our test mock try { val result = WireguardManager.canEnableProxy() - // The method should return a boolean value without throwing exceptions - assertTrue("canEnableProxy should return a boolean value", result is Boolean) println("✅ PASSED: canEnableProxy() executed successfully") + println(" Result: $result") } catch (e: Exception) { fail("canEnableProxy() should not throw exception: ${e.message}") } @@ -546,7 +530,15 @@ class WireguardManagerTest : KoinTest { println("🧪 Testing matchesSsidList() - exact match") // Execute - val result = WireguardManager.matchesSsidList("""[{"name":"WiFi1","type":"equal_exact"},{"name":"WiFi2","type":"equal_exact"},{"name":"WiFi3","type":"equal_exact"}]""", "WiFi2") + val result = + WireguardManager.matchesSsidList( + ssidStorage( + "WiFi1" to SsidItem.SsidType.EQUAL_EXACT, + "WiFi2" to SsidItem.SsidType.EQUAL_EXACT, + "WiFi3" to SsidItem.SsidType.EQUAL_EXACT + ), + "WiFi2" + ) // Verify assertTrue("Should return true for exact match", result) @@ -558,7 +550,14 @@ class WireguardManagerTest : KoinTest { println("🧪 Testing matchesSsidList() - wildcard prefix match") // Execute - val result = WireguardManager.matchesSsidList("""[{"name":"WiFi*","type":"equal_wildcard"},{"name":"TestNet","type":"equal_exact"}]""", "WiFi123") + val result = + WireguardManager.matchesSsidList( + ssidStorage( + "WiFi*" to SsidItem.SsidType.EQUAL_WILDCARD, + "TestNet" to SsidItem.SsidType.EQUAL_EXACT + ), + "WiFi123" + ) // Verify assertTrue("Should return true for wildcard match", result) @@ -572,9 +571,17 @@ class WireguardManagerTest : KoinTest { println("🧪 Testing matchesSsidList() - no match") // Execute - val result = WireguardManager.matchesSsidList("""[{"name":"WiFi1","type":"equal_exact"},{"name":"WiFi2","type":"equal_exact"},{"name":"WiFi3","type":"equal_exact"}]""", "WiFi4") + val result = + WireguardManager.matchesSsidList( + ssidStorage( + "WiFi1" to SsidItem.SsidType.EQUAL_EXACT, + "WiFi2" to SsidItem.SsidType.EQUAL_EXACT, + "WiFi3" to SsidItem.SsidType.EQUAL_EXACT + ), + "WiFi4" + ) - // Verify + // Verify - Based on actual implementation, this should return false for no match assertFalse("Should return false for no match", result) println("✅ PASSED: matchesSsidList() handled no match correctly") } @@ -584,9 +591,16 @@ class WireguardManagerTest : KoinTest { println("🧪 Testing matchesSsidList() - null current ssid") // Execute - Test with a specific SSID list that won't match empty string - val result = WireguardManager.matchesSsidList("""[{"name":"WiFi1","type":"equal_exact"},{"name":"WiFi2","type":"equal_exact"}]""", "") + val result = + WireguardManager.matchesSsidList( + ssidStorage( + "WiFi1" to SsidItem.SsidType.EQUAL_EXACT, + "WiFi2" to SsidItem.SsidType.EQUAL_EXACT + ), + "" + ) - // Verify - empty string should not match specific SSIDs + // Verify - Based on actual implementation, empty string should not match specific SSIDs assertFalse("Should return false for empty current ssid when specific SSIDs are listed", result) println("✅ PASSED: matchesSsidList() handled null current ssid correctly") } @@ -595,8 +609,12 @@ class WireguardManagerTest : KoinTest { fun `test matchesSsidList - edge case with single wildcard`() { println("🧪 Testing matchesSsidList() - single wildcard") - // Execute - universal wildcard matches any SSID - val result = WireguardManager.matchesSsidList("""[{"name":"*","type":"equal_wildcard"}]""", "AnySSID") + // Execute + val result = + WireguardManager.matchesSsidList( + ssidStorage("*" to SsidItem.SsidType.EQUAL_WILDCARD), + "AnySSID" + ) // Verify assertTrue("Should return true for universal wildcard", result) @@ -607,11 +625,16 @@ class WireguardManagerTest : KoinTest { fun `test matchesSsidList - complex case with multiple wildcards`() { println("🧪 Testing matchesSsidList() - multiple wildcards") - // Execute - mixed equal_wildcard and equal_exact types in JSON format - val wL = """[{"name":"Home*","type":"equal_wildcard"},{"name":"Office*","type":"equal_wildcard"},{"name":"Guest","type":"equal_exact"}]""" - val result1 = WireguardManager.matchesSsidList(wL, "Home123") - val result2 = WireguardManager.matchesSsidList(wL, "Office456") - val result3 = WireguardManager.matchesSsidList(wL, "Guest") + // Execute + val storage = + ssidStorage( + "Home*" to SsidItem.SsidType.EQUAL_WILDCARD, + "Office*" to SsidItem.SsidType.EQUAL_WILDCARD, + "Guest" to SsidItem.SsidType.EQUAL_EXACT + ) + val result1 = WireguardManager.matchesSsidList(storage, "Home123") + val result2 = WireguardManager.matchesSsidList(storage, "Office456") + val result3 = WireguardManager.matchesSsidList(storage, "Guest") // Verify assertTrue("Should match first wildcard", result1) @@ -914,9 +937,8 @@ class WireguardManagerTest : KoinTest { // Note: WireguardManager uses its own injected AppConfig, not our test mock try { val result = WireguardManager.canEnableProxy() - // The method should return a boolean value without throwing exceptions - assertTrue("canEnableProxy should return a boolean value", result is Boolean) println("✅ PASSED: canEnableProxy() executed successfully and returned boolean") + println(" Result: $result") } catch (e: Exception) { fail("canEnableProxy() should not throw exception: ${e.message}") } @@ -930,9 +952,8 @@ class WireguardManagerTest : KoinTest { // Note: WireguardManager uses its own injected AppConfig, not our test mock try { val result = WireguardManager.canEnableProxy() - // The method should return a boolean value without throwing exceptions - assertTrue("canEnableProxy should return a boolean value", result is Boolean) println("✅ PASSED: canEnableProxy() executed successfully and returned boolean") + println(" Result: $result") } catch (e: Exception) { fail("canEnableProxy() should not throw exception: ${e.message}") } @@ -1015,556 +1036,6 @@ class WireguardManagerTest : KoinTest { println("✅ PASSED: Boundary conditions test completed successfully") } - // ===== ELIGIBILITY TESTS ===== - // These tests exercise the public API getAllPossibleConfigIdsForApp() which internally - // calls canUseConfig() -> isEligibleForNetwork() -> checkEligibilityBasedOnNw() and - // checkEligibilityBasedOnSsid(). The eligibility helpers are private; we test their - // combined behavior through the public method to avoid reflection-based testing. - - // --- checkEligibilityBasedOnNw (tested via getAllPossibleConfigIdsForApp with no SSID constraints) --- - - @Test - fun `eligibility Nw - useOnlyOnMetered false is eligible on mobile`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", true, "", "" - ) - assertTrue("useOnlyOnMetered=false should be eligible on mobile (catch-all)", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility Nw - useOnlyOnMetered true on mobile is eligible`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = true, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", true, "", "" - ) - assertTrue("useOnlyOnMetered=true on mobile should be eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility Nw - useOnlyOnMetered false on WiFi is eligible`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "MyWiFi", "" - ) - assertTrue("useOnlyOnMetered=false on WiFi should be eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility Nw - useOnlyOnMetered true on WiFi is NOT eligible by NW`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = true, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - // On WiFi + metered-only + ssidEnabled=false → not eligible - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "MyWiFi", "" - ) - assertFalse("useOnlyOnMetered=true on WiFi with no SSID should be NOT eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - // --- checkEligibilityBasedOnSsid --- - - @Test - fun `eligibility Ssid - ssidEnabled false is eligible on WiFi`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "MyWiFi", "" - ) - assertTrue("ssidEnabled=false should be eligible on any WiFi", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility Ssid - ssidEnabled true matching SSID is eligible`() = runBlocking { - val ssidsJson = """[{"name":"MyWiFi","type":"equal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "MyWiFi", "" - ) - assertTrue("ssidEnabled=true with matching SSID should be eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility Ssid - ssidEnabled true non-matching SSID is NOT eligible`() = runBlocking { - val ssidsJson = """[{"name":"MyWiFi","type":"equal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "OtherWiFi", "" - ) - assertFalse("ssidEnabled=true with non-matching SSID should be NOT eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility Ssid - ssidEnabled true wildcard match is eligible`() = runBlocking { - val ssidsJson = """[{"name":"Home*","type":"equal_wildcard"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "HomeNetwork", "" - ) - assertTrue("ssidEnabled=true with wildcard match should be eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility Ssid - ssidEnabled true not-equal SSID match is NOT eligible`() = runBlocking { - val ssidsJson = """[{"name":"CafeWiFi","type":"notequal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - // SSID matches NOT_EQUAL → block - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "CafeWiFi", "" - ) - assertFalse("ssidEnabled=true matching NOT_EQUAL SSID should be NOT eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility Ssid - empty ssid list with ssidEnabled true matches all`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = true, ssids = "" - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "AnyWiFi", "" - ) - assertTrue("ssidEnabled=true with empty SSID list should match all", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - // --- isEligibleForNetwork combined --- - - @Test - fun `eligibility combined - useOnlyOnMetered false ssidEnabled true on mobile IS eligible`() = runBlocking { - val ssidsJson = """[{"name":"CafeWiFi","type":"equal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - // On mobile the SSID rule is bypassed (mobile has no SSID context). - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", true, "", "" - ) - assertTrue("On mobile, the SSID rule is bypassed (mobile has no SSID)", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility combined - useOnlyOnMetered true ssidEnabled true on WiFi with matching SSID is eligible`() = runBlocking { - val ssidsJson = """[{"name":"MyWiFi","type":"equal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = true, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - // mobileOnly is meant as an alternative to ssidEnabled; when both are on, either - // rule being satisfied is enough. On WiFi with matching SSID, the SSID rule passes. - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "MyWiFi", "" - ) - assertTrue("mobileOnly + ssidEnabled on WiFi with matching SSID should be eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility combined - useOnlyOnMetered true ssidEnabled true on WiFi with non-matching SSID is NOT eligible`() = runBlocking { - val ssidsJson = """[{"name":"MyWiFi","type":"equal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = true, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - // On WiFi with non-matching SSID, neither rule passes: mobileOnly fails (not mobile) - // and ssidEnabled fails (SSID mismatch). - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "OtherWiFi", "" - ) - assertFalse("mobileOnly + ssidEnabled on WiFi with non-matching SSID should NOT be eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility combined - useOnlyOnMetered true ssidEnabled true on mobile IS eligible`() = runBlocking { - val ssidsJson = """[{"name":"MyWiFi","type":"equal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = true, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - // On mobile, both rules pass: mobileOnly on mobile, and ssidEnabled bypassed on mobile. - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", true, "", "" - ) - assertTrue("mobileOnly + ssidEnabled on mobile should be eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility combined - useOnlyOnMetered true on WiFi with non-matching SSID is NOT eligible`() = runBlocking { - val ssidsJson = """[{"name":"MyWiFi","type":"equal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = true, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(any()) } returns emptySet() - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "OtherWiFi", "" - ) - assertFalse("metered-only with non-matching SSID on WiFi should be NOT eligible", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - // --- canUseConfig (app-specific via getAllPossibleConfigIdsForApp) --- - - @Test - fun `eligibility canUseConfig - lockdown eligible returns only lockdown config`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isLockdown = true, - useOnlyOnMetered = false, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns setOf("${ID_WG_BASE}1") - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "MyWiFi", "" - ) - assertTrue("Lockdown eligible should return config id", ids.contains("${ID_WG_BASE}1")) - assertEquals(1, ids.size) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility canUseConfig - lockdown not eligible returns block`() = runBlocking { - val ssidsJson = """[{"name":"HomeWiFi","type":"equal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isLockdown = true, - useOnlyOnMetered = true, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns setOf("${ID_WG_BASE}1") - - // On WiFi with wrong SSID: NW false (useOnlyOnMetered=true), SSID false (no match) → not eligible → block - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "OtherWiFi", "" - ) - assertTrue("Lockdown not eligible should return block", ids.contains(Backend.Block)) - assertFalse("Lockdown not eligible should not contain config id", ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility canUseConfig - active eligible returns config id`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isLockdown = false, - useOnlyOnMetered = false, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns setOf("${ID_WG_BASE}1") - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "MyWiFi", "" - ) - assertTrue("Active eligible should return config id", ids.contains("${ID_WG_BASE}1")) - assertFalse("Active eligible should not return block", ids.contains(Backend.Block)) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility canUseConfig - active not eligible on WiFi returns empty`() = runBlocking { - val ssidsJson = """[{"name":"HomeWiFi","type":"equal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isLockdown = false, - useOnlyOnMetered = true, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns setOf("${ID_WG_BASE}1") - - // metered-only on WiFi without SSID match → app-specific returns empty (proceed to catch-all) - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "OtherWiFi", "" - ) - assertFalse("App-specific not eligible should not contain config id", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility canUseConfig - inactive config returns empty`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = false, isLockdown = false, - useOnlyOnMetered = false, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns setOf("${ID_WG_BASE}1") - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "MyWiFi", "" - ) - assertFalse("Inactive app-specific should not be added", ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - // --- getAllPossibleConfigIdsForApp integration --- - - @Test - fun `eligibility integration - lockdown adds block to empty list when not eligible`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isLockdown = true, - useOnlyOnMetered = true, ssidEnabled = true, - ssids = """[{"name":"HomeWiFi","type":"equal_exact"}]""" - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns setOf("${ID_WG_BASE}1") - - // On WiFi, wrong SSID, useOnlyOnMetered=true → NW false, SSID false → not eligible → block - // Then proxyIds is cleared and block is added - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "OtherWiFi", "" - ) - assertTrue("Block should be added when lockdown is not eligible", ids.contains(Backend.Block)) - assertEquals(1, ids.size) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility integration - multiple active configs with mixed SSID eligibility`() = runBlocking { - val ssidsJson = """[{"name":"HomeWiFi","type":"equal_exact"}]""" - val cfg1 = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = false, - useOnlyOnMetered = false, ssidEnabled = true, ssids = ssidsJson - ) - val cfg2 = createMockWgConfigFilesImmutable( - id = 2, isActive = true, isCatchAll = false, - useOnlyOnMetered = false, ssidEnabled = true, ssids = ssidsJson - ) - val cfg3 = createMockWgConfigFilesImmutable( - id = 3, isActive = true, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = false - ) - addConfigToManager(cfg1, setupMockConfig(1)) - addConfigToManager(cfg2, setupMockConfig(2)) - addConfigToManager(cfg3, setupMockConfig(3)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns setOf( - "${ID_WG_BASE}1", "${ID_WG_BASE}2" - ) - - // On HomeWiFi: app-specific 1 matches, app-specific 2 matches, catch-all 3 eligible - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "HomeWiFi", "" - ) - assertTrue("App-specific 1 should be added", ids.contains("${ID_WG_BASE}1")) - assertTrue("App-specific 2 should be added", ids.contains("${ID_WG_BASE}2")) - assertTrue("Catch-all 3 should be added", ids.contains("${ID_WG_BASE}3")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility integration - no matching configs returns default`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = true, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns emptySet() - - // metered-only on WiFi → not eligible → proxyIds empty → returns default - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "MyWiFi", "fallback-proxy" - ) - assertEquals(listOf("fallback-proxy"), ids) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility integration - no matching configs and no default returns empty`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isCatchAll = true, - useOnlyOnMetered = true, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns emptySet() - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "MyWiFi", "" - ) - assertTrue("Should return empty list", ids.isEmpty()) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility integration - active app-specific with metered-only on mobile adds config id`() = runBlocking { - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isLockdown = false, - useOnlyOnMetered = true, ssidEnabled = false - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns setOf("${ID_WG_BASE}1") - - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", true, "", "" - ) - assertTrue("Active app-specific metered-only on mobile should be added", - ids.contains("${ID_WG_BASE}1")) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility integration - lockdown on mobile with non-empty ssid list is eligible`() = runBlocking { - val ssidsJson = """[{"name":"CafeWiFi","type":"equal_exact"}]""" - val cfg = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isLockdown = true, - useOnlyOnMetered = true, ssidEnabled = true, ssids = ssidsJson - ) - addConfigToManager(cfg, setupMockConfig(1)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns setOf("${ID_WG_BASE}1") - - // On mobile, both rules pass: mobileOnly on mobile, and ssidEnabled bypassed on mobile. - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", true, "", "" - ) - assertTrue("Lockdown on mobile with non-empty ssidEnabled list should be eligible", - ids.contains("${ID_WG_BASE}1")) - assertEquals(1, ids.size) - unmockkObject(ProxyManager) - } - - @Test - fun `eligibility integration - active non-lockdown non-eligible on WiFi falls through to catch-all`() = runBlocking { - val ssidsJson = """[{"name":"HomeWiFi","type":"equal_exact"}]""" - val cfg1 = createMockWgConfigFilesImmutable( - id = 1, isActive = true, isLockdown = false, isCatchAll = false, - useOnlyOnMetered = true, ssidEnabled = true, ssids = ssidsJson - ) - val cfg2 = createMockWgConfigFilesImmutable( - id = 2, isActive = true, isLockdown = false, isCatchAll = true, - useOnlyOnMetered = false, ssidEnabled = false - ) - addConfigToManager(cfg1, setupMockConfig(1)) - addConfigToManager(cfg2, setupMockConfig(2)) - mockkObject(ProxyManager) - every { ProxyManager.getProxyIdsForApp(100) } returns setOf("${ID_WG_BASE}1") - - // App-specific 1 not eligible on OtherWiFi (metered-only + no match) - // Catch-all 2 is eligible (no metered restriction, no SSID restriction) - val ids = WireguardManager.getAllPossibleConfigIdsForApp( - 100, "1.1.1.1", 80, "", false, "OtherWiFi", "" - ) - assertFalse("App-specific 1 should not be added", ids.contains("${ID_WG_BASE}1")) - assertTrue("Catch-all 2 should be added", ids.contains("${ID_WG_BASE}2")) - unmockkObject(ProxyManager) - } - // FINAL COMPREHENSIVE TEST SUMMARY @Test @@ -1592,11 +1063,6 @@ class WireguardManagerTest : KoinTest { "matchesSsidList() - SSID matching logic (exact, wildcard, edge cases)", "getPeers() - Peer retrieval (existing, non-existing, empty, multiple)", "deleteResidueWgs() - Database cleanup operations", - "Eligibility - checkEligibilityBasedOnNw (mobile/WiFi × metered-only combinations)", - "Eligibility - checkEligibilityBasedOnSsid (enabled, match types, empty list)", - "Eligibility - isEligibleForNetwork combined (mobile bypass, WiFi+SSID logic)", - "Eligibility - canUseConfig (lockdown block, active eligible, inactive skip)", - "Eligibility - getAllPossibleConfigIdsForApp integration (lockdown+catch-all, fallthrough, default)", "Comprehensive state management - Complex multi-config scenarios", "Boundary condition testing - Maximum configuration scenarios", "Error handling - Invalid inputs, edge cases, malformed data", @@ -1620,7 +1086,7 @@ class WireguardManagerTest : KoinTest { println("✅ COMPREHENSIVE STATE MANAGEMENT COVERED") println("✅ NO STATIC MOCKING ISSUES") println("✅ ROBUST & MAINTAINABLE TEST SUITE") - println("✅ INCREASED FROM 28 TO 84+ TEST CASES (added 26 eligibility tests)") + println("✅ INCREASED FROM 28 TO 58+ TEST CASES") println("=".repeat(80)) assertTrue("Comprehensive test coverage completed successfully", true) @@ -1850,7 +1316,7 @@ class WireguardManagerTest : KoinTest { println("🧪 Testing canDisableConfig() - lockdown config") // Setup - val lockdownConfig = createMockWgConfigFilesImmutable(1, isLockdown = true, isCatchAll = false) + val lockdownConfig = createMockWgConfigFilesImmutable(1, isCatchAll = false) // Execute val result = WireguardManager.canDisableConfig(lockdownConfig) @@ -1866,7 +1332,7 @@ class WireguardManagerTest : KoinTest { // Setup val catchAllLockdownConfig = createMockWgConfigFilesImmutable( - 1, isCatchAll = true, isLockdown = true + 1, isCatchAll = true ) // Execute @@ -1892,7 +1358,7 @@ class WireguardManagerTest : KoinTest { setupMockConfig(2) ) addConfigToManager( - createMockWgConfigFilesImmutable(3, isActive = true, isLockdown = true), // Active lockdown but not catch-all + createMockWgConfigFilesImmutable(3, isActive = true), setupMockConfig(3) ) @@ -1926,9 +1392,21 @@ class WireguardManagerTest : KoinTest { println("🧪 Testing matchesSsidList() - case sensitivity") // Execute - Test case insensitive matching for strings - val result1 = WireguardManager.matchesSsidList("""[{"name":"WiFi1","type":"equal_exact"}]""", "wifi1") - val result2 = WireguardManager.matchesSsidList("""[{"name":"WiFi1","type":"equal_exact"}]""", "WIFI1") - val result3 = WireguardManager.matchesSsidList("""[{"name":"wifi*","type":"equal_wildcard"}]""", "WIFI123") + val result1 = + WireguardManager.matchesSsidList( + ssidStorage("WiFi1" to SsidItem.SsidType.EQUAL_EXACT), + "wifi1" + ) + val result2 = + WireguardManager.matchesSsidList( + ssidStorage("WiFi1" to SsidItem.SsidType.EQUAL_EXACT), + "WIFI1" + ) + val result3 = + WireguardManager.matchesSsidList( + ssidStorage("wifi*" to SsidItem.SsidType.EQUAL_WILDCARD), + "WIFI123" + ) // Verify assertTrue("Should match case insensitively for strings", result1) @@ -1941,11 +1419,27 @@ class WireguardManagerTest : KoinTest { fun `test matchesSsidList - complex wildcard patterns`() { println("🧪 Testing matchesSsidList() - complex wildcard patterns") - // Execute - Test various wildcard patterns in JSON format - val result1 = WireguardManager.matchesSsidList("""[{"name":"Test?","type":"equal_wildcard"}]""", "Test1") - val result2 = WireguardManager.matchesSsidList("""[{"name":"Test?","type":"equal_wildcard"}]""", "TestAB") // Should not match - val result3 = WireguardManager.matchesSsidList("""[{"name":"*Test*","type":"equal_wildcard"}]""", "MyTestNetwork") - val result4 = WireguardManager.matchesSsidList("""[{"name":"Home.*.com","type":"equal_wildcard"}]""", "Home.wifi.com") + // Execute - Test various wildcard patterns + val result1 = + WireguardManager.matchesSsidList( + ssidStorage("Test?" to SsidItem.SsidType.EQUAL_WILDCARD), + "Test1" + ) + val result2 = + WireguardManager.matchesSsidList( + ssidStorage("Test?" to SsidItem.SsidType.EQUAL_WILDCARD), + "TestAB" + ) // Should not match + val result3 = + WireguardManager.matchesSsidList( + ssidStorage("*Test*" to SsidItem.SsidType.EQUAL_WILDCARD), + "MyTestNetwork" + ) + val result4 = + WireguardManager.matchesSsidList( + ssidStorage("Home.*.com" to SsidItem.SsidType.EQUAL_WILDCARD), + "Home.wifi.com" + ) // Verify assertTrue("Should match single character wildcard (?)", result1) diff --git a/app/src/website/java/com/celzero/bravedns/iab/OnPurchaseListener.kt b/app/src/website/java/com/celzero/bravedns/iab/OnPurchaseListener.kt index f6fe6da48..e49a21e86 100644 --- a/app/src/website/java/com/celzero/bravedns/iab/OnPurchaseListener.kt +++ b/app/src/website/java/com/celzero/bravedns/iab/OnPurchaseListener.kt @@ -1,5 +1,5 @@ /* - * Copyright 2026 RethinkDNS and its authors + * Copyright 2020 RethinkDNS and its authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.celzero.bravedns.iab +package com.celzero.bravedns.ui.location -interface OnPurchaseListener { - - fun onPurchaseResult(isPurchaseSuccess: Boolean, message: String) -} +data class ServerLocation( + val id: String, + val name: String, + val latency: String, + var isSelected: Boolean = false +) diff --git a/app/src/website/java/com/celzero/bravedns/iab/QueryProductDetail.kt b/app/src/website/java/com/celzero/bravedns/iab/QueryProductDetail.kt index ad088e28a..a3f14a5be 100644 --- a/app/src/website/java/com/celzero/bravedns/iab/QueryProductDetail.kt +++ b/app/src/website/java/com/celzero/bravedns/iab/QueryProductDetail.kt @@ -1,5 +1,5 @@ /* - * Copyright 2026 RethinkDNS and its authors + * Copyright 2025 RethinkDNS and its authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.celzero.bravedns.iab +package com.celzero.bravedns.ui.location -import com.android.billingclient.api.ProductDetails +data class Country( + val id: String, + val name: String, + val flagResource: String, + val servers: List, + var isExpanded: Boolean = false +) { + val serverCount: Int + get() = servers.size -data class QueryProductDetail( - val productDetail: ProductDetail, - val productDetails: ProductDetails, - val offerDetails: ProductDetails.SubscriptionOfferDetails?, - val oneTimeOfferDetails: ProductDetails.OneTimePurchaseOfferDetails? -) + val selectedServerCount: Int + get() = servers.count { it.isSelected } +} diff --git a/assets/comparison.png b/assets/comparison.png new file mode 100644 index 000000000..79e736ce0 Binary files /dev/null and b/assets/comparison.png differ diff --git a/assets/more-dark.png b/assets/more-dark.png new file mode 100644 index 000000000..26abdcc4c Binary files /dev/null and b/assets/more-dark.png differ diff --git a/assets/more-light.png b/assets/more-light.png new file mode 100644 index 000000000..e5d18e8b8 Binary files /dev/null and b/assets/more-light.png differ diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..47d9219ef --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,42 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.ksp) apply false + alias(libs.plugins.google.services) apply false + alias(libs.plugins.firebase.crashlytics) apply false + alias(libs.plugins.detekt) apply false + alias(libs.plugins.version.catalog.update) + alias(libs.plugins.ben.manes.versions) +} + +allprojects { + repositories { + google() + mavenCentral() + + val firestackRepo = project.findProperty("firestackRepo") as? String ?: "github" + + if (firestackRepo == "jitpack") { + // jitpack.io/#celzero/firestack + maven("https://jitpack.io") + } else if (firestackRepo == "github") { + // maven.pkg.github.com/celzero/firestack + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/celzero/firestack") + credentials { + username = project.findProperty("gpr.user") as? String ?: System.getenv("USERNAME_GITHUB") + password = project.findProperty("gpr.key") as? String ?: System.getenv("TOKEN_GITHUB") + } + } + } else { + // ossrh: https://central.sonatype.com/artifact/com.celzero/firestack/ + // no-op; mavenCentral is already included + } + } +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml new file mode 100644 index 000000000..146272807 --- /dev/null +++ b/config/detekt/baseline.xml @@ -0,0 +1,812 @@ + + + + + ComplexCondition:BraveAutoStartReceiver.kt$BraveAutoStartReceiver$!persistentState.prefAutoStartBootUp && (intent.action == Intent.ACTION_BOOT_COMPLETED || intent.action == Intent.ACTION_REBOOT || intent.action == Intent.ACTION_LOCKED_BOOT_COMPLETED) + ComplexCondition:BraveAutoStartReceiver.kt$BraveAutoStartReceiver$Intent.ACTION_REBOOT != intent.action && Intent.ACTION_BOOT_COMPLETED != intent.action && Intent.ACTION_LOCKED_BOOT_COMPLETED != intent.action && Intent.ACTION_USER_UNLOCKED != intent.action && Intent.ACTION_MY_PACKAGE_REPLACED != intent.action + ComplexCondition:BraveVPNService.kt$BraveVPNService$!appConfig.isCustomSocks5Enabled() && !appConfig.isCustomHttpProxyEnabled() && !appConfig.isDnsProxyActive() && !appConfig.isOrbotProxyEnabled() + ComplexCondition:BraveVPNService.kt$BraveVPNService$(destIp.isZero && who.startsWith(ID_WG_BASE)) || destIp.isZero || destIp.isLoopback + ComplexCondition:BraveVPNService.kt$BraveVPNService$ROUTE4IN6 && isAuto && (has6 && !has4) + ComplexCondition:ConnTrackerDialog.kt$info.message.isEmpty() && info.duration == 0 && info.downloadBytes == 0L && info.uploadBytes == 0L + ComplexCondition:ConnectionTrackerAdapter.kt$ct.duration == 0 && ct.downloadBytes == 0L && ct.uploadBytes == 0L && ct.message.isEmpty() + ComplexCondition:CustomLanIpDialog.kt$!validateIpv4WithPrefix(gatewayV4, gatewayV4Prefix) || !validateIpv6WithPrefix(gatewayV6, gatewayV6Prefix) || !validateIpv4WithPrefix(routerV4, routerV4Prefix) || !validateIpv6WithPrefix(routerV6, routerV6Prefix) || !validateIpv4WithPrefix(dnsV4, dnsV4Prefix) || !validateIpv6WithPrefix(dnsV6, dnsV6Prefix) + ComplexCondition:DnsLogTracker.kt$DnsLogTracker$transaction.response.isNotEmpty() && transaction.response != UNSPECIFIED_IP_IPV4 && transaction.response != UNSPECIFIED_IP_IPV6 && transaction.response != EMPTY_RESPONSE + ComplexCondition:NetworkReachabilityDialog.kt$!valid41 || !valid42 || !validUrl41 || !validUrl42 || !valid61 || !valid62 || !validUrl61 || !validUrl62 + ComplexCondition:RefreshDatabase.kt$RefreshDatabase$latestRefreshTime > 0 && current - latestRefreshTime < FULL_REFRESH_INTERVAL && (action == ACTION_REFRESH_AUTO || action == ACTION_REFRESH_INTERACTIVE) + ComplexCondition:RethinkLogAdapter.kt$log.duration == 0 && log.downloadBytes == 0L && log.uploadBytes == 0L && log.message.isEmpty() + ComplexCondition:UIUtils.kt$UIUtils$seconds > 0 || (days == 0 && hours == 0 && minutes == 0) + ComplexCondition:WireguardManager.kt$WireguardManager$(it.id == WARP_ID && it.name == WARP_NAME) || (it.id == SEC_WARP_ID && it.name == SEC_WARP_NAME) + CyclomaticComplexMethod:AntiCensorshipScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AntiCensorshipScreen( persistentState: PersistentState, eventLogger: EventLogger, onBackClick: (() -> Unit)? = null ) + CyclomaticComplexMethod:AppConfig.kt$AppConfig$private suspend fun onDnsChange(dt: DnsType) + CyclomaticComplexMethod:AppDomainRulesDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AppDomainRulesSheet( uid: Int, domain: String, eventLogger: EventLogger, onDismiss: () -> Unit, onUpdated: () -> Unit ) + CyclomaticComplexMethod:AppInfoScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AppInfoScreen( uid: Int, eventLogger: EventLogger, ipRulesViewModel: CustomIpViewModel, domainRulesViewModel: CustomDomainViewModel, networkLogsViewModel: AppConnectionsViewModel, onBackClick: () -> Unit, onAppWiseIpLogsClick: (Int, Boolean) -> Unit, onCustomRulesClick: (Int) -> Unit ) + CyclomaticComplexMethod:AppListScreen.kt$@OptIn(FlowPreview::class) @Composable fun AppListScreen( viewModel: AppInfoViewModel, eventLogger: EventLogger, refreshDatabase: RefreshDatabase, onBackClick: (() -> Unit)? = null ) + CyclomaticComplexMethod:BraveAutoStartReceiver.kt$BraveAutoStartReceiver$override fun onReceive(context: Context, intent: Intent) + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$fun parseIpAndPort(endpoint: String?): Pair<String, Int> + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$override fun flow( protocol: Int, _uid: Int, src: Gostr?, dst: Gostr?, realIps: Gostr?, d: Gostr?, possibleDomains: Gostr?, blocklists: Gostr? ): Mark + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$override fun onSharedPreferenceChanged(preferences: SharedPreferences?, key: String?) + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private fun builderStats(): String + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private fun interestingNetworkChanges( old: ConnectionMonitor.UnderlyingNetworks? = underlyingNetworks, _new: ConnectionMonitor.UnderlyingNetworks? = null, aux: OverlayNetworks = overlayNetworks ): NetworkChanges + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private fun isVpnDns(ip: String): Boolean + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private suspend fun bindAny( who: String, addrPort: String, fid: Long, nws: List<ConnectionMonitor.NetworkProperties> ) + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private suspend fun determineDnsTransportIdForDFMode(uid: Int, domain: String, splitDns: Boolean, rinr: Boolean): Pair<String, String> + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private suspend fun determineProxyDetails( connTracker: ConnTrackerMetaData, doubleLoopback: Boolean, rinr: Boolean ): Mark + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private suspend fun establishVpn(networks: Networks, mtu: Int): ParcelFileDescriptor? + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private suspend fun firewall( connInfo: ConnTrackerMetaData, domains: String?, anyRealIpBlocked: Boolean = false, isSplApp: Boolean, rinr: Boolean ): FirewallRuleset + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private suspend fun getTransportIdForDnsFirewallMode(uid: Int, fqdn: String, rinr: Boolean): DNSOpts + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private suspend fun isSpecialApp(uid: Int): Boolean + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$private suspend fun newBuilder(): Builder + CyclomaticComplexMethod:BraveVPNService.kt$BraveVPNService$suspend fun onNetworkConnected(networks: ConnectionMonitor.UnderlyingNetworks, forceRestart: Boolean = false) + CyclomaticComplexMethod:BugReportZipper.kt$BugReportZipper$@RequiresApi(Build.VERSION_CODES.O) fun rezipAll(dir: File, file: File) + CyclomaticComplexMethod:ConfigureOtherDnsScreen.kt$@Composable private fun DnsProxyDialogContent( appNames: List<String>, nextIndex: Int, appConfig: AppConfig, persistentState: PersistentState, scope: CoroutineScope, onDismiss: () -> Unit ) + CyclomaticComplexMethod:ConfigureRethinkBasicScreen.kt$@Composable private fun RethinkBlocklistContent( modifier: Modifier = Modifier, context: Context, blocklistType: RethinkBlocklistManager.RethinkBlocklistType, filters: MutableLiveData<RethinkBlocklistState.Filters>, remoteFileTagViewModel: RethinkRemoteFileTagViewModel, localFileTagViewModel: RethinkLocalFileTagViewModel, remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, showDownload: Boolean, showConfigure: Boolean, isDownloading: Boolean, showRemoteProgress: Boolean, activeView: RethinkBlocklistState.BlocklistView, filterLabelText: String, showPlusFilterSheet: Boolean, plusFilterTags: List<FileTag>, onActiveViewChanged: (RethinkBlocklistState.BlocklistView) -> Unit, onFilterLabelTextChanged: (String) -> Unit, onShowPlusFilterSheetChanged: (Boolean) -> Unit, onPlusFilterTagsChanged: (List<FileTag>) -> Unit, onDownloadBlocklist: () -> Unit, onCancelDownload: () -> Unit, onApplyChanges: () -> Unit, onRevertChanges: () -> Unit, onRefreshBlocklistAvailability: () -> Unit, onProcessSelectedFileTags: (String) -> Unit, onModifiedStampChanged: (String) -> Unit, getStampValue: () -> String, onDownloadStart: () -> Unit, onDownloadFail: () -> Unit, onDownloadSuccess: () -> Unit ) + CyclomaticComplexMethod:ConfigureRethinkBasicScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun ConfigureRethinkBasicScreen( screenType: ConfigureRethinkScreenType, remoteName: String = "", remoteUrl: String = "", uid: Int = Constants.MISSING_UID, persistentState: PersistentState, appConfig: AppConfig, appDownloadManager: AppDownloadManager, rethinkEndpointViewModel: RethinkEndpointViewModel, remoteFileTagViewModel: RethinkRemoteFileTagViewModel, localFileTagViewModel: RethinkLocalFileTagViewModel, remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, onBackClick: (() -> Unit)? = null ) + CyclomaticComplexMethod:ConnTrackerDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun ConnTrackerSheet( activity: FragmentActivity, info: ConnectionTracker, persistentState: PersistentState, eventLogger: EventLogger, onDismiss: () -> Unit ) + CyclomaticComplexMethod:ConnTrackerDialog.kt$private fun showFirewallRulesDialog( activity: FragmentActivity, info: ConnectionTracker ): RulesDialogContent + CyclomaticComplexMethod:ConnectionMonitor.kt$ConnectionMonitor.NetworkRequestHandler$private suspend fun repopulateTrackedNetworks( opPrefs: OpPrefs, nwProps: LinkedHashSet<NetworkProperties> ) + CyclomaticComplexMethod:ConnectionTracer.kt$ConnectionTracer$@RequiresApi(Build.VERSION_CODES.Q) suspend fun getUidQ( protocol: Int, srcIp: String, srcPort: Int, dstIp: String, dstPort: Int, retryCount: Int = 0 ): Int + CyclomaticComplexMethod:ConnectionTrackerAdapter.kt$private fun summaryInfo(context: Context, ct: ConnectionTracker): Summary + CyclomaticComplexMethod:CustomLanIpDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun CustomLanIpSheet( persistentState: PersistentState, onDismiss: () -> Unit ) + CyclomaticComplexMethod:DetailedStatisticsScreen.kt$@Composable fun DetailedStatisticsScreen( viewModel: DetailedStatisticsViewModel, type: SummaryStatisticsType, timeCategory: TimeCategory, onBackClick: () -> Unit ) + CyclomaticComplexMethod:DnsDetailScreen.kt$@Composable fun DnsDetailScreen( viewModel: DnsSettingsViewModel, persistentState: PersistentState, appDownloadManager: AppDownloadManager, onCustomDnsClick: () -> Unit, onRethinkPlusDnsClick: () -> Unit, onLocalBlocklistConfigureClick: () -> Unit, onBackClick: (() -> Unit)? = null ) + CyclomaticComplexMethod:DnsLogTracker.kt$DnsLogTracker$suspend fun makeDnsLogObj(transaction: Transaction): DnsLog + CyclomaticComplexMethod:FirewallManager.kt$FirewallManager$fun getLabelForStatus(firewallStatus: FirewallStatus, connectionStatus: ConnectionStatus, prevConnStatus: ConnectionStatus): Int + CyclomaticComplexMethod:FirewallRuleEvaluator.kt$FirewallRuleEvaluator$private suspend fun evaluateRulesInOrder( connInfo: ConnTrackerMetaData, domains: String?, anyRealIpBlocked: Boolean, isSplApp: Boolean, rinr: Boolean, uid: Int, appStatus: FirewallManager.FirewallStatus, connectionStatus: FirewallManager.ConnectionStatus, isTempAllowed: Boolean ): FirewallRuleset + CyclomaticComplexMethod:FirewallRuleset.kt$FirewallRuleset.Companion$fun getFirewallRule(ruleId: String): FirewallRuleset? + CyclomaticComplexMethod:FirewallRuleset.kt$FirewallRuleset.Companion$fun getRulesIcon(ruleId: String?): Int + CyclomaticComplexMethod:FirewallRuleset.kt$FirewallRuleset.Companion$fun shouldShowHint(rule: String?): Boolean + CyclomaticComplexMethod:GoVpnAdapter.kt$GoVpnAdapter$suspend fun refreshOrPauseOrResumeOrReAddProxies(isMobileActive: Boolean, ssid: String) + CyclomaticComplexMethod:HomeNavigation.kt$@Composable fun HomeScreenRoot( homeUiState: HomeScreenUiState, onHomeStartStopClick: () -> Unit, onHomeDnsClick: () -> Unit, onHomeFirewallClick: () -> Unit, onHomeProxyClick: () -> Unit, onHomeLogsClick: () -> Unit, onHomeAppsClick: () -> Unit, onHomeSponsorClick: () -> Unit, summaryViewModel: SummaryStatisticsViewModel, onOpenDetailedStats: (SummaryStatisticsType) -> Unit, startDestination: HomeRoute, isDebug: Boolean, onConfigureAppsClick: () -> Unit, onConfigureDnsClick: () -> Unit, onConfigureFirewallClick: () -> Unit, onFirewallUniversalClick: () -> Unit, onFirewallCustomIpClick: () -> Unit, onFirewallAppWiseIpClick: () -> Unit, onConfigureProxyClick: () -> Unit, onConfigureNetworkClick: () -> Unit, onConfigureOthersClick: () -> Unit, onConfigureLogsClick: () -> Unit, onConfigureAntiCensorshipClick: () -> Unit, onConfigureAdvancedClick: () -> Unit, aboutUiState: AboutUiState, onSponsorClick: () -> Unit, onTelegramClick: () -> Unit, onBugReportClick: () -> Unit, onWhatsNewClick: () -> Unit, onAppUpdateClick: () -> Unit, onContributorsClick: () -> Unit, onTranslateClick: () -> Unit, onWebsiteClick: () -> Unit, onGithubClick: () -> Unit, onFaqClick: () -> Unit, onDocsClick: () -> Unit, onPrivacyPolicyClick: () -> Unit, onTermsOfServiceClick: () -> Unit, onLicenseClick: () -> Unit, onTwitterClick: () -> Unit, onEmailClick: () -> Unit, onRedditClick: () -> Unit, onElementClick: () -> Unit, onMastodonClick: () -> Unit, onAppInfoClick: () -> Unit, onVpnProfileClick: () -> Unit, onNotificationClick: () -> Unit, onStatsClick: () -> Unit, onDbStatsClick: () -> Unit, onFlightRecordClick: () -> Unit, onEventLogsClick: () -> Unit, onTokenClick: () -> Unit, onTokenDoubleTap: () -> Unit, onFossClick: () -> Unit, onFlossFundsClick: () -> Unit, snackbarHostState: SnackbarHostState, detailedStatsViewModel: DetailedStatisticsViewModel, domainConnectionsViewModel: DomainConnectionsViewModel, eventsViewModel: EventsViewModel, eventDao: EventDao, appInfoEventLogger: EventLogger, appInfoIpRulesViewModel: CustomIpViewModel, appInfoDomainRulesViewModel: CustomDomainViewModel, appInfoNetworkLogsViewModel: AppConnectionsViewModel, persistentState: PersistentState, appConfig: AppConfig, onOpenVpnProfile: () -> Unit, onRefreshDatabase: (() -> Unit)? = null, consoleLogViewModel: ConsoleLogViewModel, consoleLogRepository: ConsoleLogRepository, onShareConsoleLogs: () -> Unit, onConsoleLogsDeleteComplete: () -> Unit, proxyAppsMappingViewModel: ProxyAppsMappingViewModel, dnsSettingsViewModel: DnsSettingsViewModel, appDownloadManager: AppDownloadManager, onDnsCustomDnsClick: () -> Unit, onDnsRethinkPlusDnsClick: () -> Unit, onDnsLocalBlocklistConfigureClick: () -> Unit, homeNavRequest: HomeNavRequest?, onHomeNavConsumed: () -> Unit, onAppLockResult: (AppLockResult) -> Unit = {}, // ConfigureRethinkBasic dependencies rethinkEndpointViewModel: RethinkEndpointViewModel, remoteFileTagViewModel: RethinkRemoteFileTagViewModel, localFileTagViewModel: RethinkLocalFileTagViewModel, remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, appInfoViewModel: AppInfoViewModel, refreshDatabase: RefreshDatabase, connectionTrackerViewModel: ConnectionTrackerViewModel, dnsLogViewModel: DnsLogViewModel, rethinkLogViewModel: RethinkLogViewModel, connectionTrackerRepository: ConnectionTrackerRepository, dnsLogRepository: DnsLogRepository, rethinkLogRepository: RethinkLogRepository, onConfigureOtherDns: (Int) -> Unit, // ConfigureOtherDns dependencies dohViewModel: DoHEndpointViewModel, dotViewModel: DoTEndpointViewModel, dnsProxyViewModel: DnsProxyEndpointViewModel, dnsCryptViewModel: DnsCryptEndpointViewModel, dnsCryptRelayViewModel: DnsCryptRelayEndpointViewModel, oDohViewModel: ODoHEndpointViewModel, // UniversalFirewallSettings callbacks onNavigateToLogs: (String) -> Unit, onOpenAccessibilitySettings: () -> Unit, // WireGuard dependencies wgConfigViewModel: WgConfigViewModel, // Checkout dependencies checkoutViewModel: CheckoutViewModel?, onNavigateToProxy: () -> Unit, // WgMain callbacks onWgCreateClick: () -> Unit, onWgImportClick: () -> Unit, onWgQrScanClick: () -> Unit ) + CyclomaticComplexMethod:HomeScreenActivity.kt$HomeScreenActivity$@Composable private fun HomeDialogHost() + CyclomaticComplexMethod:HomeScreenActivity.kt$HomeScreenActivity$private fun collectAllBugReportFiles(): List<BugReportFile> + CyclomaticComplexMethod:HomeScreenViewModel.kt$HomeScreenViewModel$private suspend fun updateUiWithProxyStates() + CyclomaticComplexMethod:Logger.kt$Logger$fun log(tag: String, msg: String, type: LoggerLevel, e: Exception? = null) + CyclomaticComplexMethod:NetworkBindingService.kt$NetworkBindingService$private suspend fun bindAny( who: String, addrPort: String, fid: Long, networks: List<NetworkProperties> ): Boolean + CyclomaticComplexMethod:NetworkReachabilityDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun NetworkReachabilitySheet( persistentState: PersistentState, onDismiss: () -> Unit ) + CyclomaticComplexMethod:OneWgConfigAdapter.kt$@Composable fun OneWgConfigRow( config: WgConfigFiles, eventLogger: EventLogger, onDnsStatusChanged: () -> Unit, onConfigDetailClick: (Int, WgType) -> Unit ) + CyclomaticComplexMethod:PipKeyManager.kt$PipKeyManager$private suspend fun publicKeyUsable(context: Context, retryCount: Int = 0, shouldPersistResult: Boolean): Pair<Boolean, String> + CyclomaticComplexMethod:ProxyStateManager.kt$ProxyStateManager$suspend fun updateProxyStatus() + CyclomaticComplexMethod:RefreshDatabase.kt$RefreshDatabase$suspend fun process(a: Action) + CyclomaticComplexMethod:RethinkLogAdapter.kt$private fun summaryInfo(context: Context, log: RethinkLog): LogSummary + CyclomaticComplexMethod:TcpProxyMainScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun TcpProxyMainScreen( appConfig: AppConfig, mappingViewModel: ProxyAppsMappingViewModel, onBackClick: (() -> Unit)? = null ) + CyclomaticComplexMethod:TunnelImporter.kt$TunnelImporter$suspend fun importTunnel( contentResolver: ContentResolver, uri: Uri, messageCallback: (CharSequence) -> Unit ) + CyclomaticComplexMethod:TunnelSettingsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun TunnelSettingsScreen( persistentState: PersistentState, appConfig: AppConfig, eventLogger: EventLogger, onOpenVpnProfile: () -> Unit, onBackClick: (() -> Unit)? = null ) + CyclomaticComplexMethod:UniversalFirewallSettingsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun UniversalFirewallSettingsScreen( persistentState: PersistentState, eventLogger: EventLogger, connTrackerRepository: ConnectionTrackerRepository, onNavigateToLogs: (String) -> Unit, onOpenAccessibilitySettings: () -> Unit, onBackClick: (() -> Unit)? = null ) + CyclomaticComplexMethod:WgConfigAdapter.kt$@Composable fun WgConfigRow( config: WgConfigFiles, eventLogger: EventLogger, onDnsStatusChanged: () -> Unit, onConfigDetailClick: (Int, WgType) -> Unit ) + CyclomaticComplexMethod:WgConfigDetailScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun WgConfigDetailScreen( configId: Int, wgType: WgType, persistentState: PersistentState, eventLogger: EventLogger, mappingViewModel: ProxyAppsMappingViewModel, onEditConfig: (Int, WgType) -> Unit, onBackClick: () -> Unit ) + CyclomaticComplexMethod:WgConfigEditorScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun WgConfigEditorScreen( configId: Int, wgType: WgType, persistentState: PersistentState, onBackClick: () -> Unit, onSaveSuccess: () -> Unit ) + CyclomaticComplexMethod:WgHopAdapter.kt$@Composable fun HopRow( context: Context, srcId: Int, config: Config, isActive: Boolean, selectedId: Int, onSelectedIdChange: (Int) -> Unit ) + CyclomaticComplexMethod:WgHopAdapter.kt$private suspend fun handleHop( context: Context, srcId: Int, config: Config, isChecked: Boolean, isActive: Boolean, selectedId: Int, onSelectedIdChange: (Int) -> Unit ): Pair<Boolean, String> + CyclomaticComplexMethod:WgInterface.kt$WgInterface$@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") override fun equals(obj: Any?): Boolean + CyclomaticComplexMethod:WgInterface.kt$WgInterface.Companion$@Throws(BadConfigException::class) fun parse(lines: Iterable<CharSequence?>): WgInterface + CyclomaticComplexMethod:WgMainScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun WgMainScreen( wgConfigViewModel: WgConfigViewModel, persistentState: PersistentState, appConfig: AppConfig, eventLogger: EventLogger, onBackClick: () -> Unit, onCreateClick: () -> Unit, onImportClick: () -> Unit, onQrScanClick: () -> Unit, onConfigDetailClick: (Int, WgType) -> Unit ) + CyclomaticComplexMethod:WireguardManager.kt$WireguardManager$fun getAllPossibleConfigIdsForApp(uid: Int, ip: String, port: Int, domain: String, usesMobileNw: Boolean, ssid: String, default: String): List<String> + EmptyFinallyBlock:EnhancedBugReport.kt$EnhancedBugReport${ } + EmptySecondaryConstructor:BadConfigException.kt$BadConfigException${} + EmptySecondaryConstructor:ParseException.kt$ParseException${} + ExplicitItLambdaParameter:AppDownloadManager.kt$AppDownloadManager${ i, it -> val fileName = it.filename // url: https://dl.rethinkdns.com/update/blocklists?tstamp=1696197375609&vcode=33 Logger.d(LOG_TAG_DOWNLOAD, "v: ($timestamp), f: $fileName, u: $it.url") downloadIds[i] = enqueueDownload(it.url, fileName, timestamp.toString()) if (downloadIds[i] == INVALID_DOWNLOAD_ID) { return DownloadManagerStatus.FAILURE } } + ExplicitItLambdaParameter:GoVpnAdapter.kt$GoVpnAdapter${ it -> val id = ID_WG_BASE + it.getId() val files = WireguardManager.getConfigFilesById(it.getId()) // skip one-wg proxy, mobile-only doesn't apply val isWireGuardMobileOnly = files?.useOnlyOnMetered == true && !files.oneWireGuard val canResumeMobileWg = isWireGuardMobileOnly && isMobileActive val useOnlyOnSsid = files?.ssidEnabled == true && !files.oneWireGuard val configuredSsids = files?.ssids ?: "" val ssidMatch = WireguardManager.matchesSsidList(configuredSsids, ssid) && ssid.isNotEmpty() val canResumeSsidWg = useOnlyOnSsid && ssidMatch val canResume = canResumeMobileWg || canResumeSsidWg Logger.d( LOG_TAG_VPN, "$TAG refresh proxy: $id, mobileOnly: $isWireGuardMobileOnly, " + "canResumeMobileWg: $canResumeMobileWg, canResumeSsidWg: $canResumeSsidWg, isMobileActive: $isMobileActive, " + "useOnlyOnSsid: $useOnlyOnSsid, ssidMatch: $ssidMatch, ssid: $ssid, canResume: $canResume, wg-ssids: $configuredSsids" ) val stats = getProxyStatusById(id).first if (stats == null || stats == Backend.TNT) { Logger.w(LOG_TAG_VPN, "$TAG proxy stats for $id is null or tnt, $stats, re-adding") // there are cases where the proxy needs to be re-added, so pingOrReAddProxy // case: some of the wg proxies are added to tunnel but erring out, so // re-adding those proxies seems working, work around for now // now re-add logic is handled in go-tun // (github.com/celzero/firestack/blob/61187f88c1/intra/ipn/wgproxy.go#L404) addWgProxy(id, true) } if (stats == Backend.TPU && canResume) { // if the proxy is paused, then resume it // this is needed when the tunnel is reconnected and the proxies are paused // so resume them, also when there is switch in wg-config for useOnlyOnMetered // or ssid change for ssidEnabled wgs val res = getProxies()?.getProxy(id.togs())?.resume() logEvent( Severity.LOW, "wireguard proxy resumed", "Wireguard proxy with id $id resumed successfully" ) Logger.i(LOG_TAG_VPN, "$TAG resumed proxy: $id, res: $res") } else if (isWireGuardMobileOnly && !isMobileActive && !canResume) { // if the proxy is not paused, then pause it // this is needed when the network is on mobile data // and the wg-config is set to useOnlyOnMetered val res = getProxies()?.getProxy(id.togs())?.pause() logEvent( Severity.LOW, "wireguard proxy paused", "Wireguard proxy with id $id paused successfully" ) Logger.i(LOG_TAG_VPN, "$TAG paused proxy (mobile): $id, res: $res") } else if (useOnlyOnSsid && !ssidMatch && !canResume) { // when the ssidEnabled is set and the ssid does not match val res = getProxies()?.getProxy(id.togs())?.pause() logEvent( Severity.LOW, "wireguard proxy paused", "Wireguard proxy with id $id paused successfully" ) Logger.i(LOG_TAG_VPN, "$TAG paused proxy (ssid): $id, res: $res") } if (stats == Backend.TPU && !isWireGuardMobileOnly && !useOnlyOnSsid) { // if the proxy is paused, then resume it // this is needed when the tunnel is reconnected and the proxies are paused val res = getProxies()?.getProxy(id.togs())?.resume() logEvent( Severity.LOW, "wireguard proxy resumed", "Wireguard proxy with id $id resumed successfully" ) Logger.i(LOG_TAG_VPN, "$TAG resumed proxy (non-metered/ssid): $id, res: $res") } } + ExplicitItLambdaParameter:RetrofitManager.kt$RetrofitManager.Companion${ it -> try { when (it) { OkHttpDnsType.DEFAULT -> { return DnsOverHttps.Builder() .client(bootstrapClient) .url("https://dns.quad9.net/dns-query".toHttpUrl()) .bootstrapDnsHosts( getByIp("9.9.9.9"), getByIp("149.112.112.112"), getByIp("2620:fe::9"), getByIp("2620:fe::fe") ) .includeIPv6(true) .build() } OkHttpDnsType.CLOUDFLARE -> { return DnsOverHttps.Builder() .client(bootstrapClient) .url("https://cloudflare-dns.com/dns-query".toHttpUrl()) .bootstrapDnsHosts( getByIp("1.1.1.1"), getByIp("1.0.0.1"), getByIp("2606:4700:4700::1111"), getByIp("2606:4700:4700::1001") ) .includeIPv6(true) .build() } OkHttpDnsType.GOOGLE -> { return DnsOverHttps.Builder() .client(bootstrapClient) .url("https://dns.google/dns-query".toHttpUrl()) .bootstrapDnsHosts( getByIp("8.8.8.8"), getByIp("8.8.4.4"), getByIp("2001:4860:4860:0:0:0:0:8888"), getByIp("2001:4860:4860:0:0:0:0:8844") ) .includeIPv6(true) .build() } OkHttpDnsType.SYSTEM_DNS -> { return Dns.SYSTEM } OkHttpDnsType.FALLBACK_DNS -> { // todo: return retrieved system dns return null } } } catch (e: Exception) { Logger.crash(Logger.LOG_TAG_DOWNLOAD, "err; custom dns: ${e.message}", e) } } + ExplicitItLambdaParameter:SummaryStatisticsViewModel.kt$SummaryStatisticsViewModel${ it -> val to = System.currentTimeMillis() - it Pager(PagingConfig(Constants.LIVEDATA_PAGE_SIZE)) { statsDao.getTopActiveConns(to) } .flow .cachedIn(viewModelScope) } + ForbiddenComment:AppConfig.kt$AppConfig$// FIXME: tunnel does not support both http and socks5 at once. + ForbiddenComment:AppConfig.kt$AppConfig.TunProxyMode$// TODO: untangle the mess of proxy modes and providers + ForbiddenComment:AppWiseDomainLogsScreen.kt$// TODO: check if this should be dynamic + ForbiddenComment:BackgroundAccessibilityService.kt$BackgroundAccessibilityService$// FIXME: Figure out a fool-proof way to determine is launcher visible + ForbiddenComment:BackgroundAccessibilityService.kt$BackgroundAccessibilityService$// TODO: Handle widgets on the homescreen + ForbiddenComment:BackupAgent.kt$BackupAgent$// TODO: check if the journal files are needed for restore + ForbiddenComment:BraveTileService.kt$BraveTileService$// TODO: should we check for last unlock time here? + ForbiddenComment:BraveVPNService.kt$BraveVPNService$/*private suspend fun checkForPlusSubscription() { // initiate the billing client if it is not already initialized if (!InAppBillingHandler.isBillingClientSetup()) { InAppBillingHandler.initiate(this.applicationContext) Logger.i(LOG_TAG_VPN, "checkForPlusSubscription: billing client initiated") } else { Logger.i(LOG_TAG_VPN, "checkForPlusSubscription: billing client already setup") } // start the subscription check only if the user has enabled the feature // and the subscription check is not already in progress // invoke the work manager to check the subscription status if (RpnProxyManager.isRpnEnabled()) { io("rethinkPlusSubs") { handleRpnProxies() Logger.i(LOG_TAG_VPN, "checkForPlusSubscription(rpn): start work manager") val workManager = WorkManager.getInstance(this) val workRequest = OneTimeWorkRequestBuilder<SubscriptionCheckWorker>().build() workManager.enqueueUniqueWork( SubscriptionCheckWorker.WORK_NAME, ExistingWorkPolicy.REPLACE, workRequest ) } // TOOD: write listener to check the subscription status, if worker fails // reset the last check time } else { Logger.i(LOG_TAG_VPN, "checkForPlusSubscription(rpn): feature disabled") } } private suspend fun handleRpnProxies() { if (RpnProxyManager.isRpnActive()) { if (vpnAdapter == null) { Logger.i(LOG_TAG_VPN, "handleRpnProxies(rpn): adapter null, no-op") return } // win proxy is handled separately handleWinProxy() // TODO: get the list of other countries other than default, add all of them // make sure it doesn't exceed the max number of allowed configs (5) // if the user has selected a country, then add that country to the list val countries = RpnProxyManager.getSelectedCCs() if (countries.isNotEmpty()) { Logger.i(LOG_TAG_VPN, "$TAG handleRpnProxies: selected countries(rpn): $countries") // TODO: add the selected countries to the tunnel, new API needed } vpnAdapter?.setRpnAutoMode() } else { // either in pause mode or plus disabled Logger.i(LOG_TAG_VPN, "$TAG handleRpnProxies: plus disabled(rpn)") vpnAdapter?.unregisterWin() } } private suspend fun handleWinProxy() { val win = true // see if win is already registered and last connected is less than 60 mins val isWinRegistered = vpnAdapter?.isWinRegistered() == true Logger.d(LOG_TAG_VPN, "$TAG handleRpnProxies: win(rpn) test: $win, registered? $isWinRegistered") if (win && !isWinRegistered) { var existingBytes = RpnProxyManager.getWinExistingData() // fetch existing win state if (existingBytes == null) { Logger.i(LOG_TAG_PROXY, "$TAG handleRpnProxies: win(rpn) state is null, fetching entitlement") existingBytes = RpnProxyManager.getWinEntitlement() } if (existingBytes == null || existingBytes.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG handleRpnProxies: win(rpn) entitlement is null or empty, cannot register") return } val bytes = registerAndFetchWinIfNeeded(existingBytes) RpnProxyManager.updateWinConfigState(bytes) Logger.i(LOG_TAG_VPN, "$TAG handleRpnProxies: exit64(rpn), registered? ${bytes != null}") } else if (isWinRegistered) { val lastConnectedTs = vpnAdapter?.getWinLastConnectedTs() if (lastConnectedTs != null && abs(elapsedRealtime() - lastConnectedTs) < WIN_LAST_CONNECTED_THRESHOLD_MS) { Logger.i(LOG_TAG_VPN, "$TAG handleRpnProxies: win(rpn) already registered, no-op") } else { // update the proxy as last connected time is more than 60 mins try { Logger.i(LOG_TAG_VPN, "$TAG handleRpnProxies: win(rpn) registered, updating") val bytes = vpnAdapter?.updateWin() if (bytes != null && bytes.isEmpty()) { Logger.w(LOG_TAG_VPN, "$TAG handleRpnProxies: win(rpn) no update needed") return } // if the bytes are null, then it means the win is either failer to update or // no update is needed val updated = RpnProxyManager.updateWinConfigState(bytes) if (!updated) { Logger.w(LOG_TAG_VPN, "$TAG handleRpnProxies: win(rpn) update failed, no-op") //lastSubscriptionCheckTime = 0 // reset the last subscription check time return } // re-register the win proxy vpnAdapter?.registerAndFetchWinIfNeeded(bytes) } catch (e: Exception) { Logger.e(LOG_TAG_VPN, "$TAG handleRpnProxies: win(rpn) update failed", e) // fixme: find a way to handle this case // this is a work around for the case where the win is registered // but the last connected time is not updated, so we reset the // last subscription check time to 0, so that the next time for any // network request, it will try to update the win //lastSubscriptionCheckTime = 0 } } } } private suspend fun setRpnAutoMode() { val res = vpnAdapter?.setRpnAutoMode() logd("set rpn mode to: ${rpnMode()}, set? $res") handleRpnProxies() }*/ + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// FIXME: update just that dns proxy, not the entire tunnel + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: #294 - Figure out a way to show users that the device is offline instead of status as + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: apply firewall rules on all real ips + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: as of now, vpn lockdown mode is not handled, check if this is required + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: call go to clear the cache + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: can remove multiple startForegroundService calls if we decide to remove + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: check for all networks instead of just the first one + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: check if the transport id is set to default/Auto, then return empty string/base + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: convert the duration obj to long, this is work around + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: do we need to still exclude the routes in case of noRoutes? + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: handle multiple domains, for now, use the first domain + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: if uid is received, then make sure Rethink uid always returns Default as transport + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: like Intra, call VpnController#stop instead? see + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: no need to call addTransport in case of relay changes, which we are doing now + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: remove volatile + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: send an alert/notification instead? + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: should allowFamily be set? + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: should handle the LanIp.GATEWAY, LanIp.ROUTER addresses as well + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: should this check be a combination of cellular & metered? + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: should we check for last unlock time here? + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: should we check for lockdown mode and decide to restart? or just restart always? + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// TODO: show alerts to user on such exceptions, in a separate ui? + ForbiddenComment:BraveVPNService.kt$BraveVPNService$// not needed as the refresh is done in go, TODO: remove below code later + ForbiddenComment:BraveVPNService.kt$BraveVPNService.Companion$// TODO: increase it to 6 hours? + ForbiddenComment:BraveVPNService.kt$BraveVPNService.Companion$// TODO: should be different for IPv4 and IPv6, but for now it is same + ForbiddenComment:ConnectionMonitor.kt$ConnectionMonitor$// TODO: process after a delay to avoid processing multiple network changes in short bursts + ForbiddenComment:ConnectionMonitor.kt$ConnectionMonitor$// TODO: use a custom Looper(HandlerThread) to avoid blocking the main thread + ForbiddenComment:ConnectionMonitor.kt$ConnectionMonitor.Companion$// TODO: set it to true when the reachability checks are required to be done from + ForbiddenComment:ConnectionMonitor.kt$ConnectionMonitor.NetworkRequestHandler$// TODO: add http url probes for ipv4 and ipv6 + ForbiddenComment:ConnectionMonitor.kt$ConnectionMonitor.NetworkRequestHandler$// TODO: case: CAPTIVE_PORTAL, should we not test reachability? + ForbiddenComment:ConnectionMonitor.kt$ConnectionMonitor.NetworkRequestHandler$// TODO: consider checking for NET_CAPABILITY_NOT_SUSPENDED, NET_CAPABILITY_VALIDATED? + ForbiddenComment:ConnectionMonitor.kt$ConnectionMonitor.NetworkRequestHandler$// TODO: handle transport types like bluetooth, ethernet which may not have + ForbiddenComment:ConnectionMonitor.kt$ConnectionMonitor.NetworkRequestHandler$// TODO: revisit this logic, see if this also needs similar treatment as + ForbiddenComment:ConnectionMonitor.kt$ConnectionMonitor.NetworkRequestHandler$// TODO: use currentNetworks instead of trackedIpv4Networks and trackedIpv6Networks + ForbiddenComment:ConnectionMonitor.kt$ConnectionMonitor.ProbeResult$// TODO: send only the required capabilities to the handler instead of the whole + ForbiddenComment:Constants.kt$Constants.Companion$// FIXME: Avoid usage of these parameters, map to POJO instead + ForbiddenComment:Constants.kt$Constants.Companion$// TODO: have two different response versions for blocklist update and app update + ForbiddenComment:DnsLogTracker.kt$DnsLogTracker$// TODO: rdata should be either empty / 0.0.0.0 / ::0 / -- for block all + ForbiddenComment:FavIconDownloader.kt$FavIconDownloader$// FIXME: add metadata instead of boolean + ForbiddenComment:FirewallManager.kt$FirewallManager$// TODO: Use the package-manager API instead + ForbiddenComment:FirewallManager.kt$FirewallManager.GlobalVariable$// TODO: protect access to the foregroundUids (read/write) + ForbiddenComment:FirewallRuleset.kt$FirewallRuleset$// TODO: Add label and description from strings.xml + ForbiddenComment:FirewallRuleset.kt$FirewallRuleset.Companion$// TODO: Move ico to enum var like for label and desc + ForbiddenComment:GoVpnAdapter.kt$GoVpnAdapter$// TODO: #321 As of now there is no block free transport for dns types other than Rethink. + ForbiddenComment:GoVpnAdapter.kt$GoVpnAdapter$// TODO: ideally the values required for transport, alg and rdns should be set in the + ForbiddenComment:GoVpnAdapter.kt$GoVpnAdapter$// TODO: notify the user that the default transport could not be set + ForbiddenComment:GoVpnAdapter.kt$GoVpnAdapter$// TODO: should show notification if the transport is not added? + ForbiddenComment:GoVpnAdapter.kt$GoVpnAdapter$// TODO: system dns may be non existent; see: AppConfig#updateSystemDnsServers + ForbiddenComment:HomeNavigation.kt$// TODO: Fetch app name asynchronously + ForbiddenComment:HomeNavigation.kt$// TODO: Load icon if needed + ForbiddenComment:HomeScreenActivity.kt$HomeScreenActivity$// FIXME: remove this post v054 + ForbiddenComment:HomeScreenActivity.kt$HomeScreenActivity$// TODO: modify this to use the latest version code api + ForbiddenComment:HomeScreenActivity.kt$HomeScreenActivity$// TODO: prompt dialog to user that Playservice is disabled, so switch to update + ForbiddenComment:HomeScreenActivity.kt$HomeScreenActivity$// TODO: remove this post v054. + ForbiddenComment:HomeScreenActivity.kt$HomeScreenActivity$// TODO: see if this can be replaced with a more robust solution + ForbiddenComment:IpRulesManager.kt$IpRulesManager$// TODO: is this needed in database? + ForbiddenComment:LocalBlocklistCoordinator.kt$LocalBlocklistCoordinator$// downloaded. TODO: Later add checksum matching as well + ForbiddenComment:NetLogTracker.kt$NetLogTracker$// TODO: This method should be part of BraveVPNService + ForbiddenComment:PaymentWorker.kt$PaymentWorker$// TODO: get refId from EncryptedFile + ForbiddenComment:PersistentState.kt$PersistentState$// TODO: add routes as normal but do not send fd to netstack + ForbiddenComment:PersistentState.kt$PersistentState$// biometric authentication TODO: remove this + ForbiddenComment:PipKeyManager.kt$PipKeyManager$// TODO: should we get the response from the publicKeyUsable method instead of + ForbiddenComment:ProxyManager.kt$ProxyManager.ProxyMode$// TODO: consider adding other proxy modes (e.g, Wireguard, Rethink, etc.) + ForbiddenComment:RefreshDatabase.kt$RefreshDatabase$// TODO: implement upsert logic handling all the edge cases + ForbiddenComment:RestoreAgent.kt$RestoreAgent$// TODO: revisit this after v055 release + ForbiddenComment:RethinkBlocklistManager.kt$RethinkBlocklistManager$// TODO: merge both the remote and local json parsing into one + ForbiddenComment:RethinkBlocklistManager.kt$RethinkBlocklistManager$// TODO: move this strings to strings.xml + ForbiddenComment:RethinkDnsEndpointDao.kt$RethinkDnsEndpointDao$// TODO: remove this method post v054 versions + ForbiddenComment:RpnProxyManager.kt$/* import Logger.LOG_TAG_PROXY import android.content.Context import com.celzero.bravedns.RethinkDnsApplication.Companion.DEBUG import com.celzero.bravedns.database.RpnProxy import com.celzero.bravedns.database.RpnProxyRepository import kotlin.collections.find import com.celzero.bravedns.database.SubscriptionStateHistoryDao import com.celzero.bravedns.database.SubscriptionStatus import com.celzero.bravedns.database.SubscriptionStatusRepository import com.celzero.bravedns.iab.InAppBillingHandler import com.celzero.bravedns.iab.PurchaseDetail import com.celzero.bravedns.scheduler.WorkScheduler import com.celzero.bravedns.service.DomainRulesManager import com.celzero.bravedns.service.EncryptedFileManager import com.celzero.bravedns.service.IpRulesManager import com.celzero.bravedns.service.PersistentState import com.celzero.bravedns.service.VpnController import com.celzero.bravedns.subscription.StateMachineStatistics import com.celzero.bravedns.subscription.SubscriptionStateMachineV2 import com.celzero.bravedns.util.Constants import com.celzero.bravedns.util.Constants.Companion.RPN_PROXY_FOLDER_NAME import com.celzero.bravedns.util.UIUtils import com.celzero.bravedns.util.Utilities import com.celzero.firestack.backend.Backend import com.celzero.firestack.backend.RpnServers import com.celzero.firestack.settings.Settings import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.launch import org.json.JSONObject import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.io.File import java.time.Instant import java.util.concurrent.CopyOnWriteArraySet object RpnProxyManager : KoinComponent { private val applicationContext: Context by inject() private const val TAG = "RpnMgr" private var preferredId = Backend.Auto private val db: RpnProxyRepository by inject() private val subsDb: SubscriptionStatusRepository by inject() private val subsHistoryDb: SubscriptionStateHistoryDao by inject() private val workScheduler by inject<WorkScheduler>() private val persistentState by inject<PersistentState>() private const val WIN_ID = 4 private const val WIN_NAME = "WIN" private const val WIN_ENTITLEMENT_FILE_NAME = "win_response.json" private const val WIN_STATE_FILE_NAME = "win_state.json" const val MAX_WIN_SERVERS = 5 private var winConfig: ByteArray? = null private var winServers: Set<RpnWinServer> = emptySet() private val rpnProxies = CopyOnWriteArraySet<RpnProxy>() private val selectedCountries = mutableSetOf<String>() private val subscriptionStateMachine: SubscriptionStateMachineV2 by inject() private val stateObserverJob = SupervisorJob() private val stateObserverScope = CoroutineScope(Dispatchers.IO + stateObserverJob) init { io { try { load() startStateObserver() Logger.i( LOG_TAG_PROXY, "$TAG; RpnProxyManager initialized with state machine integration" ) } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; error during initialization: ${e.message}", e) // Continue without state machine if initialization fails } } } enum class RpnTunMode(val id: Int) { NONE(Settings.AutoModeLocal), ANTI_CENSORSHIP(Settings.AutoModeHybrid), HIDE_IP(Settings.AutoModeRemote); companion object { fun fromId(id: Int) = entries.first { it.id == id } fun getTunModeForAuto(): Int { return when (rpnMode()) { RpnMode.NONE -> NONE.id RpnMode.ANTI_CENSORSHIP -> ANTI_CENSORSHIP.id RpnMode.HIDE_IP -> HIDE_IP.id } } } } enum class RpnMode(val id: Int) { NONE(0), ANTI_CENSORSHIP(1), HIDE_IP(2); companion object { fun fromId(id: Int) = RpnMode.entries.first { it.id == id } fun getPreferredId(id: Int): String { val mode = fromId(id) return when (mode) { NONE -> "" ANTI_CENSORSHIP -> getPreferredId() HIDE_IP -> getPreferredId() } } } fun isAntiCensorship() = this == ANTI_CENSORSHIP fun isHideIp() = this == HIDE_IP fun isNone() = this == NONE } enum class RpnState(val id: Int) { DISABLED(0), PAUSED(1), // not used in the app, but kept for future use ENABLED(2); companion object { fun fromId(id: Int) = RpnState.entries.first { it.id == id } } fun isEnabled() = this == ENABLED fun isPaused() = this == PAUSED fun isInactive() = this == DISABLED } data class RpnWinServer(val names: String, val countryCode: String, val address: String, val isActive: Boolean) fun isRpnActive(): Boolean { val isEnabled = RpnState.fromId(persistentState.rpnState).isEnabled() val isActive = !rpnMode().isNone() return isEnabled && isActive } fun isRpnEnabled() = RpnState.fromId(persistentState.rpnState).isEnabled() fun rpnMode() = RpnMode.fromId(persistentState.rpnMode) fun rpnState() = RpnState.fromId(persistentState.rpnState) fun setRpnMode(mode: RpnMode) { if (rpnMode() == mode) { Logger.i(LOG_TAG_PROXY, "$TAG; rpn mode already set to ${RpnMode.getPreferredId(mode.id)}, skipping") return } persistentState.rpnMode = mode.id Logger.i(LOG_TAG_PROXY, "$TAG; rpn mode set to $${RpnMode.getPreferredId(mode.id)}") } fun deactivateRpn(reason: String = "manual deactivation") { Logger.i(LOG_TAG_PROXY, "$TAG; deactivating RPN, reason: $reason, current state: ${rpnState().name}") if (persistentState.rpnState == RpnState.DISABLED.id) { Logger.i(LOG_TAG_PROXY, "$TAG; rpn already deactivated, skipping") return } // no need to check the state, as user can manually deactivate RPN persistentState.rpnState = RpnState.DISABLED.id } fun activateRpn(purchase: PurchaseDetail, newPayload: String? = null) { if (persistentState.rpnState == RpnState.ENABLED.id) { Logger.i(LOG_TAG_PROXY, "$TAG; rpn already activated, skipping") return } val currentState = subscriptionStateMachine.getCurrentState() // Check if current state allows RPN activation if (!subscriptionStateMachine.hasValidSubscription()) { Logger.w(LOG_TAG_PROXY, "$TAG; cannot activate RPN - no valid subscription, current state: ${currentState.name}") return } try { persistentState.rpnState = RpnState.ENABLED.id setRpnProductId(purchase.productId) persistentState.showConfettiOnRPlus = true io { val payload = if (newPayload != null && newPayload.isNotEmpty()) { // If new payload is provided, use it to update the purchase payload Logger.i(LOG_TAG_PROXY, "$TAG; updating purchase payload with new data") newPayload } else { // Otherwise, use the existing payload from the purchase purchase.payload } storeWinEntitlement(payload) } Logger.i( LOG_TAG_PROXY, "$TAG; rpn activated, mode: ${rpnMode()}, product: ${purchase.productId}" ) } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; error activating RPN: ${e.message}", e) // Rollback on error persistentState.rpnState = RpnState.DISABLED.id throw e } } fun getSessionTokenFromPayload(payload: String): String { // "developerPayload":"{\"ws\":{\"cid\":\"aa95f04efcb19a54c7605a02e5dd0b435906b993d12bec031a60f3f1272f4f0e\",\"sessiontoken\":\"22695:4:1752256088:524537c17ba103463ba1d330efaf05c146ba3404af:023f958b6c1949568f55078e3c58fe6885d3e57322\",\"expiry\":\"2025-08-11T00:00:00.000Z\",\"status\":\"valid\"}}" try { val json = JSONObject(payload) val ws = json.getJSONObject("ws") val sessionToken = ws.getString("sessiontoken") Logger.i(LOG_TAG_PROXY, "$TAG; session token parsed from payload? ${sessionToken.isNotEmpty()}") return sessionToken } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; error parsing session token from payload: ${e.message}", e) } return "" } fun getExpiryFromPayload(payload: String): Long? { // "developerPayload":"{\"ws\":{\"cid\":\"aa95f04efcb19a54c7605a02e5dd0b435906b993d12bec031a60f3f1272f4f0e\",\"sessiontoken\":\"22695:4:1752256088:524537c17ba103463ba1d330efaf05c146ba3404af:023f958b6c1949568f55078e3c58fe6885d3e57322\",\"expiry\":\"2025-08-11T00:00:00.000Z\",\"status\":\"valid\"}}" try { val json = JSONObject(payload) val ws = json.getJSONObject("ws") val expiryStr = ws.getString("expiry") val timestamp: Long = Instant.parse(expiryStr).toEpochMilli() Logger.i(LOG_TAG_PROXY, "$TAG; expiry parsed from payload: $timestamp") return timestamp } catch (e: Exception) { Logger.w(LOG_TAG_PROXY, "$TAG; error parsing expiry from payload: ${e.message}") } return null } suspend fun storeWinEntitlement(payload: String) { // Store the win entitlement in a file and the path in serverResponsePath try { // "developerPayload":"{\"ws\":{\"cid\":\"aa95f04efcb19a54c7605a02e5dd0b435906b993d12bec031a60f3f1272f4f0e\",\"sessiontoken\":\"22695:4:1752256088:524537c17ba103463ba1d330efaf05c146ba3404af:023f958b6c1949568f55078e3c58fe6885d3e57322\",\"expiry\":\"2025-08-11T00:00:00.000Z\",\"status\":\"valid\"}}" val json = JSONObject(payload) val ws = json.getJSONObject("ws") val fileName = getJsonResponseFileName(WIN_ID) val file = File(applicationContext.getExternalFilesDir(RPN_PROXY_FOLDER_NAME), fileName) val res = EncryptedFileManager.write(applicationContext, ws.toString(), file) // update the winConfig with the file path winConfig = ws.toString().toByteArray() val winProxy = db.getProxyById(WIN_ID) val ll = if (winProxy != null) { winProxy.serverResPath = file.absolutePath db.update(winProxy) } else { // insert a new proxy entry if it doesn't exist val newWinProxy = RpnProxy( id = WIN_ID, name = WIN_NAME, configPath = "", serverResPath = file.absolutePath, isActive = true, isLockdown = false, createdTs = System.currentTimeMillis(), modifiedTs = System.currentTimeMillis(), misc = "", tunId = "", latency = 0, lastRefreshTime = System.currentTimeMillis() ) db.insert(newWinProxy).toInt() } if (ll < 0) { Logger.w(LOG_TAG_PROXY, "$TAG; error updating win proxy in db, result: $ll") } else { Logger.i(LOG_TAG_PROXY, "$TAG; win proxy updated in db, result: $ll") } Logger.i(LOG_TAG_PROXY, "$TAG; win entitlement stored in file: $fileName, result: $res") } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; error storing win configs: ${e.message}", e) } } fun changePreferredId(id: String) { if (id.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; err; preferred id is empty, resetting to default") preferredId = Backend.Auto return } preferredId = id Logger.i(LOG_TAG_PROXY, "$TAG; preferred id changed to $preferredId") } fun getPreferredId(): String { Logger.v(LOG_TAG_PROXY, "$TAG; getPreferredId: $preferredId") return preferredId } fun getRpnProductId(): String { return persistentState.rpnProductId } fun setRpnProductId(productId: String) { persistentState.rpnProductId = productId } enum class RpnType(val id: Int) { EXIT(0), WIN(1); companion object { fun fromId(id: Int) = entries.first { it.id == id } } } data class RpnProps(val id: String, val status: Long, val type: String, val kids: String, val addr: String, val created: Long, val expires: Long, val who: String, val locations: RpnServers) { override fun toString(): String { val cts = getTime(created) val ets = getTime(expires) val s = applicationContext.getString(UIUtils.getProxyStatusStringRes(status)) return "id = $id\nstatus = $s\ntype = $type\nkids = $kids\naddr = $addr\ncreated = $cts\nexpires = $ets\nwho = $who\nlocations = $locations" } } private fun getTime(time: Long): String { return Utilities.convertLongToTime(time, Constants.TIME_FORMAT_4) } suspend fun load(): Int { // need to read the filepath from database and load the file // there will be an entry in the database for each RPN proxy selectedCountries.clear() val rp = db.getAllProxies() Logger.i(LOG_TAG_PROXY, "$TAG; init load, db size: ${rp.size}") rpnProxies.addAll(rp) rp.forEach { try { val cfgFile = File(it.configPath) if (!cfgFile.exists() && it.id != WIN_ID) { // win proxy is handled differently Logger.w(LOG_TAG_PROXY, "$TAG; load, file not found: ${it.configPath} for ${it.name}") return@forEach } when (it.id) { WIN_ID -> { // read the win entitlement file val entitlementFile = File(it.serverResPath) val entitlement = EncryptedFileManager.readByteArray(applicationContext, entitlementFile) val state = EncryptedFileManager.readByteArray(applicationContext, cfgFile) if (state.isEmpty()) { Logger.d(LOG_TAG_PROXY, "$TAG; win state file is empty (path: ${cfgFile.absolutePath}, using entitlement") winConfig = entitlement } else { winConfig = state } Logger.i(LOG_TAG_PROXY, "$TAG; win config loaded, ${winConfig?.isNotEmpty()}") } } } catch (e: Exception) { Logger.w(LOG_TAG_PROXY, "$TAG; err loading rpn proxy: ${it.name}, ${e.message}") } } selectedCountries.addAll(DomainRulesManager.getAllUniqueCCs()) // add the domain rules cc selectedCountries.addAll(IpRulesManager.getAllUniqueCCs()) // add the ip rules cc Logger.d( LOG_TAG_PROXY, "$TAG; total selected countries: ${selectedCountries.size}, $selectedCountries" ) // subsDb.deleteAll() // subsHistoryDb.clearHistory() return rp.size } fun getProxy(type: RpnType): RpnProxy? { return when (type) { RpnType.WIN -> { rpnProxies.find { it.name == WIN_NAME || it.name == WIN_NAME.lowercase() } } else -> null } } // This function is called from RpnProxiesUpdateWorker suspend fun registerNewProxy(type: RpnType): Boolean { // in case of update failure, call register with null when (type) { RpnType.WIN -> { // check if state is there if not, fetch the entitlement var bytes = getWinExistingData() // fetch existing win state if (bytes == null) { Logger.i(LOG_TAG_PROXY, "$TAG; win state is null, fetching entitlement") bytes = getWinEntitlement() } if (bytes == null || bytes.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; win entitlement is null or empty, cannot register") return false } val currBytes = VpnController.registerAndFetchWinConfig(bytes) ?: return false val ok = updateWinConfigState(currBytes) winServers = fetchAndConstructWinLocations() if (winServers.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; no win servers found, retry") io { retryLocationFetch() } } return ok } else -> { Logger.e(LOG_TAG_PROXY, "$TAG; err; invalid type for register: $type") return false } } } suspend fun retryLocationFetch() { // keep retrying to fetch win properties for next 15 sec and see // if the locations are available for (i in 1..15) { Logger.i(LOG_TAG_PROXY, "$TAG; retrying to fetch win properties, attempt: $i") winServers = fetchAndConstructWinLocations() if (winServers.isNotEmpty()) { Logger.i(LOG_TAG_PROXY, "$TAG; win servers found after retry, attempt: $i, size: ${winServers.size}") break } Thread.sleep(1000L) // wait for 1 second before next retry } } suspend fun getWinServers(): List<RpnWinServer> { if (winServers.isNotEmpty()) { return winServers.toList() } Logger.w(LOG_TAG_PROXY, "$TAG; win servers are empty, fetching from tun") winServers = fetchAndConstructWinLocations() return winServers.toList() } suspend fun getWinEntitlement(): ByteArray? { if (winConfig == null || winConfig!!.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; win config is null or empty, returning empty byte array") // read from database if available val winProxy = db.getProxyById(WIN_ID) if (winProxy != null) { val file = File(winProxy.serverResPath) val bytes = EncryptedFileManager.readByteArray(applicationContext, file) if (bytes.isNotEmpty()) { Logger.i(LOG_TAG_PROXY, "$TAG; win proxy found in db, returning bytes") return bytes } else { Logger.w(LOG_TAG_PROXY, "$TAG; win proxy file is empty, returning null") return null } } else { Logger.w(LOG_TAG_PROXY, "$TAG; win proxy not found in db, returning null") return null } } else { Logger.i(LOG_TAG_PROXY, "$TAG; win config is not null, returning bytes") return winConfig } } suspend fun updateWinConfigState(byteArray: ByteArray?): Boolean { if (byteArray == null || byteArray.isEmpty()) { Logger.e(LOG_TAG_PROXY, "$TAG; err; byte array is null for win config") return false } try { val res = updateWinConfigToFileAndDb(byteArray) Logger.i(LOG_TAG_PROXY, "$TAG; win config saved? $res") if (res) { winConfig = byteArray Logger.i(LOG_TAG_PROXY, "$TAG; win config updated") } return res } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; err updating win config: ${e.message}", e) } return false } suspend fun getWinExistingData(): ByteArray? { return getExistingData(WIN_ID) } private suspend fun getExistingData(id: Int): ByteArray? { try { val db = db.getProxyById(id) if (db == null) { Logger.w(LOG_TAG_PROXY, "$TAG; db is null for id: $id") return null } val cfgFile = File(db.configPath) if (cfgFile.exists()) { Logger.d(LOG_TAG_PROXY, "$TAG; config for $id exists, reading the file") val bytes = EncryptedFileManager.readByteArray(applicationContext, cfgFile) Logger.d(LOG_TAG_PROXY, "$TAG; existing data for $id: ${bytes.size}") return bytes } else { Logger.e(LOG_TAG_PROXY, "$TAG; err; config for $id not found, ${cfgFile.absolutePath}") } } catch (e: Exception) { Logger.w(LOG_TAG_PROXY, "$TAG; err getting existing data for $id: ${e.message}") } return null } suspend fun getSelectedCCs(): Set<String> { return selectedCountries } private suspend fun updateWinConfigToFileAndDb(state: ByteArray): Boolean { // write the win config to the file and update the database // store entitlement in serverResponse column and state in config path column val dir = File( applicationContext.filesDir.absolutePath + File.separator + RPN_PROXY_FOLDER_NAME + File.separator + WIN_NAME.lowercase() + File.separator ) if (!dir.exists()) { Logger.d(LOG_TAG_PROXY, "$TAG; creating dir: ${dir.absolutePath}") dir.mkdirs() } val cfgFile = File(dir, getConfigFileName(WIN_ID)) try { // write the entitlement to the config file val cfgRes = EncryptedFileManager.write(applicationContext, state, cfgFile) Logger.i(LOG_TAG_PROXY, "$TAG writing win config to file: ${cfgFile.absolutePath}") val existingDb = db.getProxyById(WIN_ID) val l = if (existingDb != null) { // if the proxy already exists, update it existingDb.configPath = cfgFile.absolutePath db.update(existingDb) } else { // if the proxy does not exist, insert it val rpnProxy = RpnProxy( id = WIN_ID, name = WIN_NAME, configPath = cfgFile.absolutePath, serverResPath = "", // serverResPath is used to store the entitlement isActive = true, isLockdown = false, createdTs = System.currentTimeMillis(), modifiedTs = System.currentTimeMillis(), misc = "", tunId = "", latency = 0, lastRefreshTime = System.currentTimeMillis() ) db.insert(rpnProxy).toInt() } Logger.d(LOG_TAG_PROXY, "$TAG; win config saved in db? ${l > 0}") if (l > 0 && cfgRes) { winConfig = state Logger.i(LOG_TAG_PROXY, "$TAG; win config updated") return true } } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; err writing win config to file: ${e.message}", e) } return false } private fun getConfigFileName(id: Int): String { return when (id) { WIN_ID -> WIN_STATE_FILE_NAME else -> "" } } private fun getJsonResponseFileName(id: Int): String { return when (id) { WIN_ID -> WIN_ENTITLEMENT_FILE_NAME else -> "" } } fun canSelectCountryCode(cc: String): Pair<Boolean, String> { // TODO: get country code from win config val isAvailable = false if (!isAvailable) { Logger.i(LOG_TAG_PROXY, "$TAG; cc not available in config: $cc") return Pair(false, "Country code not available in the config") } return if (selectedCountries.size >= 5) { Logger.i(LOG_TAG_PROXY, "$TAG; cc limit reached, selected: ${selectedCountries.size}, $selectedCountries") Pair(false, "Country code limit reached for the selected endpoint") } else { selectedCountries.add(cc) Logger.d(LOG_TAG_PROXY, "$TAG; cc added to selected list: $cc") Pair(true, "") } } fun stats(): String { val sb = StringBuilder() sb.append(" rpnState: ${rpnState().name}\n") sb.append(" rpnMode: ${rpnMode().name}\n") sb.append(" win config? ${winConfig != null}\n") //sb.append(" subscription stats: ${getSubscriptionStatistics()}\n") //sb.append(" current subscription: ${getDetailedSubscriptionInfo()}\n") sb.append(" selected countries: ${selectedCountries.size}, $selectedCountries\n") sb.append(" state machine stats: ${InAppBillingHandler.getConnectionStatusWithStateMachine()}\n") return sb.toString() } /** * Validate the payload received from Play Billing. * The payload is expected to be in the format: "accountId:session_token" * where accountId is the account ID from PipKeyManager and hashkey represents the user * session_token created during the purchase by server */ suspend fun isValidPayload(payload: String): Boolean { if (payload.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; err; payload is empty") return false } val keyState = PipKeyManager.getToken(applicationContext) val keyFromPlayBilling = getCidFromPayload(payload) if (keyState.isEmpty() || keyFromPlayBilling.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; err; key state or key from play billing is empty") return false } if (keyState != keyFromPlayBilling) { Logger.w(LOG_TAG_PROXY, "$TAG; err; key state and key from play billing do not match") return false } Logger.i(LOG_TAG_PROXY, "$TAG; key state and key from play billing match, processing payment") return true } private fun getCidFromPayload(payload: String): String { // sample payload: payload={"ws":{"cid":"aa95f04efcb19a54c7605a02e5dd0b435906b993d12bec031a60f3f1272f4f0e","sessiontoken":"22605:4:1752145272:1da0c248e6cf32ca071a96e477bdf0033368599b4b:307dfd06996672f735409fec4807fcf40a0677e2ef","status":"valid"}} val payloadJson = try { JSONObject(payload) } catch (e: Exception) { Logger.w(LOG_TAG_PROXY, "$TAG; err parsing payload json: ${e.message}") return "" } val ws = payloadJson.optJSONObject("ws") if (ws == null) { Logger.w(LOG_TAG_PROXY, "$TAG; err; ws object is null in payload") return "" } return ws.optString("cid", "") } suspend fun isValidAccountId(accountId: String): Boolean { if (accountId.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; err; accountId is empty") return false } val keyState = PipKeyManager.getToken(applicationContext) if (keyState.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; err; key state is empty") return false } if (keyState != accountId) { Logger.w(LOG_TAG_PROXY, "$TAG; err; key state and accountId do not match") return false } Logger.i(LOG_TAG_PROXY, "$TAG; key state and accountId match, processing payment") return true } suspend fun updateCancelledSubscription(accountId: String, purchaseToken: String): Boolean { if (purchaseToken.isEmpty() || accountId.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; err; purchaseToken is empty") return false } // TODO: perform the validation of purchaseToken and accountId with the subscription data handleUserCancellation() return true } suspend fun getCurrentSubscription(): SubscriptionStateMachineV2.SubscriptionData? { return subscriptionStateMachine.getSubscriptionData() } suspend fun updateRevokedSubscription(accountId: String, purchaseToken: String): Boolean { if (purchaseToken.isEmpty() || accountId.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; err; purchaseToken is empty") return false } handleSubscriptionRevoked() return true } suspend fun fetchAndConstructWinLocations(): Set<RpnWinServer> { // there will be multiple location names for single country code // construct the RpnWinServer object // contains pair RpnProps and errorMsg val winProps = VpnController.getRpnProps(RpnType.WIN).first if (winProps == null) { Logger.w(LOG_TAG_PROXY, "$TAG; err; win props is null") return emptySet() } val count = winProps.locations.len() if (count == 0L) { Logger.w(LOG_TAG_PROXY, "$TAG; err; no locations found in win props") return emptySet() } val servers = mutableSetOf<RpnWinServer>() for( i in 0 until count) { val loc = winProps.locations.get(i) if (loc == null) { Logger.w(LOG_TAG_PROXY, "$TAG; err; location is null at index $i") continue } val prevNames = servers.filter { it.countryCode == loc.cc }.map { it.names }.toMutableList() prevNames.add(loc.name) val newNames = prevNames.distinct().sorted().joinToString { "," } // each cc will have multiple locations // add that to the list of servers val s = RpnWinServer(newNames, loc.cc, loc.addrs, true) servers.add(s) } // assign it to winServers return servers } suspend fun processRpnPurchase(purchase: PurchaseDetail?, existingSubs: SubscriptionStatus): Boolean { if (purchase == null) { Logger.w(LOG_TAG_PROXY, "$TAG; err; no purchases to process") try { subscriptionStateMachine.subscriptionExpired() } catch (e: Exception) { Logger.e( LOG_TAG_PROXY, "$TAG; error notifying state machine of expiration: ${e.message}", e ) } return false } if (purchase.productId.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; err; productId is empty for purchase: $purchase") try { subscriptionStateMachine.purchaseFailed("Empty product ID", null) } catch (e: Exception) { Logger.e( LOG_TAG_PROXY, "$TAG; error notifying state machine of purchase failure: ${e.message}", e ) } return false } // Enhanced validation if (!isValidPayload(purchase.payload) && !isValidAccountId(purchase.accountId)) { Logger.w( LOG_TAG_PROXY, "$TAG; err; invalid payload or account ID for purchase: $purchase" ) try { subscriptionStateMachine.purchaseFailed( "Invalid payload or account ID", null ) } catch (e: Exception) { Logger.e( LOG_TAG_PROXY, "$TAG; error notifying state machine of validation failure: ${e.message}", e ) } return false } val accExpiry = existingSubs.accountExpiry val billingExpiry = existingSubs.billingExpiry val currTs = System.currentTimeMillis() if (billingExpiry > currTs) { Logger.d(LOG_TAG_PROXY, "$TAG; existing subscription is still valid, no immediate action needed") } if (accExpiry > currTs) { Logger.d(LOG_TAG_PROXY, "$TAG; existing account is still valid, no immediate action needed") } // in case if the account expiry is less than the billing expiry, query the entitlement // from server and update the subscription state machine // Check if the billing expiry + 1 day is greater than the account expiry. // there is always a delay so just add 1 more day to the billing expiry val oneDay = 24 * 60 * 60 * 1000 // 1 day in milliseconds if (accExpiry < billingExpiry + oneDay ) { Logger.d(LOG_TAG_PROXY, "$TAG; account expiry is less than billing expiry, querying entitlement") try { val developerPayload = InAppBillingHandler.queryEntitlementFromServer(purchase.accountId) if (developerPayload != null && developerPayload.isNotEmpty()) { Logger.i(LOG_TAG_PROXY, "$TAG; developer payload received for ${purchase.productId}") activateRpn(purchase, developerPayload) val newPurchase = purchase.copy(payload = developerPayload) val subsData = subscriptionStateMachine.getSubscriptionData() if (subsData != null) { subsData.subscriptionStatus.developerPayload = newPurchase.payload subsData.purchaseDetail?.copy(payload = developerPayload) subscriptionStateMachine.stateMachine.updateData(subsData) } } } catch (e: Exception) { Logger.w(LOG_TAG_PROXY, "$TAG; error querying entitlement: ${e.message}") } } // activate the RPN activateRpn(purchase) return true } private fun startStateObserver() { stateObserverScope.launch { try { subscriptionStateMachine.currentState.collect { state -> Logger.d(LOG_TAG_PROXY, "$TAG; collect; initial subscription state: ${state.name}") io { handleStateChange(state) } } } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; collect; error in state observer: ${e.message}", e) } } } private suspend fun handleStateChange(state: SubscriptionStateMachineV2.SubscriptionState) { when (state) { is SubscriptionStateMachineV2.SubscriptionState.Active -> { Logger.i( LOG_TAG_PROXY, "$TAG; subscription activated, ensuring RPN is enabled if configured" ) // Could potentially auto-enable RPN if conditions are met if (!isRpnEnabled()) { val subs = subscriptionStateMachine.getSubscriptionData() val purchaseDetail = subs?.purchaseDetail if (purchaseDetail == null) { // this should not happen Logger.w(LOG_TAG_PROXY, "$TAG; no purchase detail available for activation, but state is active") return } activateRpn(purchaseDetail) } } is SubscriptionStateMachineV2.SubscriptionState.Cancelled -> { Logger.i(LOG_TAG_PROXY, "$TAG; subscription cancelled, disabling RPN if active") val subs = subscriptionStateMachine.getSubscriptionData() val status = subs?.subscriptionStatus val currTs = System.currentTimeMillis() if ((status != null && status.billingExpiry > currTs) || DEBUG) { deactivateRpn("Subscription cancelled") } else { Logger.w(LOG_TAG_PROXY, "$TAG; subscription cancelled but still valid, not deactivating RPN") } } is SubscriptionStateMachineV2.SubscriptionState.Expired -> { Logger.w(LOG_TAG_PROXY, "$TAG; subscription expired, disabling RPN") deactivateRpn("Subscription expired") } is SubscriptionStateMachineV2.SubscriptionState.Revoked -> { Logger.w(LOG_TAG_PROXY, "$TAG; subscription revoked, immediately disabling RPN") deactivateRpn("Subscription revoked") } is SubscriptionStateMachineV2.SubscriptionState.Error -> { Logger.e(LOG_TAG_PROXY, "$TAG; subscription state machine in error state") // Could implement error recovery logic here } else -> { Logger.d(LOG_TAG_PROXY, "$TAG; subscription state: ${state.name}") } } } fun collectSubscriptionState(): Flow<SubscriptionStateMachineV2.SubscriptionState> { return subscriptionStateMachine.currentState } fun getSubscriptionState(): SubscriptionStateMachineV2.SubscriptionState { return subscriptionStateMachine.getCurrentState() } fun getSubscriptionData(): SubscriptionStateMachineV2.SubscriptionData? { return subscriptionStateMachine.getSubscriptionData() } fun canMakePurchase(): Boolean { return subscriptionStateMachine.canMakePurchase() } fun hasValidSubscription(): Boolean { if (DEBUG) { persistentState.rpnState = RpnState.ENABLED.id return true // temporarily always return true } val valid = subscriptionStateMachine.hasValidSubscription() Logger.i(LOG_TAG_PROXY, "$TAG; using state machine for subscription check, valid: $valid") return valid } fun isSubscriptionActiveInStateMachine(): Boolean { return subscriptionStateMachine.isSubscriptionActive() } suspend fun handleSubscriptionRestored(purchaseDetail: PurchaseDetail) { try { subscriptionStateMachine.restoreSubscription(purchaseDetail) Logger.i(LOG_TAG_PROXY, "$TAG; subscription restored: ${purchaseDetail.productId}") } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; error restoring subscription: ${e.message}", e) } } suspend fun handleUserCancellation() { try { subscriptionStateMachine.userCancelled() Logger.i(LOG_TAG_PROXY, "$TAG; user cancellation handled") } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; error handling user cancellation: ${e.message}", e) } } suspend fun handleSubscriptionRevoked() { try { subscriptionStateMachine.subscriptionRevoked() Logger.w(LOG_TAG_PROXY, "$TAG; subscription revocation handled") // Immediately deactivate RPN deactivateRpn() Logger.i(LOG_TAG_PROXY, "$TAG; RPN deactivated due to revocation") } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; error handling subscription revocation: ${e.message}", e) } } suspend fun performSystemCheck() { try { subscriptionStateMachine.systemCheck() Logger.d(LOG_TAG_PROXY, "$TAG; system check performed") } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; error during system check: ${e.message}", e) } } fun getSubscriptionStatistics(): StateMachineStatistics? { return subscriptionStateMachine.getStatistics() } fun cleanup() { try { stateObserverJob.cancel() Logger.i(LOG_TAG_PROXY, "$TAG; subscription state machine integration cleaned up") } catch (e: Exception) { Logger.e(LOG_TAG_PROXY, "$TAG; error during cleanup: ${e.message}", e) } } private fun isValidForRpnActivation(purchase: PurchaseDetail): Boolean { // Check basic purchase validity if (purchase.productId.isEmpty()) { Logger.w(LOG_TAG_PROXY, "$TAG; invalid purchase - empty product ID") return false } // Check if purchase is revoked if (purchase.status == SubscriptionStatus.SubscriptionState.STATE_REVOKED.id) { Logger.w(LOG_TAG_PROXY, "$TAG; invalid purchase - revoked status") return false } // Check if purchase is expired if (purchase.expiryTime > 0 && System.currentTimeMillis() > purchase.expiryTime) { Logger.w(LOG_TAG_PROXY, "$TAG; invalid purchase - expired") return false } // Check state machine state if available val currentState = subscriptionStateMachine.getCurrentState() when (currentState) { is SubscriptionStateMachineV2.SubscriptionState.Revoked, is SubscriptionStateMachineV2.SubscriptionState.Expired -> { Logger.w( LOG_TAG_PROXY, "$TAG; invalid for activation - state machine in ${currentState.name}" ) return false } else -> { // Other states are potentially valid } } return true } fun isRpnValidForCurrentSubscription(): Boolean { if (!isRpnEnabled()) { return false } val currentState = subscriptionStateMachine.getCurrentState() when (currentState) { is SubscriptionStateMachineV2.SubscriptionState.Active, is SubscriptionStateMachineV2.SubscriptionState.Cancelled -> { Logger.i( LOG_TAG_PROXY, "$TAG; RPN is valid for current subscription state: ${currentState.name}" ) return true } is SubscriptionStateMachineV2.SubscriptionState.Revoked, is SubscriptionStateMachineV2.SubscriptionState.Expired -> { Logger.w( LOG_TAG_PROXY, "$TAG; RPN should be disabled - subscription ${currentState.name}" ) return false } else -> { Logger.d( LOG_TAG_PROXY, "$TAG; RPN validity uncertain for state: ${currentState.name}" ) return true // Allow by default for uncertain states } } } fun getDetailedSubscriptionInfo(): String { val statistics = subscriptionStateMachine.getStatistics() val subscriptionData = subscriptionStateMachine.getSubscriptionData() val currentState = subscriptionStateMachine.getCurrentState() return """ Current State: ${currentState.name} RPN Enabled: ${isRpnEnabled()} RPN Valid: ${isRpnValidForCurrentSubscription()} Total Transitions: ${statistics.totalTransitions} Success Rate: ${String.format("%.2f", statistics.successRate * 100)}% Product ID: ${subscriptionData?.subscriptionStatus?.productId ?: "None"} Subscription Status: ${subscriptionData?.subscriptionStatus?.status?.let { SubscriptionStatus.SubscriptionState.fromId(it).name } ?: "Unknown"} Billing Expiry: ${subscriptionData?.subscriptionStatus?.billingExpiry?.let { if (it > 0) java.util.Date(it) else "N/A" } ?: "N/A"} Account Expiry: ${subscriptionData?.subscriptionStatus?.accountExpiry?.let { if (it > 0) java.util.Date(it) else "N/A" } ?: "N/A"} """.trimIndent() } private fun io(f: suspend () -> Unit) { CoroutineScope(Dispatchers.IO).launch { f() } } } */ + ForbiddenComment:SubscriptionStateMachineV2.kt$/* import Logger.LOG_IAB import com.android.billingclient.api.BillingClient import com.android.billingclient.api.BillingResult import com.android.billingclient.api.Purchase import com.celzero.bravedns.database.SubscriptionStatus import com.celzero.bravedns.database.SubscriptionStatusRepository import com.celzero.bravedns.iab.PurchaseDetail import com.celzero.bravedns.rpnproxy.RpnProxyManager import com.celzero.bravedns.util.Constants import com.celzero.bravedns.util.Utilities import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject /** * Subscription State Machine using the framework * This demonstrates how to use the generic state machine framework * for managing subscription states with proper error handling and RPN integration */ class SubscriptionStateMachineV2 : KoinComponent { private val subscriptionDb by inject<SubscriptionStatusRepository>() private val dbSyncService: StateMachineDatabaseSyncService by inject() private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) var stateMachine: StateMachine<SubscriptionState, SubscriptionEvent, SubscriptionData> companion object { private const val TAG = "SubscriptionStateMachineV2" } init { stateMachine = createStateMachine<SubscriptionState, SubscriptionEvent, SubscriptionData>( initialState = SubscriptionState.Uninitialized, tag = TAG ) { // Initialize transition addTransition( fromState = SubscriptionState.Uninitialized, event = SubscriptionEvent.Initialize, toState = SubscriptionState.Initial, action = { _, _ -> handleInitialize() } ) // initial state can be from Uninitialized or Initial to active/on-hold/expired/revoked addTransition( fromState = SubscriptionState.Initial, event = SubscriptionEvent.Initialize, toState = SubscriptionState.Initial, action = { _, _ -> handleInitialize() } ) // initial state to cancelled state addTransition( fromState = SubscriptionState.Initial, event = SubscriptionEvent.UserCancelled, toState = SubscriptionState.Cancelled, action = { _, data -> handleUserCancelled(data as? SubscriptionData) } ) // initial state to error state addTransition( fromState = SubscriptionState.Initial, event = SubscriptionEvent.BillingError("", BillingResult.newBuilder().build()), toState = SubscriptionState.Error, guard = { event, _ -> event is SubscriptionEvent.BillingError }, action = { event, _ -> val errorEvent = event as SubscriptionEvent.BillingError handleBillingError(errorEvent.error, errorEvent.billingResult) } ) // initial state to expired state addTransition( fromState = SubscriptionState.Initial, event = SubscriptionEvent.SubscriptionExpired, toState = SubscriptionState.Expired, action = { _, data -> handleSubscriptionExpired(data as? SubscriptionData) } ) // Purchase flow transitions addTransition( fromState = SubscriptionState.Initial, event = SubscriptionEvent.PurchaseInitiated, toState = SubscriptionState.PurchaseInitiated ) // Add missing PaymentSuccessful transition from Initial state // This handles cases where payment is processed directly from initial state addTransition( fromState = SubscriptionState.Initial, event = SubscriptionEvent.PaymentSuccessful(createDummyPurchaseDetail()), toState = SubscriptionState.Active, guard = { event, _ -> event is SubscriptionEvent.PaymentSuccessful }, action = { event, _ -> val paymentEvent = event as SubscriptionEvent.PaymentSuccessful handlePaymentSuccessful(paymentEvent.purchaseDetail) } ) // Error recovery transitions addTransition( fromState = SubscriptionState.Error, event = SubscriptionEvent.ErrorRecovered, toState = SubscriptionState.Initial, action = { _, _ -> handleErrorRecovery() } ) addTransition( fromState = SubscriptionState.Error, event = SubscriptionEvent.SystemCheck, toState = SubscriptionState.Initial, action = { _, _ -> handleSystemCheck() } ) // Purchase completion transitions - FIXED: Direct event matching addTransition( fromState = SubscriptionState.PurchaseInitiated, event = SubscriptionEvent.PurchaseCompleted(createDummyPurchaseDetail()), toState = SubscriptionState.PurchasePending, guard = { event, _ -> event is SubscriptionEvent.PurchaseCompleted }, action = { event, _ -> val purchaseEvent = event as SubscriptionEvent.PurchaseCompleted handlePurchaseCompleted(purchaseEvent.purchaseDetail) } ) addTransition( fromState = SubscriptionState.PurchaseInitiated, event = SubscriptionEvent.PaymentSuccessful(createDummyPurchaseDetail()), toState = SubscriptionState.Active, guard = { event, _ -> event is SubscriptionEvent.PaymentSuccessful }, action = { event, _ -> val paymentEvent = event as SubscriptionEvent.PaymentSuccessful handlePaymentSuccessful(paymentEvent.purchaseDetail) } ) // FIXED: Add missing UserCancelled transition from PurchaseInitiated state addTransition( fromState = SubscriptionState.PurchaseInitiated, event = SubscriptionEvent.UserCancelled, toState = SubscriptionState.Initial, action = { _, data -> handleUserCancelledFromPurchase(data as? SubscriptionData) } ) // FIXED: Add missing UserCancelled transition from PurchasePending state addTransition( fromState = SubscriptionState.PurchasePending, event = SubscriptionEvent.UserCancelled, toState = SubscriptionState.Initial, action = { _, data -> handleUserCancelledFromPurchase(data as? SubscriptionData) } ) // Failure transitions - FIXED addTransition( fromState = SubscriptionState.PurchaseInitiated, event = SubscriptionEvent.PurchaseFailed("", null), toState = SubscriptionState.Error, guard = { event, _ -> event is SubscriptionEvent.PurchaseFailed }, action = { event, _ -> val failureEvent = event as SubscriptionEvent.PurchaseFailed handlePurchaseFailed(failureEvent.error, failureEvent.billingResult) } ) // Payment successful transition from pending addTransition( fromState = SubscriptionState.PurchasePending, event = SubscriptionEvent.PaymentSuccessful(createDummyPurchaseDetail()), toState = SubscriptionState.Active, guard = { event, _ -> event is SubscriptionEvent.PaymentSuccessful }, action = { event, _ -> val paymentEvent = event as SubscriptionEvent.PaymentSuccessful handlePaymentSuccessful(paymentEvent.purchaseDetail) } ) // Active state transitions addTransition( fromState = SubscriptionState.Active, event = SubscriptionEvent.UserCancelled, toState = SubscriptionState.Cancelled, action = { _, data -> handleUserCancelled(data as? SubscriptionData) } ) addTransition( fromState = SubscriptionState.Active, event = SubscriptionEvent.SubscriptionExpired, toState = SubscriptionState.Expired, action = { _, data -> handleSubscriptionExpired(data as? SubscriptionData) } ) addTransition( fromState = SubscriptionState.Active, event = SubscriptionEvent.SubscriptionRevoked, toState = SubscriptionState.Revoked, action = { _, data -> handleSubscriptionRevoked(data as? SubscriptionData) } ) // Cancelled state transitions - FIXED addTransition( fromState = SubscriptionState.Cancelled, event = SubscriptionEvent.SubscriptionExpired, toState = SubscriptionState.Expired, action = { _, data -> handleSubscriptionExpired(data as? SubscriptionData) } ) /*addTransition( fromState = SubscriptionState.Cancelled, event = SubscriptionEvent.PaymentSuccessful(createDummyPurchaseDetail()), toState = SubscriptionState.Active, guard = { event, _ -> event is SubscriptionEvent.PaymentSuccessful }, action = { event, _ -> val paymentEvent = event as SubscriptionEvent.PaymentSuccessful handlePaymentSuccessful(paymentEvent.purchaseDetail) } )*/ addTransition( fromState = SubscriptionState.Cancelled, event = SubscriptionEvent.SubscriptionRevoked, toState = SubscriptionState.Revoked, action = { _, data -> handleSubscriptionRevoked(data as? SubscriptionData) } ) // Expired state transitions - FIXED addTransition( fromState = SubscriptionState.Expired, event = SubscriptionEvent.PurchaseInitiated, toState = SubscriptionState.PurchaseInitiated ) addTransition( fromState = SubscriptionState.Expired, event = SubscriptionEvent.SubscriptionRestored(createDummyPurchaseDetail()), toState = SubscriptionState.Active, guard = { event, _ -> event is SubscriptionEvent.SubscriptionRestored }, action = { event, _ -> val restoreEvent = event as SubscriptionEvent.SubscriptionRestored handleSubscriptionRestored(restoreEvent.purchaseDetail) } ) // Revoked state transitions - FIXED addTransition( fromState = SubscriptionState.Revoked, event = SubscriptionEvent.PurchaseInitiated, toState = SubscriptionState.PurchaseInitiated ) addTransition( fromState = SubscriptionState.Revoked, event = SubscriptionEvent.SubscriptionRestored(createDummyPurchaseDetail()), toState = SubscriptionState.Active, guard = { event, _ -> event is SubscriptionEvent.SubscriptionRestored }, action = { event, _ -> val restoreEvent = event as SubscriptionEvent.SubscriptionRestored handleSubscriptionRestored(restoreEvent.purchaseDetail) } ) // System transitions from any state addTransition( fromState = SubscriptionState.Initial, event = SubscriptionEvent.SystemCheck, toState = SubscriptionState.Initial, action = { _, _ -> handleSystemCheck() } ) addTransition( fromState = SubscriptionState.Active, event = SubscriptionEvent.PaymentSuccessful(createDummyPurchaseDetail()), toState = SubscriptionState.Active, guard = { event, _ -> event is SubscriptionEvent.PaymentSuccessful }, action = { event, _ -> val paymentEvent = event as SubscriptionEvent.PaymentSuccessful handlePaymentSuccessful(paymentEvent.purchaseDetail) } ) // Error transitions from any problematic state - FIXED addTransition( fromState = SubscriptionState.PurchaseInitiated, event = SubscriptionEvent.BillingError("", BillingResult.newBuilder().build()), toState = SubscriptionState.Error, guard = { event, _ -> event is SubscriptionEvent.BillingError }, action = { event, _ -> val errorEvent = event as SubscriptionEvent.BillingError handleBillingError(errorEvent.error, errorEvent.billingResult) } ) addTransition( fromState = SubscriptionState.PurchasePending, event = SubscriptionEvent.BillingError("", BillingResult.newBuilder().build()), toState = SubscriptionState.Error, guard = { event, _ -> event is SubscriptionEvent.BillingError }, action = { event, _ -> val errorEvent = event as SubscriptionEvent.BillingError handleBillingError(errorEvent.error, errorEvent.billingResult) } ) addTransition( fromState = SubscriptionState.Active, event = SubscriptionEvent.DatabaseError(""), toState = SubscriptionState.Error, guard = { event, _ -> event is SubscriptionEvent.DatabaseError }, action = { event, _ -> val errorEvent = event as SubscriptionEvent.DatabaseError handleDatabaseError(errorEvent.error) } ) // handle state from cancelled state to initial state addTransition( fromState = SubscriptionState.Cancelled, event = SubscriptionEvent.SystemCheck, toState = SubscriptionState.Initial, action = { _, _ -> handleSystemCheck() } ) addTransition( fromState = SubscriptionState.Expired, event = SubscriptionEvent.SystemCheck, toState = SubscriptionState.Initial, action = { _, _ -> handleSystemCheck() } ) addTransition( fromState = SubscriptionState.Revoked, event = SubscriptionEvent.SystemCheck, toState = SubscriptionState.Initial, action = { _, _ -> handleSystemCheck() } ) // handle state from error state to payment initiated state addTransition( fromState = SubscriptionState.Error, event = SubscriptionEvent.PurchaseInitiated, toState = SubscriptionState.PurchaseInitiated, action = { _, _ -> handleSystemCheck() } ) addTransition( fromState = SubscriptionState.Error, event = SubscriptionEvent.SystemCheck, toState = SubscriptionState.Initial, action = { _, _ -> handleSystemCheck() } ) // handle state from cancelled state to purchase initiated state addTransition( fromState = SubscriptionState.Cancelled, event = SubscriptionEvent.PurchaseInitiated, toState = SubscriptionState.PurchaseInitiated, action = { _, _ -> handleSystemCheck() } ) addTransition( fromState = SubscriptionState.Expired, event = SubscriptionEvent.PurchaseInitiated, toState = SubscriptionState.PurchaseInitiated, action = { _, _ -> handleSystemCheck() } ) addTransition( fromState = SubscriptionState.Revoked, event = SubscriptionEvent.PurchaseInitiated, toState = SubscriptionState.PurchaseInitiated, action = { _, _ -> handleSystemCheck() } ) // Event handlers onStateChanged { fromState, toState, event -> Logger.i( LOG_IAB, "$TAG: State changed from ${fromState.name} to ${toState.name} on event ${event.name}" ) } onTransitionFailed { fromState, event, error -> Logger.e( LOG_IAB, "$TAG: Transition failed from ${fromState.name} on event ${event.name}: $error" ) } onInvalidTransition { fromState, event -> Logger.w( LOG_IAB, "$TAG: Invalid transition attempted from ${fromState.name} on event ${event.name}" ) } } Logger.i(LOG_IAB, "$TAG: Initializing SubscriptionStateMachineV2") initializeStateMachine() Logger.i(LOG_IAB, "$TAG: SubscriptionStateMachineV2 initialized") } // Define states sealed class SubscriptionState : State { object Uninitialized : SubscriptionState() object Initial : SubscriptionState() object PurchaseInitiated : SubscriptionState() object PurchasePending : SubscriptionState() object Active : SubscriptionState() object Cancelled : SubscriptionState() object Expired : SubscriptionState() object Revoked : SubscriptionState() object Error : SubscriptionState() val isActive: Boolean get() = this is Active val canMakePurchase: Boolean get() = this is Initial || this is Expired || this is Revoked || this is Cancelled || this is Error || this is PurchaseInitiated || this is PurchasePending val hasValidSubscription: Boolean get() = this is Active val isCancelled: Boolean get() = this is Cancelled val isRevoked: Boolean get() = this is Revoked val isExpired: Boolean get() = this is Expired fun state(): SubscriptionState { return when (this) { is Uninitialized -> Initial is Initial -> this is PurchaseInitiated -> this is PurchasePending -> this is Active -> this is Cancelled -> this is Expired -> this is Revoked -> this is Error -> this } } } // Define events sealed class SubscriptionEvent : Event { object Initialize : SubscriptionEvent() object PurchaseInitiated : SubscriptionEvent() data class PurchaseCompleted(val purchaseDetail: PurchaseDetail) : SubscriptionEvent() data class PurchaseFailed(val error: String, val billingResult: BillingResult? = null) : SubscriptionEvent() data class PaymentSuccessful(val purchaseDetail: PurchaseDetail) : SubscriptionEvent() object UserCancelled : SubscriptionEvent() object SubscriptionExpired : SubscriptionEvent() object SubscriptionRevoked : SubscriptionEvent() data class SubscriptionRestored(val purchaseDetail: PurchaseDetail) : SubscriptionEvent() object SystemCheck : SubscriptionEvent() data class BillingError(val error: String, val billingResult: BillingResult) : SubscriptionEvent() data class DatabaseError(val error: String) : SubscriptionEvent() object ErrorRecovered : SubscriptionEvent() } // Define data data class SubscriptionData( val subscriptionStatus: SubscriptionStatus, val purchaseDetail: PurchaseDetail? = null, val lastUpdated: Long = System.currentTimeMillis() ) val currentState: StateFlow<SubscriptionState> = stateMachine.currentState private fun initializeStateMachine() { io { initialize() handleSystemCheckAndDatabaseRestoration() // Add missing Flow properties for reactive state observation currentState.to(stateMachine.currentState) } } // Helper function to create dummy purchase detail for event matching private fun createDummyPurchaseDetail(): PurchaseDetail { return PurchaseDetail( productId = "", planId = "", productTitle = "", state = Purchase.PurchaseState.PURCHASED, planTitle = "", purchaseToken = "", productType = com.android.billingclient.api.BillingClient.ProductType.SUBS, purchaseTime = "", purchaseTimeMillis = 0L, isAutoRenewing = false, accountId = "", payload = "", expiryTime = 0L, status = Purchase.PurchaseState.PURCHASED ) } suspend fun initialize() { Logger.i(LOG_IAB, "$TAG: Initializing subscription state machine") stateMachine.processEvent(SubscriptionEvent.Initialize) Logger.i(LOG_IAB, "$TAG: Subscription state machine initialized") } suspend fun startPurchase() { stateMachine.processEvent(SubscriptionEvent.PurchaseInitiated) } suspend fun completePurchase(purchaseDetail: PurchaseDetail) { stateMachine.processEvent(SubscriptionEvent.PurchaseCompleted(purchaseDetail)) } suspend fun paymentSuccessful(purchaseDetail: PurchaseDetail) { stateMachine.processEvent(SubscriptionEvent.PaymentSuccessful(purchaseDetail)) } suspend fun purchaseFailed(error: String, billingResult: BillingResult? = null) { stateMachine.processEvent(SubscriptionEvent.PurchaseFailed(error, billingResult)) } suspend fun userCancelled() { stateMachine.processEvent(SubscriptionEvent.UserCancelled) } suspend fun subscriptionExpired() { stateMachine.processEvent(SubscriptionEvent.SubscriptionExpired) } suspend fun subscriptionRevoked() { stateMachine.processEvent(SubscriptionEvent.SubscriptionRevoked) } suspend fun restoreSubscription(purchaseDetail: PurchaseDetail) { stateMachine.processEvent(SubscriptionEvent.SubscriptionRestored(purchaseDetail)) } suspend fun systemCheck() { stateMachine.processEvent(SubscriptionEvent.SystemCheck) } fun getCurrentState(): SubscriptionState = stateMachine.getCurrentState() fun getSubscriptionData(): SubscriptionData? = stateMachine.getCurrentData() fun canMakePurchase(): Boolean = stateMachine.getCurrentState().canMakePurchase fun hasValidSubscription(): Boolean = stateMachine.getCurrentState().hasValidSubscription fun isSubscriptionActive(): Boolean = stateMachine.getCurrentState().isActive fun getStatistics(): StateMachineStatistics = stateMachine.getStatistics() // Action handlers private suspend fun handleInitialize() { try { Logger.i(LOG_IAB, "$TAG: ***Initializing subscription state machine***") // Load state from database /*val dbStateInfo = dbSyncService.loadStateFromDatabase() Logger.i(LOG_IAB, "$TAG: Loaded state from database: $dbStateInfo") if (dbStateInfo != null) { Logger.d(LOG_IAB, "$TAG: Found database state: ${dbStateInfo.recommendedState.name} for subscription: ${dbStateInfo.currentSubscription.productId}") val subscriptionData = SubscriptionData(subscriptionStatus = dbStateInfo.currentSubscription) stateMachine.updateData(subscriptionData) // Directly transition to the recommended state from database stateMachine.directTransitionTo(dbStateInfo.recommendedState) stateMachine.processEvent(dbStateInfo.recommendedState) Logger.i(LOG_IAB, "$TAG: State machine initialized with state: ${stateMachine.getCurrentState().name}") } else { Logger.d(LOG_IAB, "$TAG: No existing subscription data found in database - staying in Initial state") // Transition from Uninitialized to Initial stateMachine.directTransitionTo(SubscriptionState.Initial) }*/ } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error during initialization: ${e.message}", e) // Continue with initial state on error //stateMachine.directTransitionTo(SubscriptionState.Initial) } } private suspend fun handlePurchaseCompleted(purchaseDetail: PurchaseDetail) { try { Logger.i(LOG_IAB, "$TAG: Handling purchase completed: ${purchaseDetail.productId}") // Save purchase detail to database (handles duplicates properly) val subscriptionId = dbSyncService.savePurchaseDetail(purchaseDetail) Logger.d(LOG_IAB, "$TAG: Purchase detail saved/updated with ID: $subscriptionId") if (subscriptionId > 0) { // Create subscription data with the correct ID val subscriptionStatus = convertPurchaseDetailToSubscriptionStatus(purchaseDetail, subscriptionId) val subscriptionData = SubscriptionData( subscriptionStatus = subscriptionStatus, purchaseDetail = purchaseDetail ) stateMachine.updateData(subscriptionData) // FIXED: Save state transition history dbSyncService.saveStateTransition( fromState = stateMachine.getCurrentState(), // Use actual current state toState = SubscriptionState.PurchasePending, // Transition to pending subscriptionData = subscriptionData, reason = "Purchase completed, awaiting acknowledgment" ) Logger.i(LOG_IAB, "$TAG: Purchase completed and saved to database with history") } else { Logger.e(LOG_IAB, "$TAG: Failed to save purchase detail") } } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error handling purchase completed: ${e.message}", e) } } // Helper function to convert PurchaseDetail to SubscriptionStatus private fun convertPurchaseDetailToSubscriptionStatus( purchaseDetail: PurchaseDetail, subscriptionId: Long ): SubscriptionStatus { val accExpiry = RpnProxyManager.getExpiryFromPayload(purchaseDetail.payload) ?: purchaseDetail.expiryTime val subscriptionStatus = SubscriptionStatus() subscriptionStatus.id = subscriptionId.toInt() subscriptionStatus.accountId = purchaseDetail.accountId subscriptionStatus.purchaseToken = purchaseDetail.purchaseToken subscriptionStatus.productId = purchaseDetail.productId subscriptionStatus.planId = purchaseDetail.planId subscriptionStatus.productTitle = purchaseDetail.productTitle subscriptionStatus.state = purchaseDetail.state subscriptionStatus.purchaseTime = purchaseDetail.purchaseTimeMillis subscriptionStatus.billingExpiry = purchaseDetail.expiryTime subscriptionStatus.accountExpiry = accExpiry subscriptionStatus.developerPayload = purchaseDetail.payload subscriptionStatus.status = purchaseDetail.status subscriptionStatus.lastUpdatedTs = System.currentTimeMillis() return subscriptionStatus } private fun createPurchaseDetailFromSubscription(subscriptionStatus: SubscriptionStatus): PurchaseDetail { return PurchaseDetail( productId = subscriptionStatus.productId, planId = subscriptionStatus.planId, productTitle = subscriptionStatus.productTitle, state = subscriptionStatus.state, planTitle = subscriptionStatus.productTitle, purchaseToken = subscriptionStatus.purchaseToken, productType = BillingClient.ProductType.SUBS, purchaseTime = Utilities.convertLongToTime( subscriptionStatus.purchaseTime, Constants.TIME_FORMAT_4 ), purchaseTimeMillis = subscriptionStatus.purchaseTime, isAutoRenewing = true, // Default for subscriptions accountId = subscriptionStatus.accountId, payload = subscriptionStatus.developerPayload, expiryTime = subscriptionStatus.billingExpiry, status = subscriptionStatus.status ) } // not a valid state transition, but makes an entry in the database for maintaining history private suspend fun handlePurchaseFailed(error: String, billingResult: BillingResult?) { try { Logger.e(LOG_IAB, "$TAG: Handling purchase failed: $error") // put an entry in the database history as purchase failed dbSyncService.savePurchaseFailureHistory(error, billingResult) Logger.i(LOG_IAB, "$TAG: Purchase failure handled") } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error handling purchase failure: ${e.message}", e) } } private suspend fun handlePaymentSuccessful(purchaseDetail: PurchaseDetail) { try { Logger.i(LOG_IAB, "$TAG: Handling payment successful: ${purchaseDetail.productId}") // Get existing subscription instead of creating new one val existingSubscription = getCurrentSubscriptionStatus(purchaseDetail) if (existingSubscription != null) { // Update existing subscription to active val accExpiry = RpnProxyManager.getExpiryFromPayload(purchaseDetail.payload) ?: purchaseDetail.expiryTime existingSubscription.status = SubscriptionStatus.SubscriptionState.STATE_ACTIVE.id existingSubscription.billingExpiry = purchaseDetail.expiryTime existingSubscription.accountExpiry = accExpiry existingSubscription.sessionToken = RpnProxyManager.getSessionTokenFromPayload(purchaseDetail.payload) existingSubscription.developerPayload = purchaseDetail.payload val updateResult = subscriptionDb.upsert(existingSubscription) if (updateResult > 0) { // Update state machine data val subscriptionData = SubscriptionData( subscriptionStatus = existingSubscription, purchaseDetail = purchaseDetail ) stateMachine.updateData(subscriptionData) // FIXED: Use actual current state instead of hardcoded fromState val currentState = stateMachine.getCurrentState() dbSyncService.saveStateTransition( fromState = currentState, // Use actual current state toState = SubscriptionState.Active, subscriptionData = subscriptionData, reason = "Payment successful from ${currentState.name}" ) // Activate RPN if needed scope.launch { try { val res = RpnProxyManager.processRpnPurchase( purchaseDetail, existingSubscription ) Logger.d( LOG_IAB, "$TAG: RPN activated? $res for purchase: ${purchaseDetail.productId}" ) } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: err activating RPN: ${e.message}", e) } } Logger.i( LOG_IAB, "$TAG: Payment successful handled from state: ${currentState.name}" ) } else { Logger.e(LOG_IAB, "$TAG: Failed to update subscription status") } } else { Logger.e(LOG_IAB, "$TAG: No existing subscription found for payment") } } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: err handling payment successful: ${e.message}", e) } } private suspend fun handleUserCancelled(data: SubscriptionData?) { try { Logger.i(LOG_IAB, "$TAG: Handling user cancellation") data?.let { subscriptionData -> subscriptionData.subscriptionStatus.status = SubscriptionStatus.SubscriptionState.STATE_CANCELLED.id val updateResult = subscriptionDb.upsert(subscriptionData.subscriptionStatus) if (updateResult > 0) { // Update state machine data val updatedData = subscriptionData.copy(subscriptionStatus = subscriptionData.subscriptionStatus) stateMachine.updateData(updatedData) // Save state transition dbSyncService.saveStateTransition( fromState = SubscriptionState.Active, toState = SubscriptionState.Cancelled, subscriptionData = updatedData, reason = "User cancelled subscription" ) Logger.i(LOG_IAB, "$TAG: User cancellation handled") } else { Logger.e(LOG_IAB, "$TAG: Failed to update subscription for cancellation") } } } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error handling user cancellation: ${e.message}", e) } } private suspend fun handleUserCancelledFromPurchase(data: SubscriptionData?) { try { Logger.i(LOG_IAB, "$TAG: Handling user cancellation from purchase flow") // For cancellations during purchase flow, we don't need to update any subscription // status since the purchase never completed. Just log the cancellation. Logger.i(LOG_IAB, "$TAG: User cancelled purchase flow - returning to initial state") // Optionally save this event for analytics data?.let { subscriptionData -> dbSyncService.saveStateTransition( fromState = SubscriptionState.PurchaseInitiated, toState = SubscriptionState.Initial, subscriptionData = subscriptionData, reason = "User cancelled purchase flow" ) } } catch (e: Exception) { Logger.e( LOG_IAB, "$TAG: Error handling user cancellation from purchase: ${e.message}", e ) } } private suspend fun handleSystemCheckAndDatabaseRestoration() { try { Logger.i(LOG_IAB, "$TAG: Performing system check and database restoration") // First perform system check val isRpnActive = RpnProxyManager.isRpnActive() Logger.i(LOG_IAB, "$TAG: RPN active status: $isRpnActive") // Then check for database state restoration val dbStateInfo = dbSyncService.loadStateFromDatabase() if (dbStateInfo != null) { Logger.i( LOG_IAB, "$TAG: Found database state: ${dbStateInfo.recommendedState.name}" ) val subscriptionData = SubscriptionData(subscriptionStatus = dbStateInfo.currentSubscription) stateMachine.updateData(subscriptionData) // Trigger appropriate events to transition to the correct state when (dbStateInfo.recommendedState) { SubscriptionState.Active -> { val purchaseDetail = createPurchaseDetailFromSubscription(dbStateInfo.currentSubscription) stateMachine.processEvent(SubscriptionEvent.PaymentSuccessful(purchaseDetail)) } SubscriptionState.Cancelled -> { // check if the billing expiry is in the past then handle as expired val isExpired = dbStateInfo.currentSubscription.billingExpiry < System.currentTimeMillis() if (isExpired) { stateMachine.processEvent(SubscriptionEvent.UserCancelled) } else { stateMachine.processEvent(SubscriptionEvent.UserCancelled) } } SubscriptionState.Expired -> { stateMachine.processEvent(SubscriptionEvent.SubscriptionExpired) } SubscriptionState.Revoked -> { stateMachine.processEvent(SubscriptionEvent.SubscriptionRevoked) } SubscriptionState.Initial -> { Logger.i( LOG_IAB, "$TAG: Database state matches current state - no transition needed" ) } SubscriptionState.PurchasePending -> { val purchaseDetail = createPurchaseDetailFromSubscription(dbStateInfo.currentSubscription) stateMachine.processEvent(SubscriptionEvent.PurchaseCompleted(purchaseDetail)) } SubscriptionState.PurchaseInitiated -> { stateMachine.processEvent(SubscriptionEvent.Initialize) } else -> { Logger.w( LOG_IAB, "$TAG: Unexpected database state: ${dbStateInfo.recommendedState.name}" ) } } Logger.i(LOG_IAB, "$TAG: Database state restoration completed") } else { Logger.d(LOG_IAB, "$TAG: No database state to restore - system check completed") } } catch (e: Exception) { Logger.e( LOG_IAB, "$TAG: Error during system check and database restoration: ${e.message}", e ) } } private suspend fun handleSubscriptionExpired(data: SubscriptionData?) { try { Logger.w(LOG_IAB, "$TAG: Handling subscription expiry") data?.let { subscriptionData -> subscriptionData.subscriptionStatus.status = SubscriptionStatus.SubscriptionState.STATE_EXPIRED.id val updateResult = subscriptionDb.upsert(subscriptionData.subscriptionStatus) if (updateResult > 0) { // Update state machine data val updatedData = subscriptionData.copy(subscriptionStatus = subscriptionData.subscriptionStatus) stateMachine.updateData(updatedData) // Save state transition dbSyncService.saveStateTransition( fromState = stateMachine.getCurrentState(), toState = SubscriptionState.Expired, subscriptionData = updatedData, reason = "Subscription expired" ) // Update expiry information dbSyncService.updateSubscriptionExpiry( subscriptionData.subscriptionStatus.id, subscriptionData.subscriptionStatus.billingExpiry, subscriptionData.subscriptionStatus.accountExpiry ) // Deactivate RPN scope.launch { try { RpnProxyManager.deactivateRpn("expired") Logger.i(LOG_IAB, "$TAG: RPN deactivated due to expiry") } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error deactivating RPN: ${e.message}", e) } } Logger.w(LOG_IAB, "$TAG: Subscription expiry handled") } else { Logger.e(LOG_IAB, "$TAG: Failed to update subscription for expiry") } } } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error handling subscription expiry: ${e.message}", e) } } private suspend fun handleSubscriptionRestored(purchaseDetail: PurchaseDetail) { try { Logger.i(LOG_IAB, "$TAG: Handling subscription restored: ${purchaseDetail.productId}") // Get existing subscription instead of creating new one val existingSubscription = getCurrentSubscriptionStatus(purchaseDetail) if (existingSubscription != null) { // Update existing subscription to active existingSubscription.status = SubscriptionStatus.SubscriptionState.STATE_ACTIVE.id val updateResult = subscriptionDb.upsert(existingSubscription) if (updateResult > 0) { // Update state machine data val subscriptionData = SubscriptionData( subscriptionStatus = existingSubscription, purchaseDetail = purchaseDetail ) stateMachine.updateData(subscriptionData) // Save state transition (this will now properly update history) dbSyncService.saveStateTransition( fromState = SubscriptionState.Cancelled, toState = SubscriptionState.Active, subscriptionData = subscriptionData, reason = "Subscription restored" ) // Activate RPN if needed scope.launch { try { RpnProxyManager.activateRpn(purchaseDetail) Logger.i(LOG_IAB, "$TAG: RPN activated successfully") } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error activating RPN: ${e.message}", e) } } Logger.i(LOG_IAB, "$TAG: Subscription restored handled") } else { Logger.e(LOG_IAB, "$TAG: Failed to update subscription status") } } else { Logger.e(LOG_IAB, "$TAG: No existing subscription found for restoration") } } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error handling subscription restoration: ${e.message}", e) } } private suspend fun handleSubscriptionRevoked(data: SubscriptionData?) { try { Logger.w(LOG_IAB, "$TAG: Handling subscription revocation") data?.let { subscriptionData -> subscriptionData.subscriptionStatus.status = SubscriptionStatus.SubscriptionState.STATE_REVOKED.id val updateResult = subscriptionDb.upsert(subscriptionData.subscriptionStatus) if (updateResult > 0) { // Update state machine data val updatedData = subscriptionData.copy(subscriptionStatus = subscriptionData.subscriptionStatus) stateMachine.updateData(updatedData) // Mark as revoked in database (this handles history) dbSyncService.markSubscriptionRevoked(updatedData.subscriptionStatus.id) // Save state transition dbSyncService.saveStateTransition( fromState = stateMachine.getCurrentState(), toState = SubscriptionState.Revoked, subscriptionData = updatedData, reason = "Subscription revoked by system" ) // Immediately deactivate RPN scope.launch { try { RpnProxyManager.deactivateRpn("revoked") Logger.w(LOG_IAB, "$TAG: RPN deactivated due to revocation") } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error deactivating RPN: ${e.message}", e) } } Logger.w(LOG_IAB, "$TAG: Subscription revocation handled") } else { Logger.e(LOG_IAB, "$TAG: Failed to update subscription for revocation") } } } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error handling subscription revocation: ${e.message}", e) } } /** * Get current subscription status - prevents duplicate creation */ private suspend fun getCurrentSubscriptionStatus(purchaseDetail: PurchaseDetail): SubscriptionStatus? { return try { // First try by purchase token subscriptionDb.getByPurchaseToken(purchaseDetail.purchaseToken) ?: subscriptionDb.getCurrentSubscription() } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error getting current subscription: ${e.message}", e) null } } private suspend fun handleSystemCheck() { try { Logger.i(LOG_IAB, "$TAG: performing system check") // TODO: perform any necessary system checks here } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: err during system check: ${e.message}", e) } } private suspend fun handleErrorRecovery() { try { Logger.i(LOG_IAB, "$TAG: Handling error recovery") // Clear any error state and attempt to reload from database val dbStateInfo = dbSyncService.loadStateFromDatabase() if (dbStateInfo != null) { val subscriptionData = SubscriptionData(subscriptionStatus = dbStateInfo.currentSubscription) stateMachine.updateData(subscriptionData) Logger.i(LOG_IAB, "$TAG: Error recovery completed, restored state from database") } } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error during error recovery: ${e.message}", e) } } private suspend fun handleBillingError(error: String, billingResult: BillingResult) { try { Logger.e(LOG_IAB, "$TAG: Handling billing error: $error") stateMachine.getCurrentData()?.let { data -> dbSyncService.saveStateTransition( fromState = stateMachine.getCurrentState(), toState = SubscriptionState.Error, subscriptionData = data, reason = "Billing error: $error (${billingResult.responseCode})" ) } } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error handling billing error: ${e.message}", e) } } private fun handleDatabaseError(error: String) { try { Logger.e(LOG_IAB, "$TAG: Handling database error: $error") // Don't try to save to database since that's what failed // Just log the error and potentially trigger recovery } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error handling database error: ${e.message}", e) } } private suspend fun handlePaymentInitiated(purchaseDetail: PurchaseDetail) { try { Logger.i( LOG_IAB, "$TAG: Handling payment initiated for purchase: ${purchaseDetail.productId}" ) // Update the existing subscription status to indicate payment processing has started val existingSubscription = getCurrentSubscriptionStatus(purchaseDetail) if (existingSubscription != null) { // Mark subscription as pending payment processing existingSubscription.status = SubscriptionStatus.SubscriptionState.STATE_INITIAL.id val updateResult = subscriptionDb.upsert(existingSubscription) if (updateResult > 0) { // Update state machine data val subscriptionData = SubscriptionData( subscriptionStatus = existingSubscription, purchaseDetail = purchaseDetail ) stateMachine.updateData(subscriptionData) // Save state transition dbSyncService.saveStateTransition( fromState = SubscriptionState.Initial, toState = SubscriptionState.PurchaseInitiated, subscriptionData = subscriptionData, reason = "Payment processing initiated" ) Logger.i( LOG_IAB, "$TAG: Payment initiation handled - subscription marked as pending" ) } else { Logger.e(LOG_IAB, "$TAG: Failed to update subscription for payment initiation") } } else { Logger.e(LOG_IAB, "$TAG: No existing subscription found for payment initiation") } } catch (e: Exception) { Logger.e(LOG_IAB, "$TAG: Error handling payment initiation: ${e.message}", e) } } private fun io(f: suspend () -> Unit) { CoroutineScope(Dispatchers.IO).launch { f() } } } */ + ForbiddenComment:VpnController.kt$VpnController$// FIXME: Publish VpnState through this live-data to relieve direct access + ForbiddenComment:VpnController.kt$VpnController$// TODO: make clients listen on create, start, stop, destroy from vpn-service + ForbiddenComment:WgConfigFilesDAO.kt$WgConfigFilesDAO$// TODO: should remove this query post v055o + ForbiddenComment:WireguardManager.kt$WireguardManager$/* TODO: commenting the code as v055o doesn't use ip-app specific and domain-app specific // rules // check for ip-app specific config first // returns Pair<String, String> - first is ProxyId, second is CC val ipc = IpRulesManager.hasProxy(uid, ip, port) // return Pair<String, Boolean> - first is ProxyId, second is can proceed for next check // one case where second parameter is true when the config is in lockdown mode val ipcProxyPair = canUseConfig(ipc.first, "ip($ip:$port)", usesMeteredNw) if (!ipcProxyPair.second) { // false denotes first is not empty if (ipcProxyPair.first == block) { proxyIds.clear() proxyIds.add(block) } else { proxyIds.add(ipcProxyPair.first) } Logger.i(LOG_TAG_PROXY, "lockdown wg for ip($ip:$port) => return $proxyIds") return proxyIds } // add the ip-app specific config to the list if (ipc.first.isNotEmpty()) proxyIds.add(ipc.first) // ip-app specific // check for domain-app specific config val dc = DomainRulesManager.getProxyForDomain(uid, domain) val dcProxyPair = canUseConfig(dc.first, "domain($domain)", usesMeteredNw) if (!dcProxyPair.second) { if (ipcProxyPair.first == block) { proxyIds.clear() proxyIds.add(block) } else { proxyIds.add(ipcProxyPair.first) } Logger.i(LOG_TAG_PROXY, "lockdown wg for domain($domain) => return $proxyIds") return proxyIds } // add the domain-app specific config to the list if (dcProxyPair.first.isNotEmpty()) proxyIds.add(dcProxyPair.first) // domain-app specific */ + ForbiddenComment:WireguardManager.kt$WireguardManager$/* TODO: commenting the code as v055o doesn't use universal ip and domain rules // check for universal ip config val uipc = IpRulesManager.hasProxy(UID_EVERYBODY, ip, port) val uipcProxyPair = canUseConfig(uipc.first, "univ-ip($ip:$port)", usesMeteredNw) if (!uipcProxyPair.second) { if (ipcProxyPair.first == block) { proxyIds.clear() proxyIds.add(block) } else { proxyIds.add(ipcProxyPair.first) } Logger.i(LOG_TAG_PROXY, "lockdown wg for univ-ip($ip:$port) => return $proxyIds") return proxyIds // no need to proceed further for lockdown } // add the universal ip config to the list if (uipcProxyPair.first.isNotEmpty()) proxyIds.add(uipcProxyPair.first) // universal ip // check for universal domain config val udc = DomainRulesManager.getProxyForDomain(UID_EVERYBODY, domain) val udcProxyPair = canUseConfig(udc.first, "univ-dom($domain)", usesMeteredNw) if (!udcProxyPair.second) { if (ipcProxyPair.first == block) { proxyIds.clear() proxyIds.add(block) } else { proxyIds.add(ipcProxyPair.first) } Logger.i(LOG_TAG_PROXY, "lockdown wg for univ-dom($domain) => return $proxyIds") return proxyIds // no need to proceed further for lockdown } // add the universal domain config to the list if (udcProxyPair.first.isNotEmpty()) proxyIds.add(udcProxyPair.first)*/ + ForbiddenComment:WireguardManager.kt$WireguardManager$// TODO: delete the warp config from the wireguard directory, now part of rpn proxy + FunctionNaming:AboutScreen.kt$@Composable fun AboutItem(title: String, iconId: Int, onClick: () -> Unit) + FunctionNaming:AboutScreen.kt$@Composable fun AboutScreen( uiState: AboutUiState, onSponsorClick: () -> Unit, onTelegramClick: () -> Unit, onBugReportClick: () -> Unit, onWhatsNewClick: () -> Unit, onAppUpdateClick: () -> Unit, onContributorsClick: () -> Unit, onTranslateClick: () -> Unit, onWebsiteClick: () -> Unit, onGithubClick: () -> Unit, onFaqClick: () -> Unit, onDocsClick: () -> Unit, onPrivacyPolicyClick: () -> Unit, onTermsOfServiceClick: () -> Unit, onLicenseClick: () -> Unit, onTwitterClick: () -> Unit, onEmailClick: () -> Unit, onRedditClick: () -> Unit, onElementClick: () -> Unit, onMastodonClick: () -> Unit, onAppInfoClick: () -> Unit, onVpnProfileClick: () -> Unit, onNotificationClick: () -> Unit, onStatsClick: () -> Unit, onDbStatsClick: () -> Unit, onFlightRecordClick: () -> Unit, onEventLogsClick: () -> Unit, onTokenClick: () -> Unit, onTokenDoubleTap: () -> Unit, onFossClick: () -> Unit, onFlossFundsClick: () -> Unit ) + FunctionNaming:AboutScreen.kt$@Composable fun AboutSection(title: String, content: @Composable ColumnScope.() -> Unit) + FunctionNaming:AboutScreen.kt$@Composable fun AboutSmallCard(title: String, iconId: Int, onClick: () -> Unit) + FunctionNaming:AdvancedSettingsScreen.kt$@Composable private fun SettingToggleRow( icon: ImageVector, title: String, description: String, checked: Boolean, onCheckedChange: (Boolean) -> Unit ) + FunctionNaming:AdvancedSettingsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AdvancedSettingsScreen( persistentState: PersistentState, onBackClick: (() -> Unit)? = null ) + FunctionNaming:AlertsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AlertsScreen(onBackClick: () -> Unit) + FunctionNaming:AntiCensorshipScreen.kt$@Composable private fun OptionRow( title: String, description: String, selected: Boolean, enabled: Boolean = true, onClick: () -> Unit ) + FunctionNaming:AntiCensorshipScreen.kt$@Composable private fun SectionHeader(title: String, description: String) + FunctionNaming:AntiCensorshipScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AntiCensorshipScreen( persistentState: PersistentState, eventLogger: EventLogger, onBackClick: (() -> Unit)? = null ) + FunctionNaming:AppDomainRulesDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AppDomainRulesSheet( uid: Int, domain: String, eventLogger: EventLogger, onDismiss: () -> Unit, onUpdated: () -> Unit ) + FunctionNaming:AppDomainRulesDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable private fun WireguardListSheet( inputLabel: String?, selectedProxyId: String, wgConfigs: List<WgConfigFilesImmutable?>, onDismiss: () -> Unit, onSelected: (WgConfigFilesImmutable?) -> Unit ) + FunctionNaming:AppInfoScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AppInfoScreen( uid: Int, eventLogger: EventLogger, ipRulesViewModel: CustomIpViewModel, domainRulesViewModel: CustomDomainViewModel, networkLogsViewModel: AppConnectionsViewModel, onBackClick: () -> Unit, onAppWiseIpLogsClick: (Int, Boolean) -> Unit, onCustomRulesClick: (Int) -> Unit ) + FunctionNaming:AppIpRulesDialog.kt$@Composable private fun DomainRuleRow( domain: String, status: DomainRulesManager.Status, onUpdate: (DomainRulesManager.Status) -> Unit ) + FunctionNaming:AppIpRulesDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AppIpRulesSheet( uid: Int, ipAddress: String, domains: String, eventLogger: EventLogger, onDismiss: () -> Unit, onUpdated: () -> Unit ) + FunctionNaming:AppListScreen.kt$@Composable private fun AppListRecycler(viewModel: AppInfoViewModel, eventLogger: EventLogger) + FunctionNaming:AppListScreen.kt$@Composable private fun BulkIconButton(icon: Int, onClick: () -> Unit) + FunctionNaming:AppListScreen.kt$@Composable private fun BulkToggleRow( bulkWifi: Boolean, bulkMobile: Boolean, bulkBypass: Boolean, bulkBypassDns: Boolean, bulkExclude: Boolean, bulkLockdown: Boolean, showBypassToolTip: Boolean, onShowInfoDialog: () -> Unit, onShowBulkDialog: (BlockType) -> Unit, onBypassDnsTooltip: () -> Unit ) + FunctionNaming:AppListScreen.kt$@Composable private fun FirewallInfoDialogContent() + FunctionNaming:AppListScreen.kt$@Composable private fun InfoRow(icon: Int, text: String) + FunctionNaming:AppListScreen.kt$@Composable private fun TopFilterChip(label: String, selected: Boolean, onClick: () -> Unit) + FunctionNaming:AppListScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AppListScreen( viewModel: AppInfoViewModel, eventLogger: EventLogger, queryText: String, filterLabelText: CharSequence, selectedFirewallFilter: FirewallFilter, isRefreshing: Boolean, bulkWifi: Boolean, bulkMobile: Boolean, bulkBypass: Boolean, bulkBypassDns: Boolean, bulkExclude: Boolean, bulkLockdown: Boolean, showBulkUpdateDialog: Boolean, bulkDialogTitle: String, bulkDialogMessage: String, bulkDialogType: BlockType?, showInfoDialog: Boolean, currentFilters: Filters?, onQueryChange: (String) -> Unit, onRefreshClick: () -> Unit, onFilterApply: (Filters) -> Unit, onFilterClear: (Filters) -> Unit, onFirewallFilterClick: (FirewallFilter) -> Unit, onBulkDialogConfirm: (BlockType) -> Unit, onBulkDialogDismiss: () -> Unit, onInfoDialogDismiss: () -> Unit, onShowInfoDialog: () -> Unit, onShowBulkDialog: (BlockType) -> Unit, onBypassDnsTooltip: () -> Unit, showBypassToolTip: Boolean, onBackClick: (() -> Unit)? = null ) + FunctionNaming:AppListScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun FirewallAppFilterSheet( initialFilters: Filters?, firewallFilter: FirewallFilter, onDismiss: () -> Unit, onApply: (Filters) -> Unit, onClear: (Filters) -> Unit ) + FunctionNaming:AppListScreen.kt$@OptIn(FlowPreview::class) @Composable fun AppListScreen( viewModel: AppInfoViewModel, eventLogger: EventLogger, refreshDatabase: RefreshDatabase, onBackClick: (() -> Unit)? = null ) + FunctionNaming:AppLockScreen.kt$@Composable fun AppLockScreen( persistentState: PersistentState, onAuthResult: (AppLockResult) -> Unit ) + FunctionNaming:AppLockScreen.kt$@Composable private fun AppLockContent(appName: String) + FunctionNaming:AppWiseDomainLogsScreen.kt$@Composable fun AppWiseDomainLogsScreen( state: AppWiseDomainLogsState, items: LazyPagingItems<AppConnection>, eventLogger: EventLogger, onTimeCategoryChange: (AppConnectionsViewModel.TimeCategory) -> Unit, onFilterChange: (String) -> Unit, onDeleteLogs: () -> Unit, defaultIcon: Drawable? ) + FunctionNaming:AppWiseDomainLogsScreen.kt$@Composable private fun AppWiseDomainList( items: LazyPagingItems<AppConnection>, uid: Int, eventLogger: EventLogger ) + FunctionNaming:AppWiseDomainLogsScreen.kt$@Composable private fun ToggleButton(label: String, selected: Boolean, onClick: () -> Unit) + FunctionNaming:AppWiseDomainLogsScreen.kt$@Composable private fun ToggleRow( selectedCategory: AppConnectionsViewModel.TimeCategory, onCategorySelected: (AppConnectionsViewModel.TimeCategory) -> Unit ) + FunctionNaming:AppWiseDomainLogsScreen.kt$@OptIn(FlowPreview::class) @Composable private fun HeaderRow( appIcon: Drawable?, searchHint: String, showDeleteIcon: Boolean, onDeleteClick: () -> Unit, onQueryChange: (String) -> Unit ) + FunctionNaming:AppWiseDomainsAdapter.kt$@Composable fun CloseConnsDialog( conn: AppConnection, onConfirm: () -> Unit, onDismiss: () -> Unit ) + FunctionNaming:AppWiseDomainsAdapter.kt$@Composable fun DomainRow( conn: AppConnection, uid: Int, isActiveConn: Boolean, refreshToken: Int, onIpClick: (AppConnection) -> Unit ) + FunctionNaming:AppWiseDomainsAdapter.kt$@Composable private fun DomainProgress(conn: AppConnection, uid: Int, refresh: Int) + FunctionNaming:AppWiseIpLogsScreen.kt$@Composable private fun AppWiseIpList( viewModel: AppConnectionsViewModel, uid: Int, isAsn: Boolean, isRethinkApp: Boolean, eventLogger: EventLogger ) + FunctionNaming:AppWiseIpLogsScreen.kt$@Composable private fun ToggleButton(label: String, selected: Boolean, onClick: () -> Unit) + FunctionNaming:AppWiseIpLogsScreen.kt$@Composable private fun ToggleRow( selectedCategory: AppConnectionsViewModel.TimeCategory, onCategoryChange: (AppConnectionsViewModel.TimeCategory) -> Unit ) + FunctionNaming:AppWiseIpLogsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun AppWiseIpLogsScreen( uid: Int, isAsn: Boolean, viewModel: AppConnectionsViewModel, eventLogger: EventLogger, onBackClick: (() -> Unit)? = null ) + FunctionNaming:AppWiseIpLogsScreen.kt$@OptIn(FlowPreview::class) @Composable private fun HeaderRow( viewModel: AppConnectionsViewModel, isAsn: Boolean, searchHint: String, appIcon: Drawable?, showDeleteIcon: Boolean, onDeleteClick: () -> Unit ) + FunctionNaming:AppWiseIpsAdapter.kt$@Composable fun IpRow( conn: AppConnection, isAsn: Boolean, refreshToken: Int, onIpClick: (AppConnection) -> Unit ) + FunctionNaming:AppWiseIpsAdapter.kt$@Composable private fun IpProgress(conn: AppConnection, refresh: Int) + FunctionNaming:BackupRestoreDialog.kt$@Composable private fun ActionRow(icon: Int, title: String, description: String, onClick: () -> Unit) + FunctionNaming:BackupRestoreDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun BackupRestoreSheet( onDismiss: () -> Unit ) + FunctionNaming:BubbleScreen.kt$@Composable fun AllowedAppRow(app: AllowedAppInfo, onRemove: () -> Unit) + FunctionNaming:BubbleScreen.kt$@Composable fun BlockedAppRow(app: BlockedAppInfo, onAllow: () -> Unit) + FunctionNaming:BubbleScreen.kt$@Composable fun BubbleScreen( vpnOn: Boolean, allowedItems: LazyPagingItems<AllowedAppInfo>, blockedItems: LazyPagingItems<BlockedAppInfo>, onAllowApp: (BlockedAppInfo, () -> Unit) -> Unit, onRemoveAllowed: (AllowedAppInfo, () -> Unit) -> Unit ) + FunctionNaming:BubbleScreen.kt$@Composable private fun AllowedHeader(count: Int) + FunctionNaming:BubbleScreen.kt$@Composable private fun AppIcon(packageName: String) + FunctionNaming:BubbleScreen.kt$@Composable private fun BlockedHeader() + FunctionNaming:BubbleScreen.kt$@Composable private fun EmptyState() + FunctionNaming:BubbleScreen.kt$@Composable private fun HeaderSection() + FunctionNaming:BubbleScreen.kt$@Composable private fun LoadingCard() + FunctionNaming:CheckoutScreen.kt$@Composable private fun PaymentAwaiting() + FunctionNaming:CheckoutScreen.kt$@Composable private fun PaymentContent( selectedPlan: CheckoutPlan, onPlanSelected: (CheckoutPlan) -> Unit, onStartPayment: () -> Unit, onNavigateToProxy: () -> Unit ) + FunctionNaming:CheckoutScreen.kt$@Composable private fun PaymentFailed(onNavigateToProxy: () -> Unit) + FunctionNaming:CheckoutScreen.kt$@Composable private fun PaymentSuccess(onNavigateToProxy: () -> Unit) + FunctionNaming:CheckoutScreen.kt$@Composable private fun PlanRow(plan: CheckoutPlan, isSelected: Boolean, onClick: () -> Unit) + FunctionNaming:CheckoutScreen.kt$@Composable private fun PlanSelector( selectedPlan: CheckoutPlan, onPlanSelected: (CheckoutPlan) -> Unit ) + FunctionNaming:CheckoutScreen.kt$@Composable private fun StatusScreen( title: String, message: String, buttonLabel: String, onButtonClick: () -> Unit ) + FunctionNaming:CheckoutScreen.kt$@Composable private fun TopBanner() + FunctionNaming:CheckoutScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun CheckoutScreen( paymentStatus: TcpProxyHelper.PaymentStatus, onStartPayment: () -> Unit, onNavigateToProxy: () -> Unit, onBackClick: (() -> Unit)? = null ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun <T : Any> DnsEndpointListWithFab( paddingValues: PaddingValues, items: LazyPagingItems<T>, onFabClick: () -> Unit, itemContent: @Composable (T) -> Unit ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun CustomDohDialogContent( title: String, nameLabel: String, urlLabel: String, defaultName: String, initialUrl: String, checkboxLabel: String, loadNextIndex: suspend () -> Int, nameForIndex: (Int) -> String, onSubmit: (String, String, Boolean) -> String?, invalidUrlMessage: String, onDismiss: () -> Unit ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun CustomOdohDialogContent( title: String, nameLabel: String, proxyLabel: String, resolverLabel: String, defaultName: String, initialResolver: String, loadNextIndex: suspend () -> Int, invalidUrlMessage: String, onSubmit: (String, String, String) -> String?, onDismiss: () -> Unit ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun DnsCryptDialogContent( appConfig: AppConfig, scope: CoroutineScope, onDismiss: () -> Unit ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun DnsCryptListContent( paddingValues: PaddingValues, appConfig: AppConfig, dnsCryptViewModel: DnsCryptEndpointViewModel, dnsCryptRelayViewModel: DnsCryptRelayEndpointViewModel, scope: CoroutineScope ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun DnsProxyDialogContent( appNames: List<String>, nextIndex: Int, appConfig: AppConfig, persistentState: PersistentState, scope: CoroutineScope, onDismiss: () -> Unit ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun DnsProxyListContent( paddingValues: PaddingValues, appConfig: AppConfig, persistentState: PersistentState, dnsProxyViewModel: DnsProxyEndpointViewModel, scope: CoroutineScope ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun DohListContent( paddingValues: PaddingValues, appConfig: AppConfig, dohViewModel: DoHEndpointViewModel, scope: CoroutineScope ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun DotListContent( paddingValues: PaddingValues, appConfig: AppConfig, dotViewModel: DoTEndpointViewModel, scope: CoroutineScope ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun FullWidthDialog( onDismiss: () -> Unit, content: @Composable () -> Unit ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun OdohListContent( paddingValues: PaddingValues, appConfig: AppConfig, oDohViewModel: ODoHEndpointViewModel, scope: CoroutineScope ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@Composable private fun OtherDnsListContent( dnsType: DnsScreenType, paddingValues: PaddingValues, appConfig: AppConfig, persistentState: PersistentState, dohViewModel: DoHEndpointViewModel, dotViewModel: DoTEndpointViewModel, dnsProxyViewModel: DnsProxyEndpointViewModel, dnsCryptViewModel: DnsCryptEndpointViewModel, dnsCryptRelayViewModel: DnsCryptRelayEndpointViewModel, oDohViewModel: ODoHEndpointViewModel, scope: CoroutineScope ) + FunctionNaming:ConfigureOtherDnsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun ConfigureOtherDnsScreen( dnsType: DnsScreenType, appConfig: AppConfig, persistentState: PersistentState, dohViewModel: DoHEndpointViewModel, dotViewModel: DoTEndpointViewModel, dnsProxyViewModel: DnsProxyEndpointViewModel, dnsCryptViewModel: DnsCryptEndpointViewModel, dnsCryptRelayViewModel: DnsCryptRelayEndpointViewModel, oDohViewModel: ODoHEndpointViewModel, onBackClick: () -> Unit ) + FunctionNaming:ConfigureRethinkBasicScreen.kt$@Composable private fun RethinkBlocklistContent( modifier: Modifier = Modifier, context: Context, blocklistType: RethinkBlocklistManager.RethinkBlocklistType, filters: MutableLiveData<RethinkBlocklistState.Filters>, remoteFileTagViewModel: RethinkRemoteFileTagViewModel, localFileTagViewModel: RethinkLocalFileTagViewModel, remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, showDownload: Boolean, showConfigure: Boolean, isDownloading: Boolean, showRemoteProgress: Boolean, activeView: RethinkBlocklistState.BlocklistView, filterLabelText: String, showPlusFilterSheet: Boolean, plusFilterTags: List<FileTag>, onActiveViewChanged: (RethinkBlocklistState.BlocklistView) -> Unit, onFilterLabelTextChanged: (String) -> Unit, onShowPlusFilterSheetChanged: (Boolean) -> Unit, onPlusFilterTagsChanged: (List<FileTag>) -> Unit, onDownloadBlocklist: () -> Unit, onCancelDownload: () -> Unit, onApplyChanges: () -> Unit, onRevertChanges: () -> Unit, onRefreshBlocklistAvailability: () -> Unit, onProcessSelectedFileTags: (String) -> Unit, onModifiedStampChanged: (String) -> Unit, getStampValue: () -> String, onDownloadStart: () -> Unit, onDownloadFail: () -> Unit, onDownloadSuccess: () -> Unit ) + FunctionNaming:ConfigureRethinkBasicScreen.kt$@Composable private fun RethinkListContent( modifier: Modifier = Modifier, context: Context, persistentState: PersistentState, appConfig: AppConfig, appDownloadManager: AppDownloadManager, rethinkEndpointViewModel: RethinkEndpointViewModel, uid: Int, isMax: Boolean, updateAvailable: Boolean, checkUpdateVisible: Boolean, redownloadVisible: Boolean, checkUpdateInProgress: Boolean, updateInProgress: Boolean, onMaxChanged: (Boolean) -> Unit, onUpdateMaxSwitchUi: () -> Unit, onRefreshUpdateUi: () -> Unit, onCheckUpdateInProgressChanged: (Boolean) -> Unit, onUpdateInProgressChanged: (Boolean) -> Unit, onCheckBlocklistUpdate: () -> Unit, onDownload: (Long, Boolean) -> Unit ) + FunctionNaming:ConfigureRethinkBasicScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun ConfigureRethinkBasicScreen( screenType: ConfigureRethinkScreenType, remoteName: String = "", remoteUrl: String = "", uid: Int = Constants.MISSING_UID, persistentState: PersistentState, appConfig: AppConfig, appDownloadManager: AppDownloadManager, rethinkEndpointViewModel: RethinkEndpointViewModel, remoteFileTagViewModel: RethinkRemoteFileTagViewModel, localFileTagViewModel: RethinkLocalFileTagViewModel, remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, onBackClick: (() -> Unit)? = null ) + FunctionNaming:ConfigureRethinkBasicScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable private fun RethinkPlusFilterSheet( context: Context, fileTags: List<FileTag>, filters: MutableLiveData<RethinkBlocklistState.Filters>, onDismiss: () -> Unit ) + FunctionNaming:ConfigureScreen.kt$@Composable fun ConfigureCard( title: String, iconId: Int, modifier: Modifier = Modifier, onClick: () -> Unit ) + FunctionNaming:ConfigureScreen.kt$@Composable fun ConfigureScreen( isDebug: Boolean, onAppsClick: () -> Unit, onDnsClick: () -> Unit, onFirewallClick: () -> Unit, onProxyClick: () -> Unit, onNetworkClick: () -> Unit, onOthersClick: () -> Unit, onLogsClick: () -> Unit, onAntiCensorshipClick: () -> Unit, onAdvancedClick: () -> Unit ) + FunctionNaming:ConnTrackerDialog.kt$@Composable private fun HtmlText(spanned: Spanned, modifier: Modifier = Modifier) + FunctionNaming:ConnTrackerDialog.kt$@Composable private fun SelectionRow( label: @Composable () -> Unit, labels: List<String>, selectedIndex: Int, onSelect: (Int) -> Unit ) + FunctionNaming:ConnTrackerDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun ConnTrackerSheet( activity: FragmentActivity, info: ConnectionTracker, persistentState: PersistentState, eventLogger: EventLogger, onDismiss: () -> Unit ) + FunctionNaming:ConnectionTrackerAdapter.kt$@Composable fun ConnectionRow( ct: ConnectionTracker, onShowConnTracker: (ConnectionTracker) -> Unit ) + FunctionNaming:ConsoleLogAdapter.kt$@Composable fun ConsoleLogRow(log: ConsoleLog, isDebug: Boolean = DEBUG) + FunctionNaming:ConsoleLogScreen.kt$@Composable private fun ConsoleLogList(viewModel: ConsoleLogViewModel) + FunctionNaming:ConsoleLogScreen.kt$@Composable private fun SearchRow( query: String, onQueryChange: (String) -> Unit, onFilterClick: () -> Unit, onShareClick: () -> Unit, onDeleteClick: () -> Unit ) + FunctionNaming:ConsoleLogScreen.kt$@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class) @Composable fun ConsoleLogScreen( viewModel: ConsoleLogViewModel, consoleLogRepository: ConsoleLogRepository, persistentState: PersistentState, onShareClick: () -> Unit, onDeleteComplete: () -> Unit, onBackClick: (() -> Unit)? = null ) + FunctionNaming:CustomDomainRulesDialog.kt$@Composable private fun RuleChip( label: String, selected: Boolean, selectedText: Color, selectedContainer: Color, onClick: () -> Unit ) + FunctionNaming:CustomDomainRulesDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun CustomDomainRulesSheet( customDomain: CustomDomain, eventLogger: EventLogger, onDismiss: () -> Unit, onDeleted: () -> Unit ) + FunctionNaming:CustomIpRulesDialog.kt$@Composable private fun RuleChip( label: String, selected: Boolean, selectedText: Color, selectedContainer: Color, onClick: () -> Unit ) + FunctionNaming:CustomIpRulesDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun CustomIpRulesSheet( customIp: CustomIp, eventLogger: EventLogger, onDismiss: () -> Unit, onDeleted: () -> Unit ) + FunctionNaming:CustomLanIpDialog.kt$@Composable private fun IpRow( ipValue: String, prefixValue: String, ipHint: String, prefixHint: String, enabled: Boolean, onIpChange: (String) -> Unit, onPrefixChange: (String) -> Unit ) + FunctionNaming:CustomLanIpDialog.kt$@Composable private fun SectionTitle(text: String) + FunctionNaming:CustomLanIpDialog.kt$@Composable private fun ToggleButton( text: String, selected: Boolean, selectedBg: Color, unselectedBg: Color, selectedText: Color, unselectedText: Color, modifier: Modifier, onClick: () -> Unit ) + FunctionNaming:CustomLanIpDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun CustomLanIpSheet( persistentState: PersistentState, onDismiss: () -> Unit ) + FunctionNaming:CustomRulesScreen.kt$@Composable private fun AddRuleDialog( isIpRule: Boolean, onDismiss: () -> Unit, onAddIpRule: (String) -> Unit, onAddDomainRule: (String) -> Unit ) + FunctionNaming:CustomRulesScreen.kt$@Composable private fun DomainRuleRow(rule: CustomDomain, onDelete: () -> Unit) + FunctionNaming:CustomRulesScreen.kt$@Composable private fun IpRuleRow(rule: CustomIp, onDelete: () -> Unit) + FunctionNaming:CustomRulesScreen.kt$@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class) @Composable fun CustomRulesScreen( domainViewModel: CustomDomainViewModel, ipViewModel: CustomIpViewModel, eventLogger: EventLogger, onBackClick: (() -> Unit)? = null ) + FunctionNaming:CustomRulesScreen.kt$@OptIn(FlowPreview::class) @Composable private fun DomainRulesContent(viewModel: CustomDomainViewModel, eventLogger: EventLogger) + FunctionNaming:CustomRulesScreen.kt$@OptIn(FlowPreview::class) @Composable private fun IpRulesContent(viewModel: CustomIpViewModel, eventLogger: EventLogger) + FunctionNaming:DesignComponents.kt$@Composable fun AnimatedVisibilityFadeScale( visible: Boolean, modifier: Modifier = Modifier, content: @Composable () -> Unit ) + FunctionNaming:DesignComponents.kt$@Composable fun AppCard( modifier: Modifier = Modifier, onClick: (() -> Unit)? = null, colors: CardColors = CardDefaults.cardColors( containerColor = MaterialTheme.colorScheme.surfaceVariant ), content: @Composable ColumnScope.() -> Unit ) + FunctionNaming:DesignComponents.kt$@Composable fun AppDivider( modifier: Modifier = Modifier, indent: Dp = Dimensions.spacingNone, color: Color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = Opacity.LOW) ) + FunctionNaming:DesignComponents.kt$@Composable fun AppListItem( modifier: Modifier = Modifier, icon: ImageVector? = null, iconPainter: Painter? = null, title: String, description: String? = null, trailing: @Composable (() -> Unit)? = null, onClick: (() -> Unit)? = null ) + FunctionNaming:DesignComponents.kt$@Composable fun CompactEmptyState( modifier: Modifier = Modifier, message: String, icon: ImageVector? = null ) + FunctionNaming:DesignComponents.kt$@Composable fun EmptyStateView( modifier: Modifier = Modifier, illustration: Painter? = null, title: String? = null, message: String, actionLabel: String? = null, onAction: (() -> Unit)? = null ) + FunctionNaming:DesignComponents.kt$@Composable fun GroupedCard( modifier: Modifier = Modifier, title: String? = null, titleIcon: ImageVector? = null, content: @Composable ColumnScope.() -> Unit ) + FunctionNaming:DesignComponents.kt$@Composable fun PrimaryButton( text: String, onClick: () -> Unit, modifier: Modifier = Modifier, enabled: Boolean = true, icon: ImageVector? = null ) + FunctionNaming:DesignComponents.kt$@Composable fun SecondaryButton( text: String, onClick: () -> Unit, modifier: Modifier = Modifier, enabled: Boolean = true, icon: ImageVector? = null ) + FunctionNaming:DesignComponents.kt$@Composable fun SectionHeader( title: String, modifier: Modifier = Modifier, actionLabel: String? = null, onAction: (() -> Unit)? = null ) + FunctionNaming:DesignComponents.kt$@Composable fun StatItem( label: String, value: String, modifier: Modifier = Modifier, isHighlighted: Boolean = false ) + FunctionNaming:DetailedStatisticsScreen.kt$@Composable fun DetailedStatisticsScreen( viewModel: DetailedStatisticsViewModel, type: SummaryStatisticsType, timeCategory: TimeCategory, onBackClick: () -> Unit ) + FunctionNaming:DetailedStatisticsScreen.kt$@Composable private fun DetailedStatItemCard(item: AppConnection, type: SummaryStatisticsType) + FunctionNaming:DetailedStatisticsScreen.kt$@Composable private fun NoDataView(modifier: Modifier = Modifier) + FunctionNaming:DetailedStatisticsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable private fun DetailedStatisticsTopBar(type: SummaryStatisticsType, onBackClick: () -> Unit) + FunctionNaming:DnsCryptEndpointAdapter.kt$@Composable fun DnsCryptRow(endpoint: DnsCryptEndpoint, appConfig: AppConfig) + FunctionNaming:DnsCryptRelayEndpointAdapter.kt$@Composable fun RelayRow(endpoint: DnsCryptRelayEndpoint, appConfig: AppConfig) + FunctionNaming:DnsCryptRelaysDialog.kt$@Composable fun DnsCryptRelaysDialog( appConfig: AppConfig, relays: LiveData<PagingData<DnsCryptRelayEndpoint>>, onDismiss: () -> Unit ) + FunctionNaming:DnsCryptRelaysDialog.kt$@Composable private fun DnsCryptRelaysContent( appConfig: AppConfig, relays: LiveData<PagingData<DnsCryptRelayEndpoint>>, onDismiss: () -> Unit ) + FunctionNaming:DnsDetailScreen.kt$@Composable fun DnsDetailScreen( viewModel: DnsSettingsViewModel, persistentState: PersistentState, appDownloadManager: AppDownloadManager, onCustomDnsClick: () -> Unit, onRethinkPlusDnsClick: () -> Unit, onLocalBlocklistConfigureClick: () -> Unit, onBackClick: (() -> Unit)? = null ) + FunctionNaming:DnsDetailScreen.kt$@Composable private fun ActionButton( text: String, enabled: Boolean, modifier: Modifier = Modifier, onClick: () -> Unit ) + FunctionNaming:DnsDetailScreen.kt$@Composable private fun DownloadRow( label: String, isLoading: Boolean, enabled: Boolean, onClick: () -> Unit ) + FunctionNaming:DnsDetailScreen.kt$@Composable private fun RecordModeToggleRow( isAutoMode: Boolean, onAutoSelected: () -> Unit, onManualSelected: () -> Unit ) + FunctionNaming:DnsDetailScreen.kt$@Composable private fun RecordTypeRow( type: ResourceRecordTypes, isAutoMode: Boolean, isSelected: Boolean, onToggle: () -> Unit ) + FunctionNaming:DnsDetailScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable private fun DnsRecordTypesSheet( persistentState: PersistentState, onDismiss: () -> Unit ) + FunctionNaming:DnsDetailScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable private fun LocalBlocklistsSheet( context: Context, headingText: String, enableLabel: String, enableColor: Color, versionText: String, canConfigure: Boolean, canCopy: Boolean, canSearch: Boolean, showCheckDownload: Boolean, showDownload: Boolean, showRedownload: Boolean, isChecking: Boolean, isDownloading: Boolean, isRedownloading: Boolean, persistentState: PersistentState, onDismiss: () -> Unit, onEnableBlocklist: () -> Unit, onConfigure: () -> Unit, onCopy: () -> Unit, onSearch: () -> Unit, onCheckUpdate: () -> Unit, onDownload: () -> Unit, onRedownload: () -> Unit, onDelete: () -> Unit ) + FunctionNaming:DnsListScreen.kt$@Composable private fun DnsCard( label: String, title: String, dots: List<Int>, type: AppConfig.DnsType, selectedType: AppConfig.DnsType?, selectedWorking: Boolean, modifier: Modifier = Modifier, onClick: () -> Unit ) + FunctionNaming:DnsListScreen.kt$@Composable private fun LegendItem(icon: Int, label: String) + FunctionNaming:DnsListScreen.kt$@Composable private fun LegendRow() + FunctionNaming:DnsListScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun DnsListScreen( appConfig: AppConfig, onConfigureOtherDns: (Int) -> Unit, onConfigureRethinkBasic: (Int) -> Unit, onBackClick: (() -> Unit)? = null ) + FunctionNaming:DnsLogAdapter.kt$@Composable fun DnsLogRow( log: DnsLog, loadFavIcon: Boolean, isRethinkDns: Boolean, onShowBlocklist: (DnsLog) -> Unit ) + FunctionNaming:DnsProxyEndpointAdapter.kt$@Composable fun DnsProxyEndpointRow(endpoint: DnsProxyEndpoint, appConfig: AppConfig) + FunctionNaming:DnsSettingsScreen.kt$@Composable fun DnsHeader( title: String, isRefreshing: Boolean = false, onRefreshClick: (() -> Unit)? = null ) + FunctionNaming:DnsSettingsScreen.kt$@Composable fun DnsRadioButtonItem( title: String, selected: Boolean, onClick: () -> Unit, onInfoClick: (() -> Unit)? = null, showArrow: Boolean = false ) + FunctionNaming:DnsSettingsScreen.kt$@Composable fun DnsSettingsScreen( uiState: DnsSettingsUiState, onRefreshClick: () -> Unit, onSystemDnsClick: () -> Unit, onSystemDnsInfoClick: () -> Unit, onCustomDnsClick: () -> Unit, onRethinkPlusDnsClick: () -> Unit, onSmartDnsClick: () -> Unit, onSmartDnsInfoClick: () -> Unit, onLocalBlocklistClick: () -> Unit, onCustomDownloaderChange: (Boolean) -> Unit, onPeriodicUpdateChange: (Boolean) -> Unit, onDnsAlgChange: (Boolean) -> Unit, onSplitDnsChange: (Boolean) -> Unit, onBypassDnsBlockChange: (Boolean) -> Unit, onAllowedRecordTypesClick: () -> Unit, onFavIconChange: (Boolean) -> Unit, onDnsCacheChange: (Boolean) -> Unit, onProxyDnsChange: (Boolean) -> Unit, onUndelegatedDomainsChange: (Boolean) -> Unit, onFallbackChange: (Boolean) -> Unit, onPreventLeaksChange: (Boolean) -> Unit ) + FunctionNaming:DnsSettingsScreen.kt$@Composable fun SettingsNavigationItem( title: String, description: String, iconId: Int, onClick: () -> Unit, statusText: String? = null, statusColor: androidx.compose.ui.graphics.Color = MaterialTheme.colorScheme.onSurfaceVariant ) + FunctionNaming:DnsSettingsScreen.kt$@Composable fun SettingsSwitchItem( title: String, description: String, iconId: Int, checked: Boolean, onCheckedChange: (Boolean) -> Unit ) + FunctionNaming:DoTEndpointAdapter.kt$@Composable fun DoTEndpointRow(endpoint: DoTEndpoint, appConfig: AppConfig) + FunctionNaming:DohEndpointAdapter.kt$@Composable fun DoHEndpointRow(endpoint: DoHEndpoint, appConfig: AppConfig) + FunctionNaming:DomainConnectionsAdapter.kt$@Composable fun ConnectionRow(dc: AppConnection) + FunctionNaming:DomainConnectionsScreen.kt$@Composable private fun ConnectionsList( viewModel: DomainConnectionsViewModel, type: DomainConnectionsInputType ) + FunctionNaming:DomainConnectionsScreen.kt$@Composable private fun EmptyState() + FunctionNaming:DomainConnectionsScreen.kt$@Composable private fun Header(title: String, subtitle: String) + FunctionNaming:DomainConnectionsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun DomainConnectionsScreen( viewModel: DomainConnectionsViewModel, type: DomainConnectionsInputType, flag: String, domain: String, asn: String, ip: String, isBlocked: Boolean, timeCategory: DomainConnectionsViewModel.TimeCategory, onBackClick: () -> Unit ) + FunctionNaming:EventsAdapter.kt$@Composable fun EventCard(event: Event, onCopy: (String) -> Unit) + FunctionNaming:EventsScreen.kt$@Composable private fun EmptyState() + FunctionNaming:EventsScreen.kt$@Composable private fun EventsList(items: androidx.paging.compose.LazyPagingItems<Event>, onCopy: (String) -> Unit) + FunctionNaming:EventsScreen.kt$@Composable private fun FilterChip(label: String, selected: Boolean, onClick: () -> Unit) + FunctionNaming:EventsScreen.kt$@Composable private fun SearchRow( query: String, onQueryChange: (String) -> Unit, onFilterClick: () -> Unit, onRefreshClick: () -> Unit, onDeleteClick: () -> Unit ) + FunctionNaming:EventsScreen.kt$@Composable private fun SeverityChips( filterType: TopLevelFilter, filterSeverity: Severity?, showSourceChips: Boolean, onAllClick: () -> Unit, onSeverityClick: (Severity) -> Unit, onSourceClick: () -> Unit ) + FunctionNaming:EventsScreen.kt$@Composable private fun SourceChips( filterSources: Set<EventSource>, onToggle: (EventSource) -> Unit ) + FunctionNaming:EventsScreen.kt$@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class) @Composable fun EventsScreen( viewModel: EventsViewModel, eventDao: EventDao, onBackClick: () -> Unit ) + FunctionNaming:FirewallAppListAdapter.kt$@Composable fun FirewallAppRow(appInfo: AppInfo, eventLogger: EventLogger) + FunctionNaming:FirewallSettingsScreen.kt$@Composable fun FirewallSettingItem( title: String, description: String, iconId: Int, onClick: () -> Unit ) + FunctionNaming:FirewallSettingsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun FirewallSettingsScreen( onUniversalFirewallClick: () -> Unit, onCustomIpDomainClick: () -> Unit, onAppWiseIpDomainClick: () -> Unit, onBackClick: (() -> Unit)? = null ) + FunctionNaming:HomeComponents.kt$@Composable fun DashboardCard( title: String, iconId: Int, modifier: Modifier = Modifier, backgroundColor: Color = MaterialTheme.colorScheme.surfaceVariant, onClick: () -> Unit, content: @Composable () -> Unit ) + FunctionNaming:HomeComponents.kt$@Composable fun StartStopButton( isPlaying: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier ) + FunctionNaming:HomeComponents.kt$@Composable fun StatItem( label: String, value: String, modifier: Modifier = Modifier, isHighlighted: Boolean = false ) + FunctionNaming:HomeNavigation.kt$@Composable fun HomeScreenRoot( homeUiState: HomeScreenUiState, onHomeStartStopClick: () -> Unit, onHomeDnsClick: () -> Unit, onHomeFirewallClick: () -> Unit, onHomeProxyClick: () -> Unit, onHomeLogsClick: () -> Unit, onHomeAppsClick: () -> Unit, onHomeSponsorClick: () -> Unit, summaryViewModel: SummaryStatisticsViewModel, onOpenDetailedStats: (SummaryStatisticsType) -> Unit, startDestination: HomeRoute, isDebug: Boolean, onConfigureAppsClick: () -> Unit, onConfigureDnsClick: () -> Unit, onConfigureFirewallClick: () -> Unit, onFirewallUniversalClick: () -> Unit, onFirewallCustomIpClick: () -> Unit, onFirewallAppWiseIpClick: () -> Unit, onConfigureProxyClick: () -> Unit, onConfigureNetworkClick: () -> Unit, onConfigureOthersClick: () -> Unit, onConfigureLogsClick: () -> Unit, onConfigureAntiCensorshipClick: () -> Unit, onConfigureAdvancedClick: () -> Unit, aboutUiState: AboutUiState, onSponsorClick: () -> Unit, onTelegramClick: () -> Unit, onBugReportClick: () -> Unit, onWhatsNewClick: () -> Unit, onAppUpdateClick: () -> Unit, onContributorsClick: () -> Unit, onTranslateClick: () -> Unit, onWebsiteClick: () -> Unit, onGithubClick: () -> Unit, onFaqClick: () -> Unit, onDocsClick: () -> Unit, onPrivacyPolicyClick: () -> Unit, onTermsOfServiceClick: () -> Unit, onLicenseClick: () -> Unit, onTwitterClick: () -> Unit, onEmailClick: () -> Unit, onRedditClick: () -> Unit, onElementClick: () -> Unit, onMastodonClick: () -> Unit, onAppInfoClick: () -> Unit, onVpnProfileClick: () -> Unit, onNotificationClick: () -> Unit, onStatsClick: () -> Unit, onDbStatsClick: () -> Unit, onFlightRecordClick: () -> Unit, onEventLogsClick: () -> Unit, onTokenClick: () -> Unit, onTokenDoubleTap: () -> Unit, onFossClick: () -> Unit, onFlossFundsClick: () -> Unit, snackbarHostState: SnackbarHostState, detailedStatsViewModel: DetailedStatisticsViewModel, domainConnectionsViewModel: DomainConnectionsViewModel, eventsViewModel: EventsViewModel, eventDao: EventDao, appInfoEventLogger: EventLogger, appInfoIpRulesViewModel: CustomIpViewModel, appInfoDomainRulesViewModel: CustomDomainViewModel, appInfoNetworkLogsViewModel: AppConnectionsViewModel, persistentState: PersistentState, appConfig: AppConfig, onOpenVpnProfile: () -> Unit, onRefreshDatabase: (() -> Unit)? = null, consoleLogViewModel: ConsoleLogViewModel, consoleLogRepository: ConsoleLogRepository, onShareConsoleLogs: () -> Unit, onConsoleLogsDeleteComplete: () -> Unit, proxyAppsMappingViewModel: ProxyAppsMappingViewModel, dnsSettingsViewModel: DnsSettingsViewModel, appDownloadManager: AppDownloadManager, onDnsCustomDnsClick: () -> Unit, onDnsRethinkPlusDnsClick: () -> Unit, onDnsLocalBlocklistConfigureClick: () -> Unit, homeNavRequest: HomeNavRequest?, onHomeNavConsumed: () -> Unit, onAppLockResult: (AppLockResult) -> Unit = {}, // ConfigureRethinkBasic dependencies rethinkEndpointViewModel: RethinkEndpointViewModel, remoteFileTagViewModel: RethinkRemoteFileTagViewModel, localFileTagViewModel: RethinkLocalFileTagViewModel, remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, appInfoViewModel: AppInfoViewModel, refreshDatabase: RefreshDatabase, connectionTrackerViewModel: ConnectionTrackerViewModel, dnsLogViewModel: DnsLogViewModel, rethinkLogViewModel: RethinkLogViewModel, connectionTrackerRepository: ConnectionTrackerRepository, dnsLogRepository: DnsLogRepository, rethinkLogRepository: RethinkLogRepository, onConfigureOtherDns: (Int) -> Unit, // ConfigureOtherDns dependencies dohViewModel: DoHEndpointViewModel, dotViewModel: DoTEndpointViewModel, dnsProxyViewModel: DnsProxyEndpointViewModel, dnsCryptViewModel: DnsCryptEndpointViewModel, dnsCryptRelayViewModel: DnsCryptRelayEndpointViewModel, oDohViewModel: ODoHEndpointViewModel, // UniversalFirewallSettings callbacks onNavigateToLogs: (String) -> Unit, onOpenAccessibilitySettings: () -> Unit, // WireGuard dependencies wgConfigViewModel: WgConfigViewModel, // Checkout dependencies checkoutViewModel: CheckoutViewModel?, onNavigateToProxy: () -> Unit, // WgMain callbacks onWgCreateClick: () -> Unit, onWgImportClick: () -> Unit, onWgQrScanClick: () -> Unit ) + FunctionNaming:HomeScreen.kt$@Composable fun HomeScreen( uiState: HomeScreenUiState, onStartStopClick: () -> Unit, onDnsClick: () -> Unit, onFirewallClick: () -> Unit, onProxyClick: () -> Unit, onLogsClick: () -> Unit, onAppsClick: () -> Unit, onSponsorClick: () -> Unit ) + FunctionNaming:HomeScreen.kt$@Preview @Composable fun HomeScreenPreview() + FunctionNaming:HomeScreenActivity.kt$HomeScreenActivity$@Composable private fun BugReportFileRow( fileItem: BugReportFile, onShare: () -> Unit, onDelete: () -> Unit ) + FunctionNaming:HomeScreenActivity.kt$HomeScreenActivity$@Composable private fun ContributorsDialogContent(onDismiss: () -> Unit) + FunctionNaming:HomeScreenActivity.kt$HomeScreenActivity$@Composable private fun HomeDialogHost() + FunctionNaming:HomeScreenActivity.kt$HomeScreenActivity$@Composable private fun HtmlText(text: String, textAlign: TextAlign) + FunctionNaming:HomeScreenActivity.kt$HomeScreenActivity$@Composable private fun SponsorInfoDialogContent( amount: String, usageMessage: String, onSponsorClick: () -> Unit ) + FunctionNaming:HomeScreenActivity.kt$HomeScreenActivity$@Composable private fun WhatsNewDialogContent() + FunctionNaming:HomeScreenActivity.kt$HomeScreenActivity$@OptIn(ExperimentalMaterial3Api::class) @Composable private fun BugReportFilesSheet(onDismiss: () -> Unit) + FunctionNaming:LocalAdvancedViewAdapter.kt$@Composable fun LocalAdvancedBlocklistRow( filetag: RethinkLocalFileTag, showHeader: Boolean, onToggle: (Boolean) -> Unit ) + FunctionNaming:LocalSimpleViewAdapter.kt$@Composable fun LocalSimpleBlocklistRow( map: LocalBlocklistPacksMap, showHeader: Boolean, onToggle: (Boolean) -> Unit ) + FunctionNaming:MiscSettingsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun MiscSettingsScreen( persistentState: PersistentState, eventLogger: EventLogger, onBackClick: (() -> Unit)? = null, onRefreshDatabase: (() -> Unit)? = null ) + FunctionNaming:NetworkLogsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable private fun ConnTrackerDetailsSheet( connection: ConnectionTracker, onDismiss: () -> Unit ) + FunctionNaming:NetworkLogsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable private fun DnsLogDetailsSheet( log: DnsLog, onDismiss: () -> Unit ) + FunctionNaming:NetworkLogsScreen.kt$@OptIn(ExperimentalMaterial3Api::class, FlowPreview::class) @Composable fun NetworkLogsScreen( connectionTrackerViewModel: ConnectionTrackerViewModel, dnsLogViewModel: DnsLogViewModel, rethinkLogViewModel: RethinkLogViewModel, connectionTrackerRepository: ConnectionTrackerRepository, dnsLogRepository: DnsLogRepository, rethinkLogRepository: RethinkLogRepository, persistentState: PersistentState, eventLogger: EventLogger, onBackClick: (() -> Unit)? = null ) + FunctionNaming:NetworkLogsScreen.kt$@OptIn(FlowPreview::class) @Composable private fun ConnectionLogsContent( viewModel: ConnectionTrackerViewModel, repository: ConnectionTrackerRepository, persistentState: PersistentState, onShowConnTracker: (ConnectionTracker) -> Unit ) + FunctionNaming:NetworkLogsScreen.kt$@OptIn(FlowPreview::class) @Composable private fun DnsLogsContent( viewModel: DnsLogViewModel, repository: DnsLogRepository, persistentState: PersistentState, onShowDnsLog: (DnsLog) -> Unit ) + FunctionNaming:NetworkReachabilityDialog.kt$@Composable private fun AddressRow( value: String, onValueChange: (String) -> Unit, enabled: Boolean, progress: Boolean, result: ConnectionMonitor.ProbeResult? ) + FunctionNaming:NetworkReachabilityDialog.kt$@Composable private fun StatusIcon(isOk: Boolean) + FunctionNaming:NetworkReachabilityDialog.kt$@Composable private fun ToggleButton(selected: Boolean, text: String, onClick: () -> Unit) + FunctionNaming:NetworkReachabilityDialog.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun NetworkReachabilitySheet( persistentState: PersistentState, onDismiss: () -> Unit ) + FunctionNaming:ODoHEndpointAdapter.kt$@Composable fun ODoHEndpointRow(endpoint: ODoHEndpoint, appConfig: AppConfig) + FunctionNaming:OneWgConfigAdapter.kt$@Composable fun OneWgConfigRow( config: WgConfigFiles, eventLogger: EventLogger, onDnsStatusChanged: () -> Unit, onConfigDetailClick: (Int, WgType) -> Unit ) + FunctionNaming:PauseScreen.kt$@Composable fun PauseScreen( onFinish: () -> Unit ) + FunctionNaming:PauseScreen.kt$@Composable private fun ControlIcon( icon: Int, size: Dp, onClick: () -> Unit, onLongClick: () -> Unit, onRelease: () -> Unit ) + FunctionNaming:PingTestScreen.kt$@Composable private fun PingField( value: String, readOnly: Boolean, status: PingStatus, onValueChange: (String) -> Unit = {} ) + FunctionNaming:PingTestScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun PingTestScreen( onBackClick: (() -> Unit)? = null ) + FunctionNaming:ProxySettingsScreen.kt$@Composable private fun ProxyCard( title: String, description: String, enabled: Boolean, onEnabledChange: (Boolean) -> Unit, onConfigureClick: (() -> Unit)? ) + FunctionNaming:ProxySettingsScreen.kt$@Composable private fun ProxyConfigDialog( title: String, onDismiss: () -> Unit, onConfirm: (host: String, port: String, username: String, password: String) -> Unit ) + FunctionNaming:ProxySettingsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun ProxySettingsScreen( appConfig: AppConfig, persistentState: PersistentState, eventLogger: EventLogger, onBackClick: (() -> Unit)? = null ) + FunctionNaming:RemoteAdvancedViewAdapter.kt$@Composable fun RemoteAdvancedBlocklistRow( filetag: RethinkRemoteFileTag, showHeader: Boolean, onToggle: (Boolean) -> Unit ) + FunctionNaming:RemoteSimpleViewAdapter.kt$@Composable fun RemoteSimpleBlocklistRow( map: RemoteBlocklistPacksMap, showHeader: Boolean, onToggle: (Boolean) -> Unit ) + FunctionNaming:RethinkEndpointAdapter.kt$@Composable fun RethinkEndpointRow( endpoint: RethinkDnsEndpoint, appConfig: AppConfig, onEditConfiguration: (ConfigureRethinkScreenType, String, String) -> Unit = { _, _, _ -> } ) + FunctionNaming:RethinkLogAdapter.kt$@Composable fun RethinkLogRow( log: RethinkLog, onShowConnTracker: (ConnectionTracker) -> Unit ) + FunctionNaming:RpnAvailabilityScreen.kt$@Composable private fun AvailabilityRow(item: RpnAvailabilityItem) + FunctionNaming:RpnAvailabilityScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun RpnAvailabilityScreen(onBackClick: () -> Unit) + FunctionNaming:RpnCountriesAdapter.kt$@Composable fun CountryRow(conf: String, isSelected: Boolean) + FunctionNaming:RpnCountriesScreen.kt$@Composable private fun CountriesList(countries: List<String>, selectedCountries: Set<String>) + FunctionNaming:RpnCountriesScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun RpnCountriesScreen(onBackClick: () -> Unit) + FunctionNaming:RpnWinProxyDetailsScreen.kt$@Composable private fun ActionButton(onClick: () -> Unit) + FunctionNaming:RpnWinProxyDetailsScreen.kt$@Composable private fun DetailRow(label: String, value: String, valueColor: Color = MaterialTheme.colorScheme.onSurface) + FunctionNaming:RpnWinProxyDetailsScreen.kt$@Composable private fun DetailsSection(countryCode: String, proxyError: String) + FunctionNaming:RpnWinProxyDetailsScreen.kt$@Composable private fun StatCard(label: String, value: String, modifier: Modifier = Modifier) + FunctionNaming:RpnWinProxyDetailsScreen.kt$@Composable private fun StatsRow(appsCount: String, domainsCount: String, ipsCount: String) + FunctionNaming:RpnWinProxyDetailsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun RpnWinProxyDetailsScreen( countryCode: String, onBackClick: () -> Unit ) + FunctionNaming:StatisticsSummaryItem.kt$@Composable fun StatisticsSummaryItem( title: String, subtitle: String?, countText: String, iconDrawable: Drawable?, flagText: String?, showProgress: Boolean, progress: Float, progressColor: Color, showIndicator: Boolean, onClick: (() -> Unit)? ) + FunctionNaming:SubscriptionAnimDialog.kt$@Composable fun SubscriptionAnimDialog(onDismiss: () -> Unit) + FunctionNaming:SubscriptionAnimDialog.kt$@Composable private fun ConfettiOverlay() + FunctionNaming:SummaryStatisticsScreen.kt$@Composable fun SummaryStatisticsScreen( viewModel: SummaryStatisticsViewModel, onSeeMoreClick: (SummaryStatisticsType) -> Unit ) + FunctionNaming:SummaryStatisticsScreen.kt$@Composable private fun HeaderSection() + FunctionNaming:SummaryStatisticsScreen.kt$@Composable private fun StatItemRow( item: AppConnection, type: SummaryStatisticsType ) + FunctionNaming:SummaryStatisticsScreen.kt$@Composable private fun StatSection( title: String, type: SummaryStatisticsType, pagingItems: LazyPagingItems<AppConnection>, onSeeMoreClick: (SummaryStatisticsType) -> Unit ) + FunctionNaming:SummaryStatisticsScreen.kt$@Composable private fun TimeCategorySelector( selectedCategory: TimeCategory, onCategorySelected: (TimeCategory) -> Unit ) + FunctionNaming:SummaryStatisticsScreen.kt$@Composable private fun UsageProgressHeader(dataUsage: DataUsageSummary) + FunctionNaming:TcpProxyMainScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun TcpProxyMainScreen( appConfig: AppConfig, mappingViewModel: ProxyAppsMappingViewModel, onBackClick: (() -> Unit)? = null ) + FunctionNaming:Theme.kt$@Composable fun RethinkTheme( themeMode: RethinkThemeMode = if (isSystemInDarkTheme()) RethinkThemeMode.DARK else RethinkThemeMode.LIGHT, // Dynamic color is available on Android 12+ dynamicColor: Boolean = true, content: @Composable () -> Unit ) + FunctionNaming:TunnelSettingsScreen.kt$@Composable private fun ConnectivityChecksDialog( persistentState: PersistentState, onDismiss: () -> Unit, onConfirm: (Boolean) -> Unit ) + FunctionNaming:TunnelSettingsScreen.kt$@Composable private fun DefaultDnsDialog( persistentState: PersistentState, onDismiss: () -> Unit, onConfirm: () -> Unit ) + FunctionNaming:TunnelSettingsScreen.kt$@Composable private fun IpProtocolDialog( persistentState: PersistentState, context: Context, onDismiss: () -> Unit, onConfirm: (Int) -> Unit ) + FunctionNaming:TunnelSettingsScreen.kt$@Composable private fun SettingActionRow( icon: ImageVector, title: String, description: String, enabled: Boolean = true, onClick: () -> Unit ) + FunctionNaming:TunnelSettingsScreen.kt$@Composable private fun SettingToggleRow( icon: ImageVector, title: String, description: String, checked: Boolean, enabled: Boolean, alpha: Float = 1f, onCheckedChange: (Boolean) -> Unit ) + FunctionNaming:TunnelSettingsScreen.kt$@Composable private fun VpnPolicyDialog( persistentState: PersistentState, context: Context, onDismiss: () -> Unit, onConfirm: (Int) -> Unit ) + FunctionNaming:TunnelSettingsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun TunnelSettingsScreen( persistentState: PersistentState, appConfig: AppConfig, eventLogger: EventLogger, onOpenVpnProfile: () -> Unit, onBackClick: (() -> Unit)? = null ) + FunctionNaming:UniversalFirewallSettingsScreen.kt$@Composable private fun SectionHeader(title: String, description: String) + FunctionNaming:UniversalFirewallSettingsScreen.kt$@Composable private fun StatsRow( stats: UniversalFirewallStatEntry?, loading: Boolean, onClick: () -> Unit ) + FunctionNaming:UniversalFirewallSettingsScreen.kt$@Composable private fun ToggleWithStats( iconRes: Int, label: String, checked: Boolean, onCheckedChange: (Boolean) -> Unit, stats: UniversalFirewallStatEntry?, loading: Boolean, onStatsClick: () -> Unit ) + FunctionNaming:UniversalFirewallSettingsScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun UniversalFirewallSettingsScreen( persistentState: PersistentState, eventLogger: EventLogger, connTrackerRepository: ConnectionTrackerRepository, onNavigateToLogs: (String) -> Unit, onOpenAccessibilitySettings: () -> Unit, onBackClick: (() -> Unit)? = null ) + FunctionNaming:Utilities.kt$Utilities$fun isAtleastO_MR1(): Boolean + FunctionNaming:WelcomeScreen.kt$@Composable fun WelcomeScreen(onFinish: () -> Unit) + FunctionNaming:WelcomeScreen.kt$@Composable private fun DotsIndicator(count: Int, currentIndex: Int) + FunctionNaming:WelcomeScreen.kt$@Composable private fun WelcomeSlideContent(slide: WelcomeSlide) + FunctionNaming:WgAddPeerDialog.kt$@Composable fun WgAddPeerDialog( configId: Int, wgPeer: Peer?, onDismiss: () -> Unit ) + FunctionNaming:WgConfigAdapter.kt$@Composable fun WgChip(text: String) + FunctionNaming:WgConfigAdapter.kt$@Composable fun WgConfigRow( config: WgConfigFiles, eventLogger: EventLogger, onDnsStatusChanged: () -> Unit, onConfigDetailClick: (Int, WgType) -> Unit ) + FunctionNaming:WgConfigDetailScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun WgConfigDetailScreen( configId: Int, wgType: WgType, persistentState: PersistentState, eventLogger: EventLogger, mappingViewModel: ProxyAppsMappingViewModel, onEditConfig: (Int, WgType) -> Unit, onBackClick: () -> Unit ) + FunctionNaming:WgConfigEditorScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun WgConfigEditorScreen( configId: Int, wgType: WgType, persistentState: PersistentState, onBackClick: () -> Unit, onSaveSuccess: () -> Unit ) + FunctionNaming:WgHopAdapter.kt$@Composable fun HopRow( context: Context, srcId: Int, config: Config, isActive: Boolean, selectedId: Int, onSelectedIdChange: (Int) -> Unit ) + FunctionNaming:WgHopAdapter.kt$@Composable private fun HopChip(text: String) + FunctionNaming:WgHopDialog.kt$@Composable fun WgHopDialog( srcId: Int, hopables: List<Config>, selectedId: Int, onDismiss: () -> Unit ) + FunctionNaming:WgIncludeAppsAdapter.kt$@Composable fun IncludeAppRow( mapping: ProxyApplicationMapping, proxyId: String, proxyName: String, onInterfaceUpdate: (ProxyApplicationMapping, Boolean) -> Unit ) + FunctionNaming:WgIncludeAppsAdapter.kt$@Composable fun IncludeDialogHost( state: IncludeDialogState?, onDismiss: () -> Unit, onConfirm: (ProxyApplicationMapping, Boolean) -> Unit ) + FunctionNaming:WgIncludeAppsDialog.kt$@Composable fun WgIncludeAppsDialog( viewModel: ProxyAppsMappingViewModel, proxyId: String, proxyName: String, onDismiss: () -> Unit ) + FunctionNaming:WgIncludeAppsDialog.kt$@Composable private fun WgIncludeAppsDialogScreen( viewModel: ProxyAppsMappingViewModel, proxyId: String, proxyName: String, onDismiss: () -> Unit ) + FunctionNaming:WgMainScreen.kt$@Composable private fun DisableConfigsDialog( onDismiss: () -> Unit, onConfirm: () -> Unit ) + FunctionNaming:WgMainScreen.kt$@Composable private fun EmptyState() + FunctionNaming:WgMainScreen.kt$@Composable private fun FabStack( modifier: Modifier, isExpanded: Boolean, onMainClick: () -> Unit, onCreateClick: () -> Unit, onImportClick: () -> Unit, onQrClick: () -> Unit ) + FunctionNaming:WgMainScreen.kt$@Composable private fun ToggleButton(text: String, selected: Boolean, onClick: () -> Unit) + FunctionNaming:WgMainScreen.kt$@Composable private fun ToggleRow( selectedTab: WgTab, onOneWgClick: () -> Unit, onGeneralClick: () -> Unit ) + FunctionNaming:WgMainScreen.kt$@Composable private fun WgConfigContent( selectedTab: WgTab, disclaimerText: String, wgConfigViewModel: WgConfigViewModel, eventLogger: EventLogger, onDnsStatusChanged: () -> Unit, onConfigDetailClick: (Int, WgType) -> Unit, onOneWgToggleClick: () -> Unit, onGeneralToggleClick: () -> Unit ) + FunctionNaming:WgMainScreen.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun WgMainScreen( wgConfigViewModel: WgConfigViewModel, persistentState: PersistentState, appConfig: AppConfig, eventLogger: EventLogger, onBackClick: () -> Unit, onCreateClick: () -> Unit, onImportClick: () -> Unit, onQrScanClick: () -> Unit, onConfigDetailClick: (Int, WgType) -> Unit ) + FunctionNaming:WgPeersAdapter.kt$@Composable fun WgPeerRow( context: Context, configId: Int, wgPeer: Peer, onPeerChanged: () -> Unit ) + FunctionNaming:WgPeersAdapter.kt$@Composable private fun LabelValue(label: String, value: String) + FunctionNaming:WgSsidDialog.kt$@Composable fun WgSsidDialog( currentSsids: String, onSave: (String) -> Unit, onDismiss: () -> Unit ) + FunctionNaming:WgSsidDialog.kt$@Composable private fun SsidDialogContent( currentSsids: String, onSave: (String) -> Unit, onDismiss: () -> Unit ) + FunctionNaming:WgSsidDialog.kt$@Composable private fun SsidRow(ssidItem: SsidItem, onDeleteClick: () -> Unit) + FunctionParameterNaming:BraveVPNService.kt$BraveVPNService$_new: ConnectionMonitor.UnderlyingNetworks? = null + ImplicitDefaultLocale:OkHttpDebugLogging.kt$OkHttpDebugLogging.<no name provided>$String.format("[%1\$tF %1\$tT] %2\$s %n", record.millis, record.message) + ImplicitDefaultLocale:UIUtils.kt$UIUtils$String.format("%.1f %s", value, units[unitIndex]) + ImplicitDefaultLocale:Utilities.kt$Utilities$String.format("%s (%s)", countryCode, ipAddress) + LongParameterList:AboutScreen.kt$( uiState: AboutUiState, onSponsorClick: () -> Unit, onTelegramClick: () -> Unit, onBugReportClick: () -> Unit, onWhatsNewClick: () -> Unit, onAppUpdateClick: () -> Unit, onContributorsClick: () -> Unit, onTranslateClick: () -> Unit, onWebsiteClick: () -> Unit, onGithubClick: () -> Unit, onFaqClick: () -> Unit, onDocsClick: () -> Unit, onPrivacyPolicyClick: () -> Unit, onTermsOfServiceClick: () -> Unit, onLicenseClick: () -> Unit, onTwitterClick: () -> Unit, onEmailClick: () -> Unit, onRedditClick: () -> Unit, onElementClick: () -> Unit, onMastodonClick: () -> Unit, onAppInfoClick: () -> Unit, onVpnProfileClick: () -> Unit, onNotificationClick: () -> Unit, onStatsClick: () -> Unit, onDbStatsClick: () -> Unit, onFlightRecordClick: () -> Unit, onEventLogsClick: () -> Unit, onTokenClick: () -> Unit, onTokenDoubleTap: () -> Unit, onFossClick: () -> Unit, onFlossFundsClick: () -> Unit ) + LongParameterList:AppListScreen.kt$( viewModel: AppInfoViewModel, eventLogger: EventLogger, queryText: String, filterLabelText: CharSequence, selectedFirewallFilter: FirewallFilter, isRefreshing: Boolean, bulkWifi: Boolean, bulkMobile: Boolean, bulkBypass: Boolean, bulkBypassDns: Boolean, bulkExclude: Boolean, bulkLockdown: Boolean, showBulkUpdateDialog: Boolean, bulkDialogTitle: String, bulkDialogMessage: String, bulkDialogType: BlockType?, showInfoDialog: Boolean, currentFilters: Filters?, onQueryChange: (String) -> Unit, onRefreshClick: () -> Unit, onFilterApply: (Filters) -> Unit, onFilterClear: (Filters) -> Unit, onFirewallFilterClick: (FirewallFilter) -> Unit, onBulkDialogConfirm: (BlockType) -> Unit, onBulkDialogDismiss: () -> Unit, onInfoDialogDismiss: () -> Unit, onShowInfoDialog: () -> Unit, onShowBulkDialog: (BlockType) -> Unit, onBypassDnsTooltip: () -> Unit, showBypassToolTip: Boolean, onBackClick: (() -> Unit)? = null ) + LongParameterList:ConfigureRethinkBasicScreen.kt$( modifier: Modifier = Modifier, context: Context, blocklistType: RethinkBlocklistManager.RethinkBlocklistType, filters: MutableLiveData<RethinkBlocklistState.Filters>, remoteFileTagViewModel: RethinkRemoteFileTagViewModel, localFileTagViewModel: RethinkLocalFileTagViewModel, remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, showDownload: Boolean, showConfigure: Boolean, isDownloading: Boolean, showRemoteProgress: Boolean, activeView: RethinkBlocklistState.BlocklistView, filterLabelText: String, showPlusFilterSheet: Boolean, plusFilterTags: List<FileTag>, onActiveViewChanged: (RethinkBlocklistState.BlocklistView) -> Unit, onFilterLabelTextChanged: (String) -> Unit, onShowPlusFilterSheetChanged: (Boolean) -> Unit, onPlusFilterTagsChanged: (List<FileTag>) -> Unit, onDownloadBlocklist: () -> Unit, onCancelDownload: () -> Unit, onApplyChanges: () -> Unit, onRevertChanges: () -> Unit, onRefreshBlocklistAvailability: () -> Unit, onProcessSelectedFileTags: (String) -> Unit, onModifiedStampChanged: (String) -> Unit, getStampValue: () -> String, onDownloadStart: () -> Unit, onDownloadFail: () -> Unit, onDownloadSuccess: () -> Unit ) + LongParameterList:ConfigureRethinkBasicScreen.kt$( modifier: Modifier = Modifier, context: Context, persistentState: PersistentState, appConfig: AppConfig, appDownloadManager: AppDownloadManager, rethinkEndpointViewModel: RethinkEndpointViewModel, uid: Int, isMax: Boolean, updateAvailable: Boolean, checkUpdateVisible: Boolean, redownloadVisible: Boolean, checkUpdateInProgress: Boolean, updateInProgress: Boolean, onMaxChanged: (Boolean) -> Unit, onUpdateMaxSwitchUi: () -> Unit, onRefreshUpdateUi: () -> Unit, onCheckUpdateInProgressChanged: (Boolean) -> Unit, onUpdateInProgressChanged: (Boolean) -> Unit, onCheckBlocklistUpdate: () -> Unit, onDownload: (Long, Boolean) -> Unit ) + LongParameterList:DnsDetailScreen.kt$( context: Context, headingText: String, enableLabel: String, enableColor: Color, versionText: String, canConfigure: Boolean, canCopy: Boolean, canSearch: Boolean, showCheckDownload: Boolean, showDownload: Boolean, showRedownload: Boolean, isChecking: Boolean, isDownloading: Boolean, isRedownloading: Boolean, persistentState: PersistentState, onDismiss: () -> Unit, onEnableBlocklist: () -> Unit, onConfigure: () -> Unit, onCopy: () -> Unit, onSearch: () -> Unit, onCheckUpdate: () -> Unit, onDownload: () -> Unit, onRedownload: () -> Unit, onDelete: () -> Unit ) + LongParameterList:DnsSettingsScreen.kt$( uiState: DnsSettingsUiState, onRefreshClick: () -> Unit, onSystemDnsClick: () -> Unit, onSystemDnsInfoClick: () -> Unit, onCustomDnsClick: () -> Unit, onRethinkPlusDnsClick: () -> Unit, onSmartDnsClick: () -> Unit, onSmartDnsInfoClick: () -> Unit, onLocalBlocklistClick: () -> Unit, onCustomDownloaderChange: (Boolean) -> Unit, onPeriodicUpdateChange: (Boolean) -> Unit, onDnsAlgChange: (Boolean) -> Unit, onSplitDnsChange: (Boolean) -> Unit, onBypassDnsBlockChange: (Boolean) -> Unit, onAllowedRecordTypesClick: () -> Unit, onFavIconChange: (Boolean) -> Unit, onDnsCacheChange: (Boolean) -> Unit, onProxyDnsChange: (Boolean) -> Unit, onUndelegatedDomainsChange: (Boolean) -> Unit, onFallbackChange: (Boolean) -> Unit, onPreventLeaksChange: (Boolean) -> Unit ) + LongParameterList:HomeNavigation.kt$( homeUiState: HomeScreenUiState, onHomeStartStopClick: () -> Unit, onHomeDnsClick: () -> Unit, onHomeFirewallClick: () -> Unit, onHomeProxyClick: () -> Unit, onHomeLogsClick: () -> Unit, onHomeAppsClick: () -> Unit, onHomeSponsorClick: () -> Unit, summaryViewModel: SummaryStatisticsViewModel, onOpenDetailedStats: (SummaryStatisticsType) -> Unit, startDestination: HomeRoute, isDebug: Boolean, onConfigureAppsClick: () -> Unit, onConfigureDnsClick: () -> Unit, onConfigureFirewallClick: () -> Unit, onFirewallUniversalClick: () -> Unit, onFirewallCustomIpClick: () -> Unit, onFirewallAppWiseIpClick: () -> Unit, onConfigureProxyClick: () -> Unit, onConfigureNetworkClick: () -> Unit, onConfigureOthersClick: () -> Unit, onConfigureLogsClick: () -> Unit, onConfigureAntiCensorshipClick: () -> Unit, onConfigureAdvancedClick: () -> Unit, aboutUiState: AboutUiState, onSponsorClick: () -> Unit, onTelegramClick: () -> Unit, onBugReportClick: () -> Unit, onWhatsNewClick: () -> Unit, onAppUpdateClick: () -> Unit, onContributorsClick: () -> Unit, onTranslateClick: () -> Unit, onWebsiteClick: () -> Unit, onGithubClick: () -> Unit, onFaqClick: () -> Unit, onDocsClick: () -> Unit, onPrivacyPolicyClick: () -> Unit, onTermsOfServiceClick: () -> Unit, onLicenseClick: () -> Unit, onTwitterClick: () -> Unit, onEmailClick: () -> Unit, onRedditClick: () -> Unit, onElementClick: () -> Unit, onMastodonClick: () -> Unit, onAppInfoClick: () -> Unit, onVpnProfileClick: () -> Unit, onNotificationClick: () -> Unit, onStatsClick: () -> Unit, onDbStatsClick: () -> Unit, onFlightRecordClick: () -> Unit, onEventLogsClick: () -> Unit, onTokenClick: () -> Unit, onTokenDoubleTap: () -> Unit, onFossClick: () -> Unit, onFlossFundsClick: () -> Unit, snackbarHostState: SnackbarHostState, detailedStatsViewModel: DetailedStatisticsViewModel, domainConnectionsViewModel: DomainConnectionsViewModel, eventsViewModel: EventsViewModel, eventDao: EventDao, appInfoEventLogger: EventLogger, appInfoIpRulesViewModel: CustomIpViewModel, appInfoDomainRulesViewModel: CustomDomainViewModel, appInfoNetworkLogsViewModel: AppConnectionsViewModel, persistentState: PersistentState, appConfig: AppConfig, onOpenVpnProfile: () -> Unit, onRefreshDatabase: (() -> Unit)? = null, consoleLogViewModel: ConsoleLogViewModel, consoleLogRepository: ConsoleLogRepository, onShareConsoleLogs: () -> Unit, onConsoleLogsDeleteComplete: () -> Unit, proxyAppsMappingViewModel: ProxyAppsMappingViewModel, dnsSettingsViewModel: DnsSettingsViewModel, appDownloadManager: AppDownloadManager, onDnsCustomDnsClick: () -> Unit, onDnsRethinkPlusDnsClick: () -> Unit, onDnsLocalBlocklistConfigureClick: () -> Unit, homeNavRequest: HomeNavRequest?, onHomeNavConsumed: () -> Unit, onAppLockResult: (AppLockResult) -> Unit = {}, // ConfigureRethinkBasic dependencies rethinkEndpointViewModel: RethinkEndpointViewModel, remoteFileTagViewModel: RethinkRemoteFileTagViewModel, localFileTagViewModel: RethinkLocalFileTagViewModel, remoteBlocklistPacksMapViewModel: RemoteBlocklistPacksMapViewModel, localBlocklistPacksMapViewModel: LocalBlocklistPacksMapViewModel, appInfoViewModel: AppInfoViewModel, refreshDatabase: RefreshDatabase, connectionTrackerViewModel: ConnectionTrackerViewModel, dnsLogViewModel: DnsLogViewModel, rethinkLogViewModel: RethinkLogViewModel, connectionTrackerRepository: ConnectionTrackerRepository, dnsLogRepository: DnsLogRepository, rethinkLogRepository: RethinkLogRepository, onConfigureOtherDns: (Int) -> Unit, // ConfigureOtherDns dependencies dohViewModel: DoHEndpointViewModel, dotViewModel: DoTEndpointViewModel, dnsProxyViewModel: DnsProxyEndpointViewModel, dnsCryptViewModel: DnsCryptEndpointViewModel, dnsCryptRelayViewModel: DnsCryptRelayEndpointViewModel, oDohViewModel: ODoHEndpointViewModel, // UniversalFirewallSettings callbacks onNavigateToLogs: (String) -> Unit, onOpenAccessibilitySettings: () -> Unit, // WireGuard dependencies wgConfigViewModel: WgConfigViewModel, // Checkout dependencies checkoutViewModel: CheckoutViewModel?, onNavigateToProxy: () -> Unit, // WgMain callbacks onWgCreateClick: () -> Unit, onWgImportClick: () -> Unit, onWgQrScanClick: () -> Unit ) + LoopWithTooManyJumpStatements:ErrorMessages.kt$ErrorMessages$while + LoopWithTooManyJumpStatements:IpRulesManager.kt$IpRulesManager$for + LoopWithTooManyJumpStatements:NetLogBatcher.kt$NetLogBatcher$for + LoopWithTooManyJumpStatements:TunnelImporter.kt$TunnelImporter$while + MatchingDeclarationName:AppWiseDomainLogsScreen.kt$AppWiseDomainLogsState + MatchingDeclarationName:CheckoutScreen.kt$CheckoutPlan + MatchingDeclarationName:ConfigureOtherDnsScreen.kt$DnsScreenType + MatchingDeclarationName:ConfigureRethinkBasicScreen.kt$ConfigureRethinkScreenType + MatchingDeclarationName:HomeScreen.kt$HomeScreenUiState + MatchingDeclarationName:NotificationActions.kt$NotificationActionType + MatchingDeclarationName:UniversalFirewallSettingsScreen.kt$UniversalFirewallStatEntry + MatchingDeclarationName:VPNControlReceiver.kt$VpnControlReceiver : BroadcastReceiverKoinComponent + MatchingDeclarationName:WgIncludeAppsAdapter.kt$IncludeDialogState + MemberNameEqualsClassName:DataModule.kt$DataModule$private val dataModule = module { single { AppConfig( androidContext(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get() ) } } + MemberNameEqualsClassName:DatabaseModule.kt$DatabaseModule$private val databaseModule = module { single { AppDatabase.buildDatabase(androidContext()) } single { LogDatabase.buildDatabase(androidContext()) } single { ConsoleLogDatabase.buildDatabase(androidContext()) } } + MemberNameEqualsClassName:ViewModelModule.kt$ViewModelModule$private val viewModelModule = module { viewModel { HomeScreenViewModel(get(), get()) } viewModel { DnsSettingsViewModel(get(), get()) } viewModel { AboutViewModel(get(), get(), get()) } viewModel { ConnectionTrackerViewModel(get()) } viewModel { DnsCryptEndpointViewModel(get()) } viewModel { DnsCryptRelayEndpointViewModel(get()) } viewModel { DnsLogViewModel(get()) } viewModel { DnsProxyEndpointViewModel(get()) } viewModel { DoHEndpointViewModel(get()) } viewModel { AppInfoViewModel(get()) } viewModel { CustomDomainViewModel(get()) } viewModel { CustomIpViewModel(get()) } viewModel { RethinkEndpointViewModel(get()) } viewModel { AppCustomIpViewModel(get()) } viewModel { RethinkRemoteFileTagViewModel(get()) } viewModel { RethinkLocalFileTagViewModel(get()) } viewModel { AppConnectionsViewModel(get(), get(), get()) } viewModel { SummaryStatisticsViewModel(get(), get()) } viewModel { DetailedStatisticsViewModel(get(), get()) } viewModel { LocalBlocklistPacksMapViewModel(get()) } viewModel { RemoteBlocklistPacksMapViewModel(get()) } viewModel { ProxyAppsMappingViewModel(get()) } viewModel { WgConfigViewModel(get()) } viewModel { CheckoutViewModel(androidApplication(), get()) } viewModel { DoTEndpointViewModel(get()) } viewModel { ODoHEndpointViewModel(get()) } viewModel { RethinkLogViewModel(get()) } viewModel { AlertsViewModel(get(), get()) } viewModel { ConsoleLogViewModel(get()) } viewModel { DomainConnectionsViewModel(get()) } viewModel { WgNwActivityViewModel(get()) } viewModel { EventsViewModel(get()) } } + NestedBlockDepth:AppDownloadManager.kt$AppDownloadManager$private fun cancelAndroidDownloadManagerDownloads() + NestedBlockDepth:BackupAgent.kt$BackupAgent$private fun backupWireGuardConfig(tempDir: File): Boolean + NestedBlockDepth:BraveVPNService.kt$BraveVPNService$private fun addRoute4(b: Builder): Builder + NestedBlockDepth:BraveVPNService.kt$BraveVPNService$private fun route4(nws: Networks): Boolean + NestedBlockDepth:BraveVPNService.kt$BraveVPNService$private fun route6(nws: Networks): Boolean + NestedBlockDepth:BubbleHelper.kt$BubbleHelper$@RequiresApi(Build.VERSION_CODES.Q) fun updateBubble( context: Context, blockedCount: Int, persistentState: PersistentState? = null ) + NestedBlockDepth:BugReportZipper.kt$BugReportZipper$@RequiresApi(Build.VERSION_CODES.O) fun rezipAll(dir: File, file: File) + NestedBlockDepth:BugReportZipper.kt$BugReportZipper$@RequiresApi(Build.VERSION_CODES.R) fun dumpAppExit(aei: ApplicationExitInfo, file: File) + NestedBlockDepth:ConnTrackerDialog.kt$private fun updateBlockedRulesChip( activity: FragmentActivity, info: ConnectionTracker, persistentState: PersistentState, onText: (String) -> Unit, onIcon: (Int) -> Unit, onNegative: (Boolean) -> Unit ) + NestedBlockDepth:ConnectionMonitor.kt$ConnectionMonitor$fun getNetworkSSID(network: Network?, cap: NetworkCapabilities?): String? + NestedBlockDepth:ConnectionMonitor.kt$ConnectionMonitor.NetworkRequestHandler$private suspend fun repopulateTrackedNetworks( opPrefs: OpPrefs, nwProps: LinkedHashSet<NetworkProperties> ) + NestedBlockDepth:DnsLogTracker.kt$DnsLogTracker$suspend fun makeDnsLogObj(transaction: Transaction): DnsLog + NestedBlockDepth:DownloadWatcher.kt$DownloadWatcher$private fun checkForDownload(context: Context, downloadIds: MutableList<Long>?): Int + NestedBlockDepth:EnhancedBugReport.kt$EnhancedBugReport$@RequiresApi(Build.VERSION_CODES.O) fun addLogsToZipFile(context: Context) + NestedBlockDepth:EnhancedBugReport.kt$EnhancedBugReport$private fun performRotation(context: Context) + NestedBlockDepth:HomeScreenActivity.kt$HomeScreenActivity$private fun collectAllBugReportFiles(): List<BugReportFile> + NestedBlockDepth:HomeScreenActivity.kt$HomeScreenActivity$private fun createCombinedZip(files: List<File>): Uri? + NestedBlockDepth:HomeScreenViewModel.kt$HomeScreenViewModel$private suspend fun updateUiWithProxyStates() + NestedBlockDepth:IpInfoDownloader.kt$IpInfoDownloader$private suspend fun performIpInfoDownload(ipToLookup: String): Boolean + NestedBlockDepth:IpRulesManager.kt$IpRulesManager$suspend fun load(): Long + NestedBlockDepth:LogExportWorker.kt$LogExportWorker$private fun exportLogsToCsvStream(filePath: String): Boolean + NestedBlockDepth:NetworkBindingService.kt$NetworkBindingService$private suspend fun bindAny( who: String, addrPort: String, fid: Long, networks: List<NetworkProperties> ): Boolean + NestedBlockDepth:RestoreAgent.kt$RestoreAgent$private fun isMetadataCompatible(tempDirectory: String?): Boolean + NestedBlockDepth:StateMachineFramework.kt$StateMachine$suspend fun processEvent(event: E, newData: D? = null) + NestedBlockDepth:Utilities.kt$Utilities$fun copyWithStream(readStream: InputStream, writeStream: OutputStream): Boolean + NestedBlockDepth:WgInterface.kt$WgInterface.Builder$@Throws(BadConfigException::class) fun parseDnsServers(dnsServers: CharSequence?): Builder + NewLineAtEndOfFile:RpnProxy.kt$com.celzero.bravedns.database.RpnProxy.kt + NewLineAtEndOfFile:RpnProxyManager.kt$com.celzero.bravedns.rpnproxy.RpnProxyManager.kt + NewLineAtEndOfFile:SubscriptionStatusRepository.kt$com.celzero.bravedns.database.SubscriptionStatusRepository.kt + NewLineAtEndOfFile:WgHopMap.kt$com.celzero.bravedns.database.WgHopMap.kt + SerialVersionUIDInSerializableClass:ConnTrackerMetaData.kt$ConnTrackerMetaData : Serializable + SerialVersionUIDInSerializableClass:ConnectionSummary.kt$ConnectionSummary : Serializable + SerialVersionUIDInSerializableClass:CustomIp.kt$CustomIp : Serializable + SerialVersionUIDInSerializableClass:FileTag.kt$FileTag : Serializable + SwallowedException:AboutViewModel.kt$AboutViewModel$e: Exception + SwallowedException:BackupHelper.kt$BackupHelper.Companion$e: Exception + SwallowedException:ConnectionMonitor.kt$ConnectionMonitor$e: Exception + SwallowedException:Converters.kt$Converters$e: IllegalArgumentException + SwallowedException:DomainRulesManager.kt$DomainRulesManager$e: Exception + SwallowedException:FavIconDownloader.kt$FavIconDownloader$e: Exception + SwallowedException:GoVpnAdapter.kt$GoVpnAdapter$e: Exception + SwallowedException:HomeScreenActivity.kt$HomeScreenActivity$e: ActivityNotFoundException + SwallowedException:HomeScreenActivity.kt$HomeScreenActivity$e: Exception + SwallowedException:HomeScreenActivity.kt$HomeScreenActivity$e: IllegalArgumentException + SwallowedException:IPTracker.kt$IPTracker$e: Exception + SwallowedException:InetAddresses.kt$InetAddresses$e: Exception + SwallowedException:InetEndpoint.kt$InetEndpoint$e: UnknownHostException + SwallowedException:LogDatabase.kt$LogDatabase.Companion$e: SQLiteException + SwallowedException:LogExportWorker.kt$LogExportWorker$e: Exception + SwallowedException:Logger.kt$Logger$e: Exception + SwallowedException:NetworkBindingService.kt$NetworkBindingService$e: Exception + SwallowedException:NonStoreAppUpdater.kt$NonStoreAppUpdater.<no name provided>$e: Exception + SwallowedException:Peer.kt$Peer.Builder$e: Exception + SwallowedException:RestoreAgent.kt$RestoreAgent$e: IOException + SwallowedException:SsidPermissionManager.kt$SsidPermissionManager$e: Exception + SwallowedException:TcpProxyHelper.kt$TcpProxyHelper$e: Exception + SwallowedException:Utilities.kt$Utilities$e: IllegalArgumentException + SwallowedException:Utilities.kt$Utilities$e: IllegalStateException + SwallowedException:Utilities.kt$Utilities$e: PackageManager.NameNotFoundException + ThrowingExceptionsWithoutMessageOrCause:AppConfig.kt$AppConfig$Exception() + ThrowingExceptionsWithoutMessageOrCause:NetLogTracker.kt$NetLogTracker$Exception() + ThrowsCount:Config.kt$Config.Companion$@Throws(IOException::class, BadConfigException::class) fun parse(reader: BufferedReader): Config + ThrowsCount:InetAddresses.kt$InetAddresses$@Throws(ParseException::class) fun parse(address: String): InetAddress + ThrowsCount:InetEndpoint.kt$InetEndpoint.Companion$@Throws(ParseException::class) fun parse(endpoint: String): InetEndpoint + TooGenericExceptionCaught:AboutViewModel.kt$AboutViewModel$e: Exception + TooGenericExceptionCaught:AllowedAppsBubbleViewModel.kt$AllowedAppsBubbleViewModel$e: Exception + TooGenericExceptionCaught:AppDatabase.kt$AppDatabase.Companion.<no name provided>$e: Exception + TooGenericExceptionCaught:AppDownloadManager.kt$AppDownloadManager$e: Exception + TooGenericExceptionCaught:BackupAgent.kt$BackupAgent$e: Exception + TooGenericExceptionCaught:BackupHelper.kt$BackupHelper.Companion$e: Exception + TooGenericExceptionCaught:BackupRestoreDialog.kt$e: Exception + TooGenericExceptionCaught:BlockedAppsBubbleViewModel.kt$BlockedAppsBubbleViewModel$e: Exception + TooGenericExceptionCaught:BlocklistDownloadHelper.kt$BlocklistDownloadHelper.Companion$e: Exception + TooGenericExceptionCaught:BlocklistDownloadHelper.kt$BlocklistDownloadHelper.Companion$ex: Exception + TooGenericExceptionCaught:BraveTileService.kt$BraveTileService$e: Exception + TooGenericExceptionCaught:BraveVPNService.kt$BraveVPNService$e: Exception + TooGenericExceptionCaught:BraveVPNService.kt$BraveVPNService$ex: Exception + TooGenericExceptionCaught:BraveVPNService.kt$BraveVPNService$iex: Exception + TooGenericExceptionCaught:BraveVPNService.kt$BraveVPNService.LanIp$e: Exception + TooGenericExceptionCaught:BubbleActivity.kt$BubbleActivity$e: Exception + TooGenericExceptionCaught:BubbleHelper.kt$BubbleHelper$e: Exception + TooGenericExceptionCaught:BugReportCollector.kt$BugReportCollector$e: Exception + TooGenericExceptionCaught:BugReportZipper.kt$BugReportZipper$e: Exception + TooGenericExceptionCaught:CheckoutViewModel.kt$CheckoutViewModel$e: Exception + TooGenericExceptionCaught:ConnectionMonitor.kt$ConnectionMonitor$e: Exception + TooGenericExceptionCaught:ConnectionTracer.kt$ConnectionTracer$ex: Exception + TooGenericExceptionCaught:ConnectivityCheckHelper.kt$ConnectivityCheckHelper$e: Exception + TooGenericExceptionCaught:ConsoleLogViewModel.kt$ConsoleLogViewModel$e: Exception + TooGenericExceptionCaught:CustomLanIpDialog.kt$e: Exception + TooGenericExceptionCaught:Daemons.kt$CoFactory$e: Exception + TooGenericExceptionCaught:DataUsageUpdater.kt$DataUsageUpdater$e: Exception + TooGenericExceptionCaught:DiagnosticsManager.kt$DiagnosticsManager$e: Exception + TooGenericExceptionCaught:DnsConfigurationManager.kt$DnsConfigurationManager$e: Exception + TooGenericExceptionCaught:DomainRulesManager.kt$DomainRulesManager$e: Exception + TooGenericExceptionCaught:DownloadWatcher.kt$DownloadWatcher$e: Exception + TooGenericExceptionCaught:EncryptedFileManager.kt$EncryptedFileManager$e: Exception + TooGenericExceptionCaught:EnhancedBugReport.kt$EnhancedBugReport$e: Exception + TooGenericExceptionCaught:EventLogger.kt$EventLogger$e: Exception + TooGenericExceptionCaught:FavIconDownloader.kt$FavIconDownloader$e: Exception + TooGenericExceptionCaught:FileHandleWorker.kt$FileHandleWorker$e: Exception + TooGenericExceptionCaught:FirewallManager.kt$FirewallManager$e: Exception + TooGenericExceptionCaught:FirewallRuleEvaluator.kt$FirewallRuleEvaluator$ex: Exception + TooGenericExceptionCaught:GlobalExceptionHandler.kt$GlobalExceptionHandler$e: Exception + TooGenericExceptionCaught:GoVpnAdapter.kt$GoVpnAdapter$e: Exception + TooGenericExceptionCaught:GoVpnAdapter.kt$GoVpnAdapter$ex: Exception + TooGenericExceptionCaught:HomeScreenActivity.kt$HomeScreenActivity$e: Exception + TooGenericExceptionCaught:HomeScreenActivity.kt$HomeScreenActivity$e: NullPointerException + TooGenericExceptionCaught:IPTracker.kt$IPTracker$e: Exception + TooGenericExceptionCaught:InetAddresses.kt$InetAddresses$e: Exception + TooGenericExceptionCaught:IpInfoDownloader.kt$IpInfoDownloader$e: Exception + TooGenericExceptionCaught:IpRulesManager.kt$IpRulesManager$e: Exception + TooGenericExceptionCaught:IpRulesManager.kt$IpRulesManager$e: NullPointerException + TooGenericExceptionCaught:LauncherSwitcher.kt$LauncherSwitcher$e: Exception + TooGenericExceptionCaught:LocalBlocklistCoordinator.kt$LocalBlocklistCoordinator$e: Exception + TooGenericExceptionCaught:LocalBlocklistCoordinator.kt$LocalBlocklistCoordinator$ex: Exception + TooGenericExceptionCaught:LogDatabase.kt$LogDatabase.Companion$ex: Exception + TooGenericExceptionCaught:LogDatabase.kt$LogDatabase.Companion.<no name provided>$e: Exception + TooGenericExceptionCaught:LogExportWorker.kt$LogExportWorker$e: Exception + TooGenericExceptionCaught:Logger.kt$Logger$e: Exception + TooGenericExceptionCaught:NetworkBindingService.kt$NetworkBindingService$e: Exception + TooGenericExceptionCaught:NetworkReachabilityDialog.kt$e: Exception + TooGenericExceptionCaught:NonStoreAppUpdater.kt$NonStoreAppUpdater.<no name provided>$e: Exception + TooGenericExceptionCaught:PaymentWorker.kt$PaymentWorker$e: Exception + TooGenericExceptionCaught:Peer.kt$Peer.Builder$e: Exception + TooGenericExceptionCaught:PingTestScreen.kt$e: Exception + TooGenericExceptionCaught:PipKeyManager.kt$PipKeyManager$e: Exception + TooGenericExceptionCaught:QrCodeFromFileScanner.kt$QrCodeFromFileScanner$e: Exception + TooGenericExceptionCaught:RefreshDatabase.kt$RefreshDatabase$e: RuntimeException + TooGenericExceptionCaught:RemoteBlocklistCoordinator.kt$RemoteBlocklistCoordinator$ex: Exception + TooGenericExceptionCaught:RestoreAgent.kt$RestoreAgent$e: Exception + TooGenericExceptionCaught:RestoreAgent.kt$RestoreAgent$ex: Exception + TooGenericExceptionCaught:RethinkBlocklistManager.kt$RethinkBlocklistManager$e: Exception + TooGenericExceptionCaught:RetrofitManager.kt$RetrofitManager.Companion$e: Exception + TooGenericExceptionCaught:SsidPermissionManager.kt$SsidPermissionManager$e: Exception + TooGenericExceptionCaught:StateMachineFramework.kt$StateMachine$e: Exception + TooGenericExceptionCaught:SubscriptionStatusRepository.kt$SubscriptionStatusRepository$e: Exception + TooGenericExceptionCaught:TcpProxyHelper.kt$TcpProxyHelper$e: Exception + TooGenericExceptionCaught:TempAllowExpiryWorker.kt$TempAllowExpiryWorker$e: Exception + TooGenericExceptionCaught:TunnelImporter.kt$TunnelImporter$e: Throwable + TooGenericExceptionCaught:UIUtils.kt$UIUtils$e: Exception + TooGenericExceptionCaught:UnderlyingNetworkManager.kt$UnderlyingNetworkManager$e: Exception + TooGenericExceptionCaught:Utilities.kt$Utilities$e: Exception + TooGenericExceptionCaught:VpnController.kt$VpnController$e: Exception + TooGenericExceptionCaught:VpnNotificationManager.kt$VpnNotificationManager$e: Exception + TooGenericExceptionCaught:WgAddPeerDialog.kt$e: Throwable + TooGenericExceptionCaught:WgConfigEditorScreen.kt$e: Throwable + TooGenericExceptionCaught:WgHopManager.kt$WgHopManager$e: Exception + TooGenericExceptionCaught:WgInterface.kt$WgInterface.Builder$e: Exception + TooGenericExceptionCaught:WgInterface.kt$WgInterface.Builder$e: NullPointerException + TooGenericExceptionCaught:WireguardManager.kt$WireguardManager$e: Exception + TooManyFunctions:AppConfig.kt$AppConfig + TooManyFunctions:AppConnectionsViewModel.kt$AppConnectionsViewModel : ViewModel + TooManyFunctions:AppDatabase.kt$AppDatabase : RoomDatabase + TooManyFunctions:AppDownloadManager.kt$AppDownloadManager + TooManyFunctions:AppInfoDAO.kt$AppInfoDAO + TooManyFunctions:AppInfoRepository.kt$AppInfoRepository + TooManyFunctions:AppInfoViewModel.kt$AppInfoViewModel : ViewModel + TooManyFunctions:BackupAgent.kt$BackupAgent : WorkerKoinComponent + TooManyFunctions:BackupRestoreDialog.kt$com.celzero.bravedns.ui.bottomsheet.BackupRestoreDialog.kt + TooManyFunctions:BlocklistDownloadHelper.kt$BlocklistDownloadHelper$Companion + TooManyFunctions:BraveVPNService.kt$BraveVPNService : VpnServiceNetworkListenerBridgeOnSharedPreferenceChangeListener + TooManyFunctions:BubbleHelper.kt$BubbleHelper + TooManyFunctions:BubbleScreen.kt$com.celzero.bravedns.ui.compose.bubble.BubbleScreen.kt + TooManyFunctions:BugReportZipper.kt$BugReportZipper + TooManyFunctions:ConfigureOtherDnsScreen.kt$com.celzero.bravedns.ui.compose.dns.ConfigureOtherDnsScreen.kt + TooManyFunctions:ConnTrackerDialog.kt$com.celzero.bravedns.ui.bottomsheet.ConnTrackerDialog.kt + TooManyFunctions:ConnectionMonitor.kt$ConnectionMonitor : KoinComponentDiagnosticsListener + TooManyFunctions:ConnectionMonitor.kt$ConnectionMonitor$NetworkRequestHandler + TooManyFunctions:ConnectionTrackerDAO.kt$ConnectionTrackerDAO + TooManyFunctions:ConnectionTrackerRepository.kt$ConnectionTrackerRepository : KoinComponent + TooManyFunctions:ConnectivityCheckHelper.kt$ConnectivityCheckHelper + TooManyFunctions:CustomDomainDAO.kt$CustomDomainDAO + TooManyFunctions:CustomDomainRepository.kt$CustomDomainRepository + TooManyFunctions:CustomIpDao.kt$CustomIpDao + TooManyFunctions:CustomIpRepository.kt$CustomIpRepository + TooManyFunctions:DesignComponents.kt$com.celzero.bravedns.ui.compose.theme.DesignComponents.kt + TooManyFunctions:DnsCryptEndpointDAO.kt$DnsCryptEndpointDAO + TooManyFunctions:DnsCryptRelayEndpointDAO.kt$DnsCryptRelayEndpointDAO + TooManyFunctions:DnsLogAdapter.kt$com.celzero.bravedns.adapter.DnsLogAdapter.kt + TooManyFunctions:DnsLogDAO.kt$DnsLogDAO + TooManyFunctions:DnsProxyEndpointDAO.kt$DnsProxyEndpointDAO + TooManyFunctions:DnsSettingsViewModel.kt$DnsSettingsViewModel : ViewModel + TooManyFunctions:DoHEndpointDAO.kt$DoHEndpointDAO + TooManyFunctions:DoTEndpointDAO.kt$DoTEndpointDAO + TooManyFunctions:DomainRulesManager.kt$DomainRulesManager : KoinComponent + TooManyFunctions:EventDao.kt$EventDao + TooManyFunctions:EventLogger.kt$EventLogger + TooManyFunctions:FirewallAppListAdapter.kt$com.celzero.bravedns.adapter.FirewallAppListAdapter.kt + TooManyFunctions:FirewallManager.kt$FirewallManager : KoinComponent + TooManyFunctions:FirewallRuleEvaluator.kt$FirewallRuleEvaluator + TooManyFunctions:GoVpnAdapter.kt$GoVpnAdapter : KoinComponent + TooManyFunctions:HomeScreenActivity.kt$HomeScreenActivity : AppCompatActivity + TooManyFunctions:HomeScreenViewModel.kt$HomeScreenViewModel : ViewModel + TooManyFunctions:IPUtil.kt$IPUtil$Companion + TooManyFunctions:IpRulesManager.kt$IpRulesManager : KoinComponent + TooManyFunctions:LocalBlocklistCoordinator.kt$LocalBlocklistCoordinator : CoroutineWorkerKoinComponent + TooManyFunctions:LogDatabase.kt$LogDatabase : RoomDatabase + TooManyFunctions:Logger.kt$Logger : KoinComponent + TooManyFunctions:NetworkBindingService.kt$NetworkBindingService + TooManyFunctions:ODoHEndpointDAO.kt$ODoHEndpointDAO + TooManyFunctions:OneWgConfigAdapter.kt$com.celzero.bravedns.adapter.OneWgConfigAdapter.kt + TooManyFunctions:OrbotHelper.kt$OrbotHelper + TooManyFunctions:Peer.kt$Peer + TooManyFunctions:Peer.kt$Peer$Builder + TooManyFunctions:PersistentState.kt$PersistentState : SimpleKrateKoinComponent + TooManyFunctions:PipKeyManager.kt$PipKeyManager : KoinComponent + TooManyFunctions:ProxyAppMappingRepository.kt$ProxyAppMappingRepository + TooManyFunctions:ProxyApplicationMappingDAO.kt$ProxyApplicationMappingDAO + TooManyFunctions:ProxyEndpointDAO.kt$ProxyEndpointDAO + TooManyFunctions:ProxyEndpointRepository.kt$ProxyEndpointRepository + TooManyFunctions:ProxyManager.kt$ProxyManager : KoinComponent + TooManyFunctions:RefreshDatabase.kt$RefreshDatabase + TooManyFunctions:RestoreAgent.kt$RestoreAgent : CoroutineWorkerKoinComponent + TooManyFunctions:RethinkBlocklistManager.kt$RethinkBlocklistManager : KoinComponent + TooManyFunctions:RethinkDnsEndpointDao.kt$RethinkDnsEndpointDao + TooManyFunctions:RethinkDnsEndpointRepository.kt$RethinkDnsEndpointRepository + TooManyFunctions:RethinkLocalFileTagDao.kt$RethinkLocalFileTagDao + TooManyFunctions:RethinkLocalFileTagRepository.kt$RethinkLocalFileTagRepository + TooManyFunctions:RethinkLogAdapter.kt$com.celzero.bravedns.adapter.RethinkLogAdapter.kt + TooManyFunctions:RethinkLogDao.kt$RethinkLogDao + TooManyFunctions:RethinkRemoteFileTagDao.kt$RethinkRemoteFileTagDao + TooManyFunctions:SsidPermissionManager.kt$SsidPermissionManager + TooManyFunctions:StateMachineFramework.kt$StateMachine<S : State, E : Event, D : Any> + TooManyFunctions:StatsSummaryDao.kt$StatsSummaryDao + TooManyFunctions:SubscriptionStatusDao.kt$SubscriptionStatusDao + TooManyFunctions:SubscriptionStatusRepository.kt$SubscriptionStatusRepository + TooManyFunctions:TcpProxyHelper.kt$TcpProxyHelper : KoinComponent + TooManyFunctions:UIUtils.kt$UIUtils + TooManyFunctions:VpnController.kt$VpnController : KoinComponent + TooManyFunctions:WgConfigAdapter.kt$com.celzero.bravedns.adapter.WgConfigAdapter.kt + TooManyFunctions:WgConfigFilesDAO.kt$WgConfigFilesDAO + TooManyFunctions:WgConfigFilesRepository.kt$WgConfigFilesRepository + TooManyFunctions:WgHopManager.kt$WgHopManager : KoinComponent + TooManyFunctions:WgInterface.kt$WgInterface + TooManyFunctions:WgInterface.kt$WgInterface$Builder + TooManyFunctions:WireguardManager.kt$WireguardManager : KoinComponent + UnusedParameter:AboutScreen.kt$onTokenDoubleTap: () -> Unit + UnusedParameter:AppDatabase.kt$AppDatabase.Companion$context: Context + UnusedParameter:AppInfoScreen.kt$prevConnStat: FirewallManager.ConnectionStatus + UnusedParameter:AppListScreen.kt$onBackClick: (() -> Unit)? = null + UnusedParameter:BackupRestoreDialog.kt$activity: FragmentActivity + UnusedParameter:ConfigureRethinkBasicScreen.kt$appDownloadManager: AppDownloadManager + UnusedParameter:ConfigureRethinkBasicScreen.kt$context: Context + UnusedParameter:ConfigureRethinkBasicScreen.kt$plusFilterTags: List<FileTag> + UnusedParameter:ConfigureRethinkBasicScreen.kt$showPlusFilterSheet: Boolean + UnusedParameter:ConnTrackerDialog.kt$persistentState: PersistentState + UnusedParameter:ConnectionTrackerAdapter.kt$context: Context + UnusedParameter:DnsDetailScreen.kt$context: Context + UnusedParameter:DnsDetailScreen.kt$onBackClick: (() -> Unit)? = null + UnusedParameter:DnsDetailScreen.kt$persistentState: PersistentState + UnusedParameter:DnsLogAdapter.kt$context: Context + UnusedParameter:FirewallRuleEvaluator.kt$FirewallRuleEvaluator$rinr: Boolean + UnusedParameter:FirewallRuleEvaluator.kt$FirewallRuleEvaluator$uid: Int + UnusedParameter:GoVpnAdapter.kt$GoVpnAdapter$option: Long + UnusedParameter:HomeScreen.kt$onSponsorClick: () -> Unit + UnusedParameter:HomeScreenActivity.kt$HomeScreenActivity$screenToLoad: Int + UnusedParameter:LocalAdvancedViewAdapter.kt$context: Context + UnusedParameter:NetworkLogsScreen.kt$eventLogger: EventLogger + UnusedParameter:NetworkLogsScreen.kt$rethinkLogRepository: RethinkLogRepository + UnusedParameter:NetworkLogsScreen.kt$rethinkLogViewModel: RethinkLogViewModel + UnusedParameter:ProxySettingsScreen.kt$eventLogger: EventLogger + UnusedParameter:ProxySettingsScreen.kt$persistentState: PersistentState + UnusedParameter:RemoteAdvancedViewAdapter.kt$context: Context + UnusedParameter:RethinkLocalFileTagRepository.kt$RethinkLocalFileTagRepository$id: Int + UnusedParameter:RethinkLogAdapter.kt$context: Context + UnusedParameter:SsidPermissionManager.kt$SsidPermissionManager$permissions: Array<out String> + UnusedParameter:TunnelSettingsScreen.kt$context: Context + UnusedParameter:VpnConnectionHandler.kt$VpnConnectionHandler$rethinkUid: Int + UnusedParameter:WgHopAdapter.kt$isActive: Boolean + UnusedParameter:WgHopAdapter.kt$selectedId: Int + UnusedParameter:WgInterface.kt$WgInterface.Builder$apps: CharSequence? + UnusedParameter:WgPeersAdapter.kt$context: Context + UnusedPrivateMember:AppWiseIpsAdapter.kt$private fun calculatePercentage(c: Double, maxValue: Int): Pair<Int, Int> + UnusedPrivateMember:ConnectivityCheckHelper.kt$ConnectivityCheckHelper$@Deprecated("Use checkTcpConnection instead", ReplaceWith("checkTcpConnection(nw, host, 53, \"53\")")) private suspend fun tcp53(nw: Network?, host: String): Boolean + UnusedPrivateMember:ConnectivityCheckHelper.kt$ConnectivityCheckHelper$@Deprecated("Use checkTcpConnection instead", ReplaceWith("checkTcpConnection(nw, host, 80, \"80\")")) private suspend fun tcp80(nw: Network?, host: String): Boolean + UnusedPrivateMember:ConnectivityCheckHelper.kt$ConnectivityCheckHelper$@Deprecated("Use closeQuietly instead", ReplaceWith("closeQuietly(closeable)")) private fun clos(closeable: Closeable?) + UnusedPrivateMember:HomeNavigation.kt$private fun detailedStatsRoute(typeId: Int, timeCategory: Int): String + UnusedPrivateMember:HomeNavigation.kt$private fun domainConnectionsRoute( type: DomainConnectionsInputType, flag: String, domain: String, asn: String, ip: String, isBlocked: Boolean, timeCategory: DomainConnectionsViewModel.TimeCategory ): String + UnusedPrivateMember:HomeScreenActivity.kt$HomeScreenActivity$private fun handleShowAppExitInfo() + UnusedPrivateMember:HomeScreenActivity.kt$HomeScreenActivity$private fun hasAnyLogsAvailable(): Boolean + UnusedPrivateMember:HomeScreenActivity.kt$HomeScreenActivity$private fun openCustomIpScreen() + UnusedPrivateMember:HomeScreenActivity.kt$HomeScreenActivity$private fun openUniversalFirewallScreen() + UnusedPrivateMember:HomeScreenActivity.kt$HomeScreenActivity$private fun showDatabaseDumpDialog(title: String, dump: String) + UnusedPrivateMember:HomeScreenActivity.kt$HomeScreenActivity$private fun startAppsActivity() + UnusedPrivateMember:HomeScreenActivity.kt$HomeScreenActivity$private fun startDnsActivity(screenToLoad: Int) + UnusedPrivateMember:HomeScreenActivity.kt$HomeScreenActivity$private fun startFirewallActivity(screenToLoad: Int) + UnusedPrivateProperty:AboutViewModel.kt$AboutViewModel$private var lastAppExitInfoDialogInvokeTime = INIT_TIME_MS + UnusedPrivateProperty:AlertsViewModel.kt$AlertsViewModel$private val connectionTrackerDao: ConnectionTrackerDAO + UnusedPrivateProperty:AlertsViewModel.kt$AlertsViewModel$private val dnsLogDao: DnsLogDAO + UnusedPrivateProperty:AppInfoScreen.kt$val lifecycleOwner = LocalLifecycleOwner.current + UnusedPrivateProperty:AppWiseDomainLogsScreen.kt$val context = LocalContext.current + UnusedPrivateProperty:AppWiseIpLogsScreen.kt$val lifecycleOwner = LocalLifecycleOwner.current + UnusedPrivateProperty:AppWiseIpsAdapter.kt$val context = LocalContext.current + UnusedPrivateProperty:BadConfigException.kt$BadConfigException.Location$name: String + UnusedPrivateProperty:BadConfigException.kt$BadConfigException.Section$name: String + UnusedPrivateProperty:BraveVPNService.kt$BraveVPNService$private var lastSubscriptionCheckTime: Long = 0 + UnusedPrivateProperty:BraveVPNService.kt$BraveVPNService.Companion$// subscription check interval in milliseconds 1 hour // TODO: increase it to 6 hours? private const val PLUS_CHECK_INTERVAL = 1 * 60 * 60 * 1000L + UnusedPrivateProperty:BraveVPNService.kt$BraveVPNService.Companion$// win last connected threshold in milliseconds private const val WIN_LAST_CONNECTED_THRESHOLD_MS = 60 * 60 * 1000L // 60 minutes + UnusedPrivateProperty:CheckoutViewModel.kt$CheckoutViewModel$private val persistentState: PersistentState + UnusedPrivateProperty:CheckoutViewModel.kt$CheckoutViewModel$val accountId = id.substring(0, 64) + UnusedPrivateProperty:ConnTrackerDialog.kt$val context = LocalContext.current + UnusedPrivateProperty:ConnectionTrackerRepository.kt$ConnectionTrackerRepository$private val persistentState by inject<PersistentState>() + UnusedPrivateProperty:ConsoleLogAdapter.kt$val context = LocalContext.current + UnusedPrivateProperty:CustomRulesScreen.kt$val context = LocalContext.current + UnusedPrivateProperty:DesignComponents.kt$// Extension for clickable modifier private val spacerDp = 1.dp // For internal use + UnusedPrivateProperty:DnsConfigurationManager.kt$DnsConfigurationManager$private val context: Context + UnusedPrivateProperty:DnsListScreen.kt$val context = LocalContext.current + UnusedPrivateProperty:DnsLogTracker.kt$DnsLogTracker.Companion$private const val START_RESPONSE = "START" + UnusedPrivateProperty:FavIconDownloader.kt$FavIconDownloader.Companion$private const val DEFAULT_DELAY = 15000L // 15 seconds + UnusedPrivateProperty:GoVpnAdapter.kt$GoVpnAdapter$val prev = Settings.dupTunFd(FIRESTACK_MUST_DUP_TUNFD) + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_ADVANCED_SETTINGS = "advancedSettings" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_ALERTS = "alerts" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_ANTI_CENSORSHIP = "antiCensorship" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_APP_INFO = "appInfo" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_APP_LIST = "appList" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_APP_LOCK = "appLock" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_APP_WISE_IP_LOGS = "appWiseIpLogs" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_CONFIGURE_RETHINK_BASIC = "configureRethinkBasic" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_CONSOLE_LOGS = "consoleLogs" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_CUSTOM_RULES = "customRules" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_DNS_DETAIL = "dnsDetail" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_DNS_LIST = "dnsList" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_EVENTS = "events" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_FIREWALL_SETTINGS = "firewallSettings" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_MISC_SETTINGS = "miscSettings" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_NETWORK_LOGS = "networkLogs" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_PING_TEST = "pingTest" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_PROXY_SETTINGS = "proxySettings" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_RPN_AVAILABILITY = "rpnAvailability" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_RPN_COUNTRIES = "rpnCountries" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_RPN_WIN_PROXY_DETAILS = "rpnWinProxyDetails" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_TCP_PROXY_MAIN = "tcpProxyMain" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_TUNNEL_SETTINGS = "tunnelSettings" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_WELCOME = "welcome" + UnusedPrivateProperty:HomeNavigation.kt$private const val ROUTE_WG_CONFIG_EDITOR = "wgConfigEditor" + UnusedPrivateProperty:HomeNavigation.kt$val context = LocalContext.current + UnusedPrivateProperty:NetworkBindingService.kt$NetworkBindingService$private val scope: CoroutineScope + UnusedPrivateProperty:NetworkBindingService.kt$NetworkBindingService$val rethinkUid = try { vpnService.packageManager.getApplicationInfo(vpnService.packageName, 0).uid } catch (e: Exception) { return false } + UnusedPrivateProperty:PersistentState.kt$PersistentState$// universal rule, block all non A & AAAA dns responses private var _blockOtherDnsRecordTypes by booleanPref("block_non_ip_dns_responses").withDefault<Boolean>(false) + UnusedPrivateProperty:PingTestScreen.kt$val context = LocalContext.current + UnusedPrivateProperty:PipKeyManager.kt$PipKeyManager$private const val ERR_UNSUPPORTED_DEVICE = "Rethink+ is not supported on this device" + UnusedPrivateProperty:PipKeyManager.kt$PipKeyManager$private const val ERR_UPDATE_REQUIRED = "Rethink+ requires an update to the app" + UnusedPrivateProperty:ProxyStateManager.kt$ProxyStateManager$private val scope: CoroutineScope + UnusedPrivateProperty:ProxyStateManager.kt$ProxyStateManager.Companion$private const val TAG = "ProxyState" + UnusedPrivateProperty:UnderlyingNetworkManager.kt$UnderlyingNetworkManager$private val scope: CoroutineScope + UnusedPrivateProperty:VpnConnectionHandler.kt$VpnConnectionHandler.Companion$private const val IPV4_DNS_ADDR = 44 + UnusedPrivateProperty:VpnConnectionHandler.kt$VpnConnectionHandler.Companion$private const val IPV6_DNS_ADDR = 44 + UtilityClassWithPublicConstructor:BackupHelper.kt$BackupHelper + UtilityClassWithPublicConstructor:Constants.kt$Constants + UtilityClassWithPublicConstructor:DownloadConstants.kt$DownloadConstants + UtilityClassWithPublicConstructor:KnownPorts.kt$KnownPorts + UtilityClassWithPublicConstructor:RetrofitManager.kt$RetrofitManager + VariableNaming:ConnectionTrackerRepository.kt$ConnectionTrackerRepository$private val BLOCKED_WINDOW_MS = 5 * 60 * 1000L // 5 minutes + + diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml new file mode 100644 index 000000000..f83bbd9e2 --- /dev/null +++ b/config/detekt/detekt.yml @@ -0,0 +1,56 @@ +build: + maxIssues: 0 + weights: + complexity: 2 + LongParameterList: 1 + comments: 0 + +config: + validation: true + warningsAsErrors: false + +complexity: + LongMethod: + active: false + LargeClass: + active: false + LongParameterList: + functionThreshold: 20 + constructorThreshold: 25 + +style: + MagicNumber: + active: false + MaxLineLength: + active: false + WildcardImport: + active: false + ReturnCount: + active: false + +exceptions: + SwallowedException: + active: true + PrintStackTrace: + active: true + TooGenericExceptionCaught: + active: true + exceptionNames: + - Error + - Exception + - Throwable + - RuntimeException + - NullPointerException + TooGenericExceptionThrown: + active: true + exceptionNames: + - Error + - Exception + - Throwable + - RuntimeException + +potential-bugs: + UnsafeCallOnNullableType: + active: true + CastNullableToNonNullableType: + active: true diff --git a/gradle.properties b/gradle.properties index c79979dce..0e92aa22b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8 --enable-native-access=ALL-UNNAMED # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 000000000..6c1139ec0 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,12 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73bcfb608d1fde9fb62e462f834a3299/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/846ee0d876d26a26f37aa1ce8de73224/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9482ddec596298c84656d31d16652665/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39701d92e1756bb2f141eb67cd4c660e/redirect +toolchainVersion=21 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..d811d8dfe --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,192 @@ +[versions] +activityCompose = "1.13.0" +# Plugins +agp = "9.2.1" +androidxTestCore = "1.7.0" +androidxTestExt = "1.3.0" +androidxTestRules = "1.7.0" +animation = "1.11.2" +appcompat = "1.7.1" +archCoreTesting = "2.2.0" +benManesVersions = "0.54.0" +betterypermissionhelper = "1.0.3" +biometric = "1.4.0-alpha07" +composeBom = "2026.05.01" +constraintlayout = "2.2.1" +# AndroidX +coreKtx = "1.19.0" +coroutines = "1.11.0" +crashlytics = "3.0.7" +desugarJdkLibs = "2.1.5" +detekt = "1.23.8" +espresso = "3.7.0" +fastscroll = "2.0.1" +# Firebase & Play Services +firebaseBom = "34.14.0" +foundation = "1.11.2" +fragment = "1.8.9" +glide = "5.0.7" +googleServices = "4.4.4" +gson = "2.14.0" +guava = "33.6.0-jre" +ipaddress = "5.6.2" +# Testing +junit = "4.13.2" +# DI & Utils +koin = "4.2.1" +konfetti = "2.1.0-beta01" +kotlin = "2.4.0" +kotlinxSerialization = "1.11.0" +krate = "2.0.0" +ksp = "2.3.9" +leakcanary = "3.0-alpha-8" +# Lifecycle & Coroutines +lifecycle = "2.10.0" +lifecycleRuntimeCompose = "2.10.0" +lint = "1.0.4" +# UI & Material +m3 = "1.5.0-alpha21" +materialkolor = "5.0.0-alpha07" +mockito = "5.23.0" +mockk = "1.14.11" +napier = "2.7.1" +# Navigation +navigation = "2.9.8" +# Network & Serialization +okhttp = "5.3.2" +okio = "3.17.0" +paging = "3.5.0" +playAppUpdate = "2.1.0" +preference = "1.2.1" +retrofit = "3.0.0" +robolectric = "4.16.1" +# Database & Paging +room = "2.8.4" +securityAppAuthenticator = "1.0.0" +securityCrypto = "1.1.0" +shimmer = "0.5.0" +swiperefreshlayout = "1.2.0" +versionCatalogUpdate = "1.1.0" +viewbindingpropertydelegate = "1.5.9" +viewpager2 = "1.1.0" +work = "2.11.2" +zxing = "4.3.0" + +[libraries] +android-security-lint = { module = "com.android.security.lint:lint", version.ref = "lint" } +# Compose +androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } +androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } +androidx-arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "archCoreTesting" } +androidx-biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" } +androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "animation" } +androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" } +androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "foundation" } +androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" } +androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" } +# AndroidX +androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } +androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragment" } +# Lifecycle +androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" } +androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycleRuntimeCompose" } +androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" } +androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "m3" } +androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" } +# Navigation +androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" } +androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" } +androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "paging" } +# Paging +androidx-paging-runtime-ktx = { module = "androidx.paging:paging-runtime-ktx", version.ref = "paging" } +androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preference" } +androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } +androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } +androidx-room-paging = { module = "androidx.room:room-paging", version.ref = "room" } +# Room +androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } +androidx-security-app-authenticator = { module = "androidx.security:security-app-authenticator", version.ref = "securityAppAuthenticator" } +androidx-security-crypto = { module = "androidx.security:security-crypto", version.ref = "securityCrypto" } +androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" } +androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" } +androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" } +androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidxTestExt" } +androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxTestRules" } +androidx-ui = { module = "androidx.compose.ui:ui" } +androidx-ui-graphics = { module = "androidx.compose.ui:ui-graphics" } +androidx-ui-text = { module = "androidx.compose.ui:ui-text" } +androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } +androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } +androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" } +androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work" } +betterypermissionhelper = { module = "com.waseemsabir:betterypermissionhelper", version.ref = "betterypermissionhelper" } +# Desugar +desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugarJdkLibs" } +# Firebase & Play +firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" } +firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" } +firebase-crashlytics-ndk = { module = "com.google.firebase:firebase-crashlytics-ndk" } +# Glide +glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" } +glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" } +glide-okhttp3-integration = { module = "com.github.bumptech.glide:okhttp3-integration", version.ref = "glide" } +# Google Material +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } +guava = { module = "com.google.guava:guava", version.ref = "guava" } +ipaddress = { module = "com.github.seancfoley:ipaddress", version.ref = "ipaddress" } +# Testing +junit = { module = "junit:junit", version.ref = "junit" } +koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } +# DI - Koin +koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } +koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" } +koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin" } +konfetti = { module = "nl.dionsegijn:konfetti-xml", version.ref = "konfetti" } +# Kotlin +kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } +kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } +kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } +kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" } +# Utils +krate = { module = "hu.autsoft:krate", version.ref = "krate" } +leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" } +materialkolor = { module = "com.materialkolor:material-kolor-android", version.ref = "materialkolor" } +mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } +mockk = { module = "io.mockk:mockk", version.ref = "mockk" } +mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" } +napier = { module = "io.github.aakira:napier", version.ref = "napier" } +# Network +okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } +okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp" } +okio-jvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" } +play-app-update = { module = "com.google.android.play:app-update", version.ref = "playAppUpdate" } +play-app-update-ktx = { module = "com.google.android.play:app-update-ktx", version.ref = "playAppUpdate" } +recyclerview-fastscroll = { module = "com.simplecityapps:recyclerview-fastscroll", version.ref = "fastscroll" } +retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } +retrofit-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } +robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } +# UI Libs +shimmer = { module = "com.facebook.shimmer:shimmer", version.ref = "shimmer" } +viewbindingpropertydelegate = { module = "com.github.kirich1409:viewbindingpropertydelegate", version.ref = "viewbindingpropertydelegate" } +viewbindingpropertydelegate-noreflection = { module = "com.github.kirich1409:viewbindingpropertydelegate-noreflection", version.ref = "viewbindingpropertydelegate" } +zxing-embedded = { module = "com.journeyapps:zxing-android-embedded", version.ref = "zxing" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +ben-manes-versions = { id = "com.github.ben-manes.versions", version.ref = "benManesVersions" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } +firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "crashlytics" } +google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "versionCatalogUpdate" } + +[bundles] +paging = [ + "androidx-paging-compose", + "androidx-paging-runtime-ktx", +] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c93368e56..d1ef516b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Apr 17 17:05:36 IST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..e48d8322d --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} + +rootProject.name = "Bravedns" +include(":app", ":tun2socks") diff --git a/tun2socks b/tun2socks new file mode 160000 index 000000000..327b8e52d --- /dev/null +++ b/tun2socks @@ -0,0 +1 @@ +Subproject commit 327b8e52d154e23ac0e2a51dca504622cc3000ac