diff options
221 files changed, 14479 insertions, 3137 deletions
@@ -14,4 +14,5 @@ build/ *.dex *.iml *.jks -keystore.properties +gradlew.bat +maint/ diff --git a/.gitmodules b/.gitmodules index 46c0abd5..e649c866 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "tunnel/tools/wireguard-tools"] path = tunnel/tools/wireguard-tools url = https://git.zx2c4.com/wireguard-tools +[submodule "tunnel/tools/elf-cleaner"] + path = tunnel/tools/elf-cleaner + url = https://github.com/termux/termux-elf-cleaner diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index f3049cf7..076a7f02 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -59,15 +59,13 @@ <JetCodeStyleSettings> <option name="PACKAGES_TO_USE_STAR_IMPORTS"> <value> - <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" /> + <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" /> </value> </option> <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="10" /> <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="10" /> + <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> </JetCodeStyleSettings> - <XML> - <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> - </XML> <codeStyleSettings language="JAVA"> <option name="METHOD_ANNOTATION_WRAP" value="0" /> <option name="FIELD_ANNOTATION_WRAP" value="0" /> @@ -468,5 +466,9 @@ </rules> </arrangement> </codeStyleSettings> + <codeStyleSettings language="kotlin"> + <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> + <option name="RIGHT_MARGIN" value="160" /> + </codeStyleSettings> </code_scheme> </component>
\ No newline at end of file diff --git a/.idea/copyright/Default.xml b/.idea/copyright/Default.xml index cb646393..db8533c5 100644 --- a/.idea/copyright/Default.xml +++ b/.idea/copyright/Default.xml @@ -1,6 +1,6 @@ <component name="CopyrightManager"> <copyright> - <option name="notice" value="Copyright © &#36;today.year WireGuard LLC. All Rights Reserved. SPDX-License-Identifier: Apache-2.0" /> + <option name="notice" value="Copyright © 2017-&#36;today.year WireGuard LLC. All Rights Reserved. SPDX-License-Identifier: Apache-2.0" /> <option name="myName" value="Default" /> </copyright> </component> @@ -16,18 +16,22 @@ macOS users may need [flock(1)](https://github.com/discoteq/flock). ## Embedding -The tunnel library is [on JCenter](https://bintray.com/wireguard/wireguard-android/wireguard-android/_latestVersion), alongside [extensive class library documentation](https://javadoc.io/doc/com.wireguard.android/tunnel). +The tunnel library is [on Maven Central](https://search.maven.org/artifact/com.wireguard.android/tunnel), alongside [extensive class library documentation](https://javadoc.io/doc/com.wireguard.android/tunnel). ``` implementation 'com.wireguard.android:tunnel:$wireguardTunnelVersion' ``` -The library makes use of Java 8 features, so be sure to support those in your gradle configuration: +The library makes use of Java 8 features, so be sure to support those in your gradle configuration with [desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring): ``` compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + coreLibraryDesugaringEnabled = true +} +dependencies { + coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.3" } ``` diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 87c86139..00000000 --- a/build.gradle +++ /dev/null @@ -1,59 +0,0 @@ - -allprojects { - repositories { - google() - jcenter() - } -} - -buildscript { - ext { - agpVersion = '3.6.2' - annotationsVersion = '1.1.0' - appcompatVersion = '1.1.0' - bintrayPluginVersion = '1.8.4' - biometricVersion = '1.0.1' - cardviewVersion = '1.0.0' - collectionVersion = '1.1.0' - constraintLayoutVersion = '1.1.3' - coordinatorLayoutVersion = '1.1.0' - coreKtxVersion = '1.2.0' - coroutinesVersion = '1.3.5' - eddsaVersion = '0.3.0' - fragmentVersion = '1.2.4' - jsr305Version = '3.0.2' - junitVersion = '4.13' - kotlinVersion = '1.3.71' - materialComponentsVersion = '1.2.0-alpha05' - mavenPluginVersion = '2.1' - preferenceVersion = '1.1.0' - streamsupportVersion = '1.7.2' - threetenabpVersion = '1.2.3' - zxingEmbeddedVersion = '3.6.0' - - groupName = 'com.wireguard.android' - } - dependencies { - classpath "com.android.tools.build:gradle:$agpVersion" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath "com.github.dcendents:android-maven-gradle-plugin:$mavenPluginVersion" - classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintrayPluginVersion" - } - repositories { - google() - jcenter() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} - -tasks { - wrapper { - gradleVersion = "6.2.2" - distributionType = Wrapper.DistributionType.ALL - } -} - -apply from: "version.gradle" diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..fbcca451 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.kapt) apply false +} + +tasks { + wrapper { + gradleVersion = "8.3" + distributionSha256Sum = "591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225" + } +} diff --git a/gradle.properties b/gradle.properties index 8375129e..efc1fe18 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,33 +1,73 @@ -# Project-wide Gradle settings. +wireguardVersionCode=510 +wireguardVersionName=1.0.20231018 +wireguardPackageName=com.wireguard.android -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. +# 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 +org.gradle.parallel=true +org.gradle.configureondemand=true +org.gradle.caching=true -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html +# Enable Kotlin incremental compilation +kotlin.incremental=true + +# Enable AndroidX support +android.useAndroidX=true # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -android.enableJetifier=true -android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m -# 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 -# org.gradle.parallel=true - -# R8 Full mode -android.enableR8.fullMode=true - -# https://jakewharton.com/increased-accuracy-of-aapt2-keep-rules/ -android.useMinimalKeepRules=true +# Turn off AP discovery in compile path to enable compile avoidance +kapt.include.compile.classpath=false -# Enable rudimentary R class namespacing where each library only contains +# Enable non-transitive R class namespacing where each library only contains # references to the resources it declares instead of declarations plus all # transitive dependency references. -android.namespacedRClass=true +android.nonTransitiveRClass=true + +# Experimental AGP flags +# Generate compile-time only R class for app modules. +android.enableAppCompileTimeRClass=true +# Keep AAPT2 daemons alive between incremental builds. +android.keepWorkerActionServicesBetweenBuilds=true +# Make R fields non-final to improve build speeds. +# http://tools.android.com/tips/non-constant-fields +android.nonFinalResIds=true +# Enable the newly refactored resource shrinker. +android.experimental.enableNewResourceShrinker=true +# Enable precise shrinking in the new resource shrinker. +android.experimental.enableNewResourceShrinker.preciseShrinking=true +# Generate manifest class as a .class directly rather than a Java source file. +android.generateManifestClass=true +# Generate the text map of source sets and absolute paths to allow +# generating relative paths from absolute paths later in the build. +android.experimental.enableSourceSetPathsMap=true +# Use relative paths for better Gradle caching of library build tasks +android.experimental.cacheCompileLibResources=true + +# Default Android build features +# Disable BuildConfig generation by default +android.defaults.buildfeatures.buildconfig=false +# Disable AIDL stub generation by default +android.defaults.buildfeatures.aidl=false +# Disable RenderScript compilation by default +android.defaults.buildfeatures.renderscript=false +# Disable resource values generation by default in libraries +android.defaults.buildfeatures.resvalues=false +# Disable shader compilation by default +android.defaults.buildfeatures.shaders=false +# Disable Android resource processing by default +android.library.defaults.buildfeatures.androidresources=false # Suppress warnings for some features that aren't yet stabilized -android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.useMinimalKeepRules,android.namespacedRClass,android.suppressUnsupportedOptionWarnings +android.suppressUnsupportedOptionWarnings=android.keepWorkerActionServicesBetweenBuilds,\ + android.experimental.enableNewResourceShrinker.preciseShrinking,\ + android.enableAppCompileTimeRClass,\ + android.suppressUnsupportedOptionWarnings + +# OSSRH sometimes struggles with slow deployments, so this makes Gradle +# more tolerant to those delays. +systemProp.org.gradle.internal.http.connectionTimeout=500000 +systemProp.org.gradle.internal.http.socketTimeout=500000 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..d8527046 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,29 @@ +[versions] +agp = "8.2.0-beta06" +kotlin = "1.9.0" + +[libraries] +androidx-activity-ktx = "androidx.activity:activity-ktx:1.8.0" +androidx-annotation = "androidx.annotation:annotation:1.7.0" +androidx-appcompat = "androidx.appcompat:appcompat:1.6.1" +androidx-biometric = "androidx.biometric:biometric:1.1.0" +androidx-collection = "androidx.collection:collection:1.3.0" +androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4" +androidx-coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0" +androidx-core-ktx = "androidx.core:core-ktx:1.12.0" +androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.0.0" +androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.6.1" +androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2" +androidx-preference-ktx = "androidx.preference:preference-ktx:1.2.1" +desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.0.3" +google-material = "com.google.android.material:material:1.10.0" +jsr305 = "com.google.code.findbugs:jsr305:3.0.2" +junit = "junit:junit:4.13.2" +kotlinx-coroutines-android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.0" +zxing-android-embedded = "com.journeyapps:zxing-android-embedded:4.3.0" + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 490fda85..7f93135c 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6623300b..864d6c47 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,78 +17,111 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,87 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 56e38aab..00000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -include ':tunnel' -include ':ui' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..91bc0b90 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,22 @@ +@file:Suppress("UnstableApiUsage") + +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "wireguard-android" + +include(":tunnel") +include(":ui") diff --git a/sync-crowdin.sh b/sync-crowdin.sh new file mode 100755 index 00000000..043e64f3 --- /dev/null +++ b/sync-crowdin.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -ex +curl -Lo - https://crowdin.com/backend/download/project/wireguard.zip | bsdtar -C ui/src/main/res -x -f - --strip-components 5 wireguard-android +find ui/src/main/res -name strings.xml -exec bash -c '[[ $(xmllint --xpath "count(//resources/*)" {}) -ne 0 ]] || rm -rf "$(dirname {})"' \; diff --git a/tunnel/build.gradle b/tunnel/build.gradle deleted file mode 100644 index fa9a3f5f..00000000 --- a/tunnel/build.gradle +++ /dev/null @@ -1,60 +0,0 @@ -apply plugin: 'com.android.library' - -version wireguardVersionName -group groupName - -android { - buildToolsVersion '29.0.3' - compileSdkVersion 29 - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 - versionCode wireguardVersionCode - versionName wireguardVersionName - } - externalNativeBuild { - cmake { - path 'tools/CMakeLists.txt' - } - } - libraryVariants.all { - it.generateBuildConfigProvider.configure { enabled = false } - } - testOptions.unitTests.all { - testLogging { - events 'passed', 'skipped', 'failed', 'standardOut', 'standardError' - } - } - buildTypes { - release { - externalNativeBuild { - cmake { - arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}" - } - } - } - debug { - externalNativeBuild { - cmake { - arguments "-DANDROID_PACKAGE_NAME=${groupName}.debug", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}" - } - } - } - } -} - -dependencies { - api "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion" - implementation "androidx.annotation:annotation:$annotationsVersion" - implementation "androidx.collection:collection:$collectionVersion" - implementation "com.google.code.findbugs:jsr305:$jsr305Version" - implementation "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion" - implementation "net.i2p.crypto:eddsa:$eddsaVersion" - testImplementation "junit:junit:$junitVersion" -} - -apply from: "publish.gradle" diff --git a/tunnel/build.gradle.kts b/tunnel/build.gradle.kts new file mode 100644 index 00000000..589d72da --- /dev/null +++ b/tunnel/build.gradle.kts @@ -0,0 +1,128 @@ +@file:Suppress("UnstableApiUsage") + +import org.gradle.api.tasks.testing.logging.TestLogEvent + +val pkg: String = providers.gradleProperty("wireguardPackageName").get() + +plugins { + alias(libs.plugins.android.library) + `maven-publish` + signing +} + +android { + compileSdk = 34 + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + namespace = "${pkg}.tunnel" + defaultConfig { + minSdk = 21 + } + externalNativeBuild { + cmake { + path("tools/CMakeLists.txt") + } + } + testOptions.unitTests.all { + it.testLogging { events(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED) } + } + buildTypes { + all { + externalNativeBuild { + cmake { + targets("libwg-go.so", "libwg.so", "libwg-quick.so") + arguments("-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}") + } + } + } + release { + externalNativeBuild { + cmake { + arguments("-DANDROID_PACKAGE_NAME=${pkg}") + } + } + } + debug { + externalNativeBuild { + cmake { + arguments("-DANDROID_PACKAGE_NAME=${pkg}.debug") + } + } + } + } + lint { + disable += "LongLogTag" + disable += "NewApi" + } + publishing { + singleVariant("release") { + withJavadocJar() + withSourcesJar() + } + } +} + +dependencies { + implementation(libs.androidx.annotation) + implementation(libs.androidx.collection) + compileOnly(libs.jsr305) + testImplementation(libs.junit) +} + +publishing { + publications { + register<MavenPublication>("release") { + groupId = pkg + artifactId = "tunnel" + version = providers.gradleProperty("wireguardVersionName").get() + afterEvaluate { + from(components["release"]) + } + pom { + name.set("WireGuard Tunnel Library") + description.set("Embeddable tunnel library for WireGuard for Android") + url.set("https://www.wireguard.com/") + + licenses { + license { + name.set("The Apache Software License, Version 2.0") + url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") + distribution.set("repo") + } + } + scm { + connection.set("scm:git:https://git.zx2c4.com/wireguard-android") + developerConnection.set("scm:git:https://git.zx2c4.com/wireguard-android") + url.set("https://git.zx2c4.com/wireguard-android") + } + developers { + organization { + name.set("WireGuard") + url.set("https://www.wireguard.com/") + } + developer { + name.set("WireGuard") + email.set("team@wireguard.com") + } + } + } + } + } + repositories { + maven { + name = "sonatype" + url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") + credentials { + username = providers.environmentVariable("SONATYPE_USER").orNull + password = providers.environmentVariable("SONATYPE_PASSWORD").orNull + } + } + } +} + +signing { + useGpgCmd() + sign(publishing.publications) +} diff --git a/tunnel/publish.gradle b/tunnel/publish.gradle deleted file mode 100644 index 63e7d0cf..00000000 --- a/tunnel/publish.gradle +++ /dev/null @@ -1,76 +0,0 @@ -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' - -install { - repositories.mavenInstaller { - pom.project { - name 'WireGuard Tunnel Library' - description 'Embeddable tunnel library for WireGuard for Android' - url 'https://www.wireguard.com/' - - packaging 'aar' - groupId groupName - artifactId 'tunnel' - version wireguardVersionName - - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - scm { - connection 'scm:git:https://git.zx2c4.com/wireguard-android' - url 'https://git.zx2c4.com/wireguard-android' - } - organization { - name 'WireGuard' - url 'https://www.wireguard.com/' - } - } - } -} - -bintray { - user = hasProperty('BINTRAY_USER') ? getProperty('BINTRAY_USER') : System.getenv('BINTRAY_USER') - key = hasProperty('BINTRAY_KEY') ? getProperty('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') - - configurations = [ 'archives' ] - - pkg { - repo = 'wireguard-android' - name = 'wireguard-android' - userOrg = 'wireguard' - licenses = [ 'Apache-2.0' ] - vcsUrl = 'https://git.zx2c4.com/wireguard-android' - publish = true - - version { - name = wireguardVersionName - } - } -} - -android.libraryVariants.all { variant -> - if (variant.name == 'release') { - task javadoc(type: Javadoc) { - source = variant.javaCompileProvider.get().source - classpath = files((android.bootClasspath.join(File.pathSeparator))) - classpath += variant.javaCompileProvider.get().classpath - title = 'Embeddable WireGuard Tunnel for Android v$wireguardVersionName' - } - task javadocJar(type: Jar, dependsOn: javadoc) { - archiveClassifier = 'javadoc' - from javadoc.destinationDir - } - task sourcesJar(type: Jar) { - archiveClassifier = 'sources' - from android.sourceSets.main.java.srcDirs - } - artifacts { - archives sourcesJar - archives javadocJar - } - } -} diff --git a/tunnel/src/main/AndroidManifest.xml b/tunnel/src/main/AndroidManifest.xml index ba9cc77c..99509a20 100644 --- a/tunnel/src/main/AndroidManifest.xml +++ b/tunnel/src/main/AndroidManifest.xml @@ -1,15 +1,15 @@ <!-- - ~ Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. ~ SPDX-License-Identifier: Apache-2.0 --> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.wireguard.android.tunnel"> +<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <application> <service android:name="com.wireguard.android.backend.GoBackend$VpnService" - android:permission="android.permission.BIND_VPN_SERVICE"> + android:permission="android.permission.BIND_VPN_SERVICE" + android:exported="false"> <intent-filter> <action android:name="android.net.VpnService" /> </intent-filter> diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Backend.java b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java index 4c18d98b..edf98b9e 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/Backend.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -30,6 +30,7 @@ public interface Backend { * * @param tunnel The tunnel to examine the state of. * @return The state of the tunnel. + * @throws Exception Exception raised when retrieving tunnel's state. */ Tunnel.State getState(Tunnel tunnel) throws Exception; @@ -39,6 +40,7 @@ public interface Backend { * * @param tunnel The tunnel to retrieve statistics for. * @return The statistics for the tunnel. + * @throws Exception Exception raised when retrieving statistics. */ Statistics getStatistics(Tunnel tunnel) throws Exception; @@ -46,7 +48,7 @@ public interface Backend { * Determine version of underlying backend. * * @return The version of the backend. - * @throws Exception + * @throws Exception Exception raised while retrieving version. */ String getVersion() throws Exception; @@ -59,6 +61,7 @@ public interface Backend { * {@code TOGGLE}. * @param config The configuration for this tunnel, may be null if state is {@code DOWN}. * @return The updated state of the tunnel. + * @throws Exception Exception raised while changing state. */ Tunnel.State setState(Tunnel tunnel, Tunnel.State state, @Nullable Config config) throws Exception; } diff --git a/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java b/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java index 5552b3ee..af966ec1 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -7,24 +7,47 @@ package com.wireguard.android.backend; import com.wireguard.util.NonNullForAll; +/** + * A subclass of {@link Exception} that encapsulates the reasons for a failure originating in + * implementations of {@link Backend}. + */ @NonNullForAll public final class BackendException extends Exception { private final Object[] format; private final Reason reason; + /** + * Public constructor for BackendException. + * + * @param reason The {@link Reason} which caused this exception to be thrown + * @param format Format string values used when converting exceptions to user-facing strings. + */ public BackendException(final Reason reason, final Object... format) { this.reason = reason; this.format = format; } + /** + * Get the format string values associated with the instance. + * + * @return Array of {@link Object} for string formatting purposes + */ public Object[] getFormat() { return format; } + /** + * Get the reason for this exception. + * + * @return Associated {@link Reason} for this exception. + */ public Reason getReason() { return reason; } + /** + * Enum class containing all known reasons for why a {@link BackendException} might be thrown. + */ public enum Reason { UNKNOWN_KERNEL_MODULE_NAME, WG_QUICK_CONFIG_ERROR_CODE, @@ -32,6 +55,7 @@ public final class BackendException extends Exception { VPN_NOT_AUTHORIZED, UNABLE_TO_START_VPN, TUN_CREATION_ERROR, - GO_ACTIVATION_ERROR_CODE + GO_ACTIVATION_ERROR_CODE, + DNS_RESOLUTION_FAILURE, } } diff --git a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java index c859323b..429cb1f1 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -9,12 +9,14 @@ import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.ParcelFileDescriptor; +import android.system.OsConstants; import android.util.Log; import com.wireguard.android.backend.BackendException.Reason; import com.wireguard.android.backend.Tunnel.State; import com.wireguard.android.util.SharedLibraryLoader; import com.wireguard.config.Config; +import com.wireguard.config.InetEndpoint; import com.wireguard.config.InetNetwork; import com.wireguard.config.Peer; import com.wireguard.crypto.Key; @@ -22,6 +24,7 @@ import com.wireguard.crypto.KeyFormatException; import com.wireguard.util.NonNullForAll; import java.net.InetAddress; +import java.time.Instant; import java.util.Collections; import java.util.Set; import java.util.concurrent.ExecutionException; @@ -33,8 +36,13 @@ import java.util.concurrent.TimeoutException; import androidx.annotation.Nullable; import androidx.collection.ArraySet; +/** + * Implementation of {@link Backend} that uses the wireguard-go userspace implementation to provide + * WireGuard tunnels. + */ @NonNullForAll public final class GoBackend implements Backend { + private static final int DNS_RESOLUTION_RETRIES = 10; private static final String TAG = "WireGuard/GoBackend"; @Nullable private static AlwaysOnCallback alwaysOnCallback; private static GhettoCompletableFuture<VpnService> vpnService = new GhettoCompletableFuture<>(); @@ -43,16 +51,27 @@ public final class GoBackend implements Backend { @Nullable private Tunnel currentTunnel; private int currentTunnelHandle = -1; + /** + * Public constructor for GoBackend. + * + * @param context An Android {@link Context} + */ public GoBackend(final Context context) { SharedLibraryLoader.loadSharedLibrary(context, "wg-go"); this.context = context; } + /** + * Set a {@link AlwaysOnCallback} to be invoked when {@link VpnService} is started by the + * system's Always-On VPN mode. + * + * @param cb Callback to be invoked + */ public static void setAlwaysOnCallback(final AlwaysOnCallback cb) { alwaysOnCallback = cb; } - private static native String wgGetConfig(int handle); + @Nullable private static native String wgGetConfig(int handle); private static native int wgGetSocketV4(int handle); @@ -64,6 +83,11 @@ public final class GoBackend implements Backend { private static native String wgVersion(); + /** + * Method to get the names of running tunnels. + * + * @return A set of string values denoting names of running tunnels. + */ @Override public Set<String> getRunningTunnelNames() { if (currentTunnel != null) { @@ -74,27 +98,42 @@ public final class GoBackend implements Backend { return Collections.emptySet(); } + /** + * Get the associated {@link State} for a given {@link Tunnel}. + * + * @param tunnel The tunnel to examine the state of. + * @return {@link State} associated with the given tunnel. + */ @Override public State getState(final Tunnel tunnel) { return currentTunnel == tunnel ? State.UP : State.DOWN; } + /** + * Get the associated {@link Statistics} for a given {@link Tunnel}. + * + * @param tunnel The tunnel to retrieve statistics for. + * @return {@link Statistics} associated with the given tunnel. + */ @Override public Statistics getStatistics(final Tunnel tunnel) { final Statistics stats = new Statistics(); - if (tunnel != currentTunnel) { + if (tunnel != currentTunnel || currentTunnelHandle == -1) return stats; - } final String config = wgGetConfig(currentTunnelHandle); + if (config == null) + return stats; Key key = null; long rx = 0; long tx = 0; + long latestHandshakeMSec = 0; for (final String line : config.split("\\n")) { if (line.startsWith("public_key=")) { if (key != null) - stats.add(key, rx, tx); + stats.add(key, rx, tx, latestHandshakeMSec); rx = 0; tx = 0; + latestHandshakeMSec = 0; try { key = Key.fromHex(line.substring(11)); } catch (final KeyFormatException ignored) { @@ -116,18 +155,49 @@ public final class GoBackend implements Backend { } catch (final NumberFormatException ignored) { tx = 0; } + } else if (line.startsWith("last_handshake_time_sec=")) { + if (key == null) + continue; + try { + latestHandshakeMSec += Long.parseLong(line.substring(24)) * 1000; + } catch (final NumberFormatException ignored) { + latestHandshakeMSec = 0; + } + } else if (line.startsWith("last_handshake_time_nsec=")) { + if (key == null) + continue; + try { + latestHandshakeMSec += Long.parseLong(line.substring(25)) / 1000000; + } catch (final NumberFormatException ignored) { + latestHandshakeMSec = 0; + } } } if (key != null) - stats.add(key, rx, tx); + stats.add(key, rx, tx, latestHandshakeMSec); return stats; } + /** + * Get the version of the underlying wireguard-go library. + * + * @return {@link String} value of the version of the wireguard-go library. + */ @Override public String getVersion() { return wgVersion(); } + /** + * Change the state of a given {@link Tunnel}, optionally applying a given {@link Config}. + * + * @param tunnel The tunnel to control the state of. + * @param state The new state for this tunnel. Must be {@code UP}, {@code DOWN}, or + * {@code TOGGLE}. + * @param config The configuration for this tunnel, may be null if state is {@code DOWN}. + * @return {@link State} of the tunnel after state changes are applied. + * @throws Exception Exception raised while changing tunnel state. + */ @Override public State setState(final Tunnel tunnel, State state, @Nullable final Config config) throws Exception { final State originalState = getState(tunnel); @@ -166,8 +236,10 @@ public final class GoBackend implements Backend { throw new BackendException(Reason.VPN_NOT_AUTHORIZED); final VpnService service; - if (!vpnService.isDone()) - startVpnService(); + if (!vpnService.isDone()) { + Log.d(TAG, "Requesting to start VpnService"); + context.startService(new Intent(context, VpnService.class)); + } try { service = vpnService.get(2, TimeUnit.SECONDS); @@ -183,6 +255,25 @@ public final class GoBackend implements Backend { return; } + + dnsRetry: for (int i = 0; i < DNS_RESOLUTION_RETRIES; ++i) { + // Pre-resolve IPs so they're cached when building the userspace string + for (final Peer peer : config.getPeers()) { + final InetEndpoint ep = peer.getEndpoint().orElse(null); + if (ep == null) + continue; + if (ep.getResolved().orElse(null) == null) { + if (i < DNS_RESOLUTION_RETRIES - 1) { + Log.w(TAG, "DNS host \"" + ep.getHost() + "\" failed to resolve; trying again"); + Thread.sleep(1000); + continue dnsRetry; + } else + throw new BackendException(Reason.DNS_RESOLUTION_FAILURE, ep.getHost()); + } + } + break; + } + // Build config final String goConfig = config.toWgUserspaceString(); @@ -202,9 +293,22 @@ public final class GoBackend implements Backend { for (final InetAddress addr : config.getInterface().getDnsServers()) builder.addDnsServer(addr.getHostAddress()); + for (final String dnsSearchDomain : config.getInterface().getDnsSearchDomains()) + builder.addSearchDomain(dnsSearchDomain); + + boolean sawDefaultRoute = false; for (final Peer peer : config.getPeers()) { - for (final InetNetwork addr : peer.getAllowedIps()) + for (final InetNetwork addr : peer.getAllowedIps()) { + if (addr.getMask() == 0) + sawDefaultRoute = true; builder.addRoute(addr.getAddress(), addr.getMask()); + } + } + + // "Kill-switch" semantics + if (!(sawDefaultRoute && config.getPeers().size() == 1)) { + builder.allowFamily(OsConstants.AF_INET); + builder.allowFamily(OsConstants.AF_INET6); } builder.setMtu(config.getInterface().getMtu().orElse(1280)); @@ -218,7 +322,7 @@ public final class GoBackend implements Backend { try (final ParcelFileDescriptor tun = builder.establish()) { if (tun == null) throw new BackendException(Reason.TUN_CREATION_ERROR); - Log.d(TAG, "Go backend v" + wgVersion()); + Log.d(TAG, "Go backend " + wgVersion()); currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), goConfig); } if (currentTunnelHandle < 0) @@ -234,21 +338,23 @@ public final class GoBackend implements Backend { Log.w(TAG, "Tunnel already down"); return; } - - wgTurnOff(currentTunnelHandle); + int handleToClose = currentTunnelHandle; currentTunnel = null; currentTunnelHandle = -1; currentConfig = null; + wgTurnOff(handleToClose); + try { + vpnService.get(0, TimeUnit.NANOSECONDS).stopSelf(); + } catch (final TimeoutException ignored) { } } tunnel.onStateChange(state); } - private void startVpnService() { - Log.d(TAG, "Requesting to start VpnService"); - context.startService(new Intent(context, VpnService.class)); - } - + /** + * Callback for {@link GoBackend} that is invoked when {@link VpnService} is started by the + * system's Always-On VPN mode. + */ public interface AlwaysOnCallback { void alwaysOnTriggered(); } @@ -282,6 +388,9 @@ public final class GoBackend implements Backend { } } + /** + * {@link android.net.VpnService} implementation for {@link GoBackend} + */ public static class VpnService extends android.net.VpnService { @Nullable private GoBackend owner; diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java index b4e01e76..08b84949 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java @@ -1,64 +1,101 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.backend; import android.os.SystemClock; -import android.util.Pair; import com.wireguard.crypto.Key; import com.wireguard.util.NonNullForAll; import java.util.HashMap; import java.util.Map; +import java.util.Objects; +import androidx.annotation.Nullable; + +/** + * Class representing transfer statistics for a {@link Tunnel} instance. + */ @NonNullForAll public class Statistics { - private final Map<Key, Pair<Long, Long>> peerBytes = new HashMap<>(); + public record PeerStats(long rxBytes, long txBytes, long latestHandshakeEpochMillis) { } + private final Map<Key, PeerStats> stats = new HashMap<>(); private long lastTouched = SystemClock.elapsedRealtime(); Statistics() { } - void add(final Key key, final long rx, final long tx) { - peerBytes.put(key, Pair.create(rx, tx)); + /** + * Add a peer and its current stats to the internal map. + * + * @param key A WireGuard public key bound to a particular peer + * @param rxBytes The received traffic for the {@link com.wireguard.config.Peer} referenced by + * the provided {@link Key}. This value is in bytes + * @param txBytes The transmitted traffic for the {@link com.wireguard.config.Peer} referenced by + * the provided {@link Key}. This value is in bytes. + * @param latestHandshake The timestamp of the latest handshake for the {@link com.wireguard.config.Peer} + * referenced by the provided {@link Key}. The value is in epoch milliseconds. + */ + void add(final Key key, final long rxBytes, final long txBytes, final long latestHandshake) { + stats.put(key, new PeerStats(rxBytes, txBytes, latestHandshake)); lastTouched = SystemClock.elapsedRealtime(); } + /** + * Check if the statistics are stale, indicating the need for the {@link Backend} to update them. + * + * @return boolean indicating if the current statistics instance has stale values. + */ public boolean isStale() { return SystemClock.elapsedRealtime() - lastTouched > 900; } - public long peerRx(final Key peer) { - if (!peerBytes.containsKey(peer)) - return 0; - return peerBytes.get(peer).first; - } - - public long peerTx(final Key peer) { - if (!peerBytes.containsKey(peer)) - return 0; - return peerBytes.get(peer).second; + /** + * Get the statistics for the {@link com.wireguard.config.Peer} referenced by the provided {@link Key} + * + * @param peer A {@link Key} representing a {@link com.wireguard.config.Peer}. + * @return a {@link PeerStats} representing various statistics about this peer. + */ + @Nullable + public PeerStats peer(final Key peer) { + return stats.get(peer); } + /** + * Get the list of peers being tracked by this instance. + * + * @return An array of {@link Key} instances representing WireGuard + * {@link com.wireguard.config.Peer}s + */ public Key[] peers() { - return peerBytes.keySet().toArray(new Key[0]); + return stats.keySet().toArray(new Key[0]); } + /** + * Get the total received traffic by all the peers being tracked by this instance + * + * @return a long representing the number of bytes received by the peers being tracked. + */ public long totalRx() { long rx = 0; - for (final Pair<Long, Long> val : peerBytes.values()) { - rx += val.first; + for (final PeerStats val : stats.values()) { + rx += val.rxBytes; } return rx; } + /** + * Get the total transmitted traffic by all the peers being tracked by this instance + * + * @return a long representing the number of bytes transmitted by the peers being tracked. + */ public long totalTx() { long tx = 0; - for (final Pair<Long, Long> val : peerBytes.values()) { - tx += val.second; + for (final PeerStats val : stats.values()) { + tx += val.txBytes; } return tx; } diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java index a9761929..766df443 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -36,11 +36,20 @@ public interface Tunnel { */ void onStateChange(State newState); + /** + * Enum class to represent all possible states of a {@link Tunnel}. + */ enum State { DOWN, TOGGLE, UP; + /** + * Get the state of a {@link Tunnel} + * + * @param running boolean indicating if the tunnel is running. + * @return State of the tunnel based on whether or not it is running. + */ public static State of(final boolean running) { return running ? UP : DOWN; } diff --git a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java index d4d1f152..023743a8 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -20,6 +20,7 @@ import com.wireguard.util.NonNullForAll; import java.io.File; import java.io.FileOutputStream; import java.nio.charset.StandardCharsets; +import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -32,11 +33,10 @@ import java.util.Objects; import java.util.Set; import androidx.annotation.Nullable; -import java9.util.stream.Collectors; -import java9.util.stream.Stream; /** - * WireGuard backend that uses {@code wg-quick} to implement tunnel configuration. + * Implementation of {@link Backend} that uses the kernel module and {@code wg-quick} to provide + * WireGuard tunnels. */ @NonNullForAll @@ -54,6 +54,10 @@ public final class WgQuickBackend implements Backend { this.toolsInstaller = toolsInstaller; } + public static boolean hasKernelSupport() { + return new File("/sys/module/wireguard").exists(); + } + @Override public Set<String> getRunningTunnelNames() { final List<String> output = new ArrayList<>(); @@ -67,7 +71,7 @@ public final class WgQuickBackend implements Backend { return Collections.emptySet(); } // wg puts all interface names on the same line. Split them into separate elements. - return Stream.of(output.get(0).split(" ")).collect(Collectors.toUnmodifiableSet()); + return Set.of(output.get(0).split(" ")); } @Override @@ -80,17 +84,17 @@ public final class WgQuickBackend implements Backend { final Statistics stats = new Statistics(); final Collection<String> output = new ArrayList<>(); try { - if (rootShell.run(output, String.format("wg show '%s' transfer", tunnel.getName())) != 0) + if (rootShell.run(output, String.format("wg show '%s' dump", tunnel.getName())) != 0) return stats; } catch (final Exception ignored) { return stats; } for (final String line : output) { final String[] parts = line.split("\\t"); - if (parts.length != 3) + if (parts.length != 8) continue; try { - stats.add(Key.fromBase64(parts[0]), Long.parseLong(parts[1]), Long.parseLong(parts[2])); + stats.add(Key.fromBase64(parts[0]), Long.parseLong(parts[5]), Long.parseLong(parts[6]), Long.parseLong(parts[4]) * 1000); } catch (final Exception ignored) { } } diff --git a/tunnel/src/main/java/com/wireguard/android/util/ModuleLoader.java b/tunnel/src/main/java/com/wireguard/android/util/ModuleLoader.java deleted file mode 100644 index 8f7749e1..00000000 --- a/tunnel/src/main/java/com/wireguard/android/util/ModuleLoader.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright © 2019-2020 WireGuard LLC. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - -package com.wireguard.android.util; - -import android.content.Context; -import android.system.OsConstants; -import android.util.Base64; - -import com.wireguard.android.util.RootShell.RootShellException; -import com.wireguard.util.NonNullForAll; - -import net.i2p.crypto.eddsa.EdDSAEngine; -import net.i2p.crypto.eddsa.EdDSAPublicKey; -import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable; -import net.i2p.crypto.eddsa.spec.EdDSAParameterSpec; -import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.security.InvalidParameterException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.Signature; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import androidx.annotation.Nullable; - -@NonNullForAll -@SuppressWarnings("MagicNumber") -public class ModuleLoader { - private static final String MODULE_LIST_URL = "https://download.wireguard.com/android-module/modules.txt.sig"; - private static final String MODULE_NAME = "wireguard-%s.ko"; - private static final String MODULE_PUBLIC_KEY_BASE64 = "RWRmHuT9PSqtwfsLtEx+QS06BJtLgFYteL9WCNjH7yuyu5Y1DieSN7If"; - private static final String MODULE_URL = "https://download.wireguard.com/android-module/%s"; - private final File moduleDir; - private final RootShell rootShell; - private final File tmpDir; - private final String userAgent; - - public ModuleLoader(final Context context, final RootShell rootShell, final String userAgent) { - moduleDir = new File(context.getCacheDir(), "kmod"); - tmpDir = new File(context.getCacheDir(), "tmp"); - this.rootShell = rootShell; - this.userAgent = userAgent; - } - - public static boolean isModuleLoaded() { - return new File("/sys/module/wireguard").exists(); - } - - public Integer download() throws IOException, RootShellException, NoSuchAlgorithmException { - final List<String> output = new ArrayList<>(); - rootShell.run(output, "sha256sum /proc/version|cut -d ' ' -f 1"); - if (output.size() != 1 || output.get(0).length() != 64) - throw new InvalidParameterException("Invalid sha256 of /proc/version"); - final String moduleName = String.format(MODULE_NAME, output.get(0)); - HttpURLConnection connection = (HttpURLConnection) new URL(MODULE_LIST_URL).openConnection(); - connection.setRequestProperty("User-Agent", userAgent); - connection.connect(); - if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) - throw new IOException("Hash list could not be found"); - final byte[] input = new byte[1024 * 1024 * 3 /* 3MiB */]; - int len; - try (final InputStream inputStream = connection.getInputStream()) { - len = inputStream.read(input); - } - if (len <= 0) - throw new IOException("Hash list was empty"); - final Map<String, Sha256Digest> modules = verifySignedHashes(new String(input, 0, len, StandardCharsets.UTF_8)); - if (modules == null) - throw new InvalidParameterException("The signature did not verify or invalid hash list format"); - if (!modules.containsKey(moduleName)) - return OsConstants.ENOENT; - connection = (HttpURLConnection) new URL(String.format(MODULE_URL, moduleName)).openConnection(); - connection.setRequestProperty("User-Agent", userAgent); - connection.connect(); - if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) - throw new IOException("Module file could not be found, despite being on hash list"); - - tmpDir.mkdirs(); - moduleDir.mkdir(); - File tempFile = null; - try { - tempFile = File.createTempFile("UNVERIFIED-", null, tmpDir); - final MessageDigest digest = MessageDigest.getInstance("SHA-256"); - try (final InputStream inputStream = connection.getInputStream(); - final FileOutputStream outputStream = new FileOutputStream(tempFile)) { - int total = 0; - while ((len = inputStream.read(input)) > 0) { - total += len; - if (total > 1024 * 1024 * 15 /* 15 MiB */) - throw new IOException("File too big"); - outputStream.write(input, 0, len); - digest.update(input, 0, len); - } - outputStream.getFD().sync(); - } - if (!Arrays.equals(digest.digest(), modules.get(moduleName).bytes)) - throw new IOException("Incorrect file hash"); - - if (!tempFile.renameTo(new File(moduleDir, moduleName))) - throw new IOException("Unable to rename to final destination"); - } finally { - if (tempFile != null) - tempFile.delete(); - } - return OsConstants.EXIT_SUCCESS; - } - - public void loadModule() throws IOException, RootShellException { - rootShell.run(null, String.format("insmod \"%s/wireguard-$(sha256sum /proc/version|cut -d ' ' -f 1).ko\"", moduleDir.getAbsolutePath())); - } - - public boolean moduleMightExist() { - return moduleDir.exists() && moduleDir.isDirectory(); - } - - @Nullable - private Map<String, Sha256Digest> verifySignedHashes(final String signifyDigest) { - final byte[] publicKeyBytes = Base64.decode(MODULE_PUBLIC_KEY_BASE64, Base64.DEFAULT); - - if (publicKeyBytes == null || publicKeyBytes.length != 32 + 10 || publicKeyBytes[0] != 'E' || publicKeyBytes[1] != 'd') - return null; - - final String[] lines = signifyDigest.split("\n", 3); - if (lines.length != 3) - return null; - if (!lines[0].startsWith("untrusted comment: ")) - return null; - - final byte[] signatureBytes = Base64.decode(lines[1], Base64.DEFAULT); - if (signatureBytes == null || signatureBytes.length != 64 + 10) - return null; - for (int i = 0; i < 10; ++i) { - if (signatureBytes[i] != publicKeyBytes[i]) - return null; - } - - try { - final EdDSAParameterSpec parameterSpec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.ED_25519); - final Signature signature = new EdDSAEngine(MessageDigest.getInstance(parameterSpec.getHashAlgorithm())); - final byte[] rawPublicKeyBytes = new byte[32]; - System.arraycopy(publicKeyBytes, 10, rawPublicKeyBytes, 0, 32); - signature.initVerify(new EdDSAPublicKey(new EdDSAPublicKeySpec(rawPublicKeyBytes, parameterSpec))); - signature.update(lines[2].getBytes(StandardCharsets.UTF_8)); - if (!signature.verify(signatureBytes, 10, 64)) - return null; - } catch (final Exception ignored) { - return null; - } - - final Map<String, Sha256Digest> hashes = new HashMap<>(); - for (final String line : lines[2].split("\n")) { - final String[] components = line.split(" {2}", 2); - if (components.length != 2) - return null; - try { - hashes.put(components[1], new Sha256Digest(components[0])); - } catch (final Exception ignored) { - return null; - } - } - return hashes; - } - - private static final class Sha256Digest { - private final byte[] bytes; - - private Sha256Digest(final String hex) { - if (hex.length() != 64) - throw new InvalidParameterException("SHA256 hashes must be 32 bytes long"); - bytes = new byte[32]; - for (int i = 0; i < 32; ++i) - bytes[i] = (byte) Integer.parseInt(hex.substring(i * 2, i * 2 + 2), 16); - } - } -} diff --git a/tunnel/src/main/java/com/wireguard/android/util/RootShell.java b/tunnel/src/main/java/com/wireguard/android/util/RootShell.java index 6fe89a83..67bff568 100644 --- a/tunnel/src/main/java/com/wireguard/android/util/RootShell.java +++ b/tunnel/src/main/java/com/wireguard/android/util/RootShell.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -43,8 +43,11 @@ public class RootShell { public RootShell(final Context context) { localBinaryDir = new File(context.getCodeCacheDir(), "bin"); localTemporaryDir = new File(context.getCacheDir(), "tmp"); - preamble = String.format("export CALLING_PACKAGE=%s PATH=\"%s:$PATH\" TMPDIR='%s'; id -u\n", - context.getPackageName(), localBinaryDir, localTemporaryDir); + final String packageName = context.getPackageName(); + if (packageName.contains("'")) + throw new RuntimeException("Impossibly invalid package name contains a single quote"); + preamble = String.format("export CALLING_PACKAGE='%s' PATH=\"%s:$PATH\" TMPDIR='%s'; magisk --sqlite \"UPDATE policies SET notification=0, logging=0 WHERE uid=%d\" >/dev/null 2>&1; id -u\n", + packageName, localBinaryDir, localTemporaryDir, android.os.Process.myUid()); } private static boolean isExecutableInPath(final String name) { diff --git a/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java b/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java index 6b2c6142..15a00467 100644 --- a/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java +++ b/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java b/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java index 81e9ebeb..65d23eab 100644 --- a/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java +++ b/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -143,12 +143,12 @@ public final class ToolsInstaller { extract(); final StringBuilder script = new StringBuilder("set -ex; "); - script.append("trap 'rm -rf /sbin/.magisk/img/wireguard' INT TERM EXIT; "); - script.append(String.format("rm -rf /sbin/.magisk/img/wireguard/; mkdir -p /sbin/.magisk/img/wireguard%s; ", INSTALL_DIR)); - script.append("printf 'name=WireGuard Command Line Tools\nversion=1.0\nversionCode=1\nauthor=zx2c4\ndescription=Command line tools for WireGuard\nminMagisk=1500\n' > /sbin/.magisk/img/wireguard/module.prop; "); - script.append("touch /sbin/.magisk/img/wireguard/auto_mount; "); + script.append("trap 'rm -rf /data/adb/modules/wireguard' INT TERM EXIT; "); + script.append(String.format("rm -rf /data/adb/modules/wireguard/; mkdir -p /data/adb/modules/wireguard%s; ", INSTALL_DIR)); + script.append("printf 'id=wireguard\nname=WireGuard Command Line Tools\nversion=1.0\nversionCode=1\nauthor=zx2c4\ndescription=Command line tools for WireGuard\nminMagisk=1500\n' > /data/adb/modules/wireguard/module.prop; "); + script.append("touch /data/adb/modules/wireguard/auto_mount; "); for (final String name : EXECUTABLES) { - final File destination = new File("/sbin/.magisk/img/wireguard" + INSTALL_DIR, name); + final File destination = new File("/data/adb/modules/wireguard" + INSTALL_DIR, name); script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; chcon 'u:object_r:system_file:s0' '%s' || true; ", new File(localBinaryDir, name), destination, destination, destination)); } @@ -191,7 +191,7 @@ public final class ToolsInstaller { synchronized (lock) { if (installAsMagiskModule == null) { try { - installAsMagiskModule = rootShell.run(null, "[ -d /sbin/.magisk/mirror -a -d /sbin/.magisk/img -a ! -f /cache/.disable_magisk ]") == OsConstants.EXIT_SUCCESS; + installAsMagiskModule = rootShell.run(null, "[ -d /data/adb/modules -a ! -f /cache/.disable_magisk ]") == OsConstants.EXIT_SUCCESS; } catch (final Exception ignored) { installAsMagiskModule = false; } diff --git a/tunnel/src/main/java/com/wireguard/config/Attribute.java b/tunnel/src/main/java/com/wireguard/config/Attribute.java index 659f7cf4..1b7bc368 100644 --- a/tunnel/src/main/java/com/wireguard/config/Attribute.java +++ b/tunnel/src/main/java/com/wireguard/config/Attribute.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -8,11 +8,10 @@ package com.wireguard.config; import com.wireguard.util.NonNullForAll; import java.util.Iterator; +import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java9.util.Optional; - @NonNullForAll public final class Attribute { private static final Pattern LINE_PATTERN = Pattern.compile("(\\w+)\\s*=\\s*([^\\s#][^#]*)"); diff --git a/tunnel/src/main/java/com/wireguard/config/BadConfigException.java b/tunnel/src/main/java/com/wireguard/config/BadConfigException.java index d1e3c627..db022e14 100644 --- a/tunnel/src/main/java/com/wireguard/config/BadConfigException.java +++ b/tunnel/src/main/java/com/wireguard/config/BadConfigException.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/main/java/com/wireguard/config/Config.java b/tunnel/src/main/java/com/wireguard/config/Config.java index a183a75a..ee9cebce 100644 --- a/tunnel/src/main/java/com/wireguard/config/Config.java +++ b/tunnel/src/main/java/com/wireguard/config/Config.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/main/java/com/wireguard/config/InetAddresses.java b/tunnel/src/main/java/com/wireguard/config/InetAddresses.java index 573c522d..e4d697c5 100644 --- a/tunnel/src/main/java/com/wireguard/config/InetAddresses.java +++ b/tunnel/src/main/java/com/wireguard/config/InetAddresses.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -23,6 +23,7 @@ import androidx.annotation.Nullable; public final class InetAddresses { @Nullable private static final Method PARSER_METHOD; private static final Pattern WONT_TOUCH_RESOLVER = Pattern.compile("^(((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?)|((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$"); + private static final Pattern VALID_HOSTNAME = Pattern.compile("^(?=.{1,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?(?:\\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?)*\\.?$"); static { Method m = null; @@ -39,6 +40,16 @@ public final class InetAddresses { } /** + * Determines whether input is a valid DNS hostname. + * + * @param maybeHostname a string that is possibly a DNS hostname + * @return whether or not maybeHostname is a valid DNS hostname + */ + public static boolean isHostname(final CharSequence maybeHostname) { + return VALID_HOSTNAME.matcher(maybeHostname).matches(); + } + + /** * Parses a numeric IPv4 or IPv6 address without performing any DNS lookups. * * @param address a string representing the IP address diff --git a/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java index 6eff4a1b..d1db432b 100644 --- a/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java +++ b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -7,18 +7,17 @@ package com.wireguard.config; import com.wireguard.util.NonNullForAll; -import org.threeten.bp.Duration; -import org.threeten.bp.Instant; - import java.net.Inet4Address; import java.net.InetAddress; import java.net.URI; import java.net.URISyntaxException; import java.net.UnknownHostException; +import java.time.Duration; +import java.time.Instant; +import java.util.Optional; import java.util.regex.Pattern; import androidx.annotation.Nullable; -import java9.util.Optional; /** diff --git a/tunnel/src/main/java/com/wireguard/config/InetNetwork.java b/tunnel/src/main/java/com/wireguard/config/InetNetwork.java index 7fd12577..4a918044 100644 --- a/tunnel/src/main/java/com/wireguard/config/InetNetwork.java +++ b/tunnel/src/main/java/com/wireguard/config/InetNetwork.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/main/java/com/wireguard/config/Interface.java b/tunnel/src/main/java/com/wireguard/config/Interface.java index c49357f7..bebca2e5 100644 --- a/tunnel/src/main/java/com/wireguard/config/Interface.java +++ b/tunnel/src/main/java/com/wireguard/config/Interface.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -20,13 +20,11 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Objects; +import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import androidx.annotation.Nullable; -import java9.util.Lists; -import java9.util.Optional; -import java9.util.stream.Collectors; -import java9.util.stream.StreamSupport; /** * Represents the configuration for a WireGuard interface (an [Interface] block). Interfaces must @@ -42,6 +40,7 @@ public final class Interface { private final Set<InetNetwork> addresses; private final Set<InetAddress> dnsServers; + private final Set<String> dnsSearchDomains; private final Set<String> excludedApplications; private final Set<String> includedApplications; private final KeyPair keyPair; @@ -52,6 +51,7 @@ public final class Interface { // Defensively copy to ensure immutability even if the Builder is reused. addresses = Collections.unmodifiableSet(new LinkedHashSet<>(builder.addresses)); dnsServers = Collections.unmodifiableSet(new LinkedHashSet<>(builder.dnsServers)); + dnsSearchDomains = Collections.unmodifiableSet(new LinkedHashSet<>(builder.dnsSearchDomains)); excludedApplications = Collections.unmodifiableSet(new LinkedHashSet<>(builder.excludedApplications)); includedApplications = Collections.unmodifiableSet(new LinkedHashSet<>(builder.includedApplications)); keyPair = Objects.requireNonNull(builder.keyPair, "Interfaces must have a private key"); @@ -110,6 +110,7 @@ public final class Interface { final Interface other = (Interface) obj; return addresses.equals(other.addresses) && dnsServers.equals(other.dnsServers) + && dnsSearchDomains.equals(other.dnsSearchDomains) && excludedApplications.equals(other.excludedApplications) && includedApplications.equals(other.includedApplications) && keyPair.equals(other.keyPair) @@ -138,6 +139,16 @@ public final class Interface { } /** + * Returns the set of DNS search domains associated with the interface. + * + * @return a set of strings + */ + public Set<String> getDnsSearchDomains() { + // The collection is already immutable. + return dnsSearchDomains; + } + + /** * Returns the set of applications excluded from using the interface. * * @return a set of package names @@ -223,9 +234,8 @@ public final class Interface { if (!addresses.isEmpty()) sb.append("Address = ").append(Attribute.join(addresses)).append('\n'); if (!dnsServers.isEmpty()) { - final List<String> dnsServerStrings = StreamSupport.stream(dnsServers) - .map(InetAddress::getHostAddress) - .collect(Collectors.toUnmodifiableList()); + final List<String> dnsServerStrings = dnsServers.stream().map(InetAddress::getHostAddress).collect(Collectors.toList()); + dnsServerStrings.addAll(dnsSearchDomains); sb.append("DNS = ").append(Attribute.join(dnsServerStrings)).append('\n'); } if (!excludedApplications.isEmpty()) @@ -258,6 +268,8 @@ public final class Interface { // Defaults to an empty set. private final Set<InetAddress> dnsServers = new LinkedHashSet<>(); // Defaults to an empty set. + private final Set<String> dnsSearchDomains = new LinkedHashSet<>(); + // Defaults to an empty set. private final Set<String> excludedApplications = new LinkedHashSet<>(); // Defaults to an empty set. private final Set<String> includedApplications = new LinkedHashSet<>(); @@ -288,6 +300,16 @@ public final class Interface { return this; } + public Builder addDnsSearchDomain(final String dnsSearchDomain) { + dnsSearchDomains.add(dnsSearchDomain); + return this; + } + + public Builder addDnsSearchDomains(final Collection<String> dnsSearchDomains) { + this.dnsSearchDomains.addAll(dnsSearchDomains); + return this; + } + public Interface build() throws BadConfigException { if (keyPair == null) throw new BadConfigException(Section.INTERFACE, Location.PRIVATE_KEY, @@ -330,8 +352,15 @@ public final class Interface { public Builder parseDnsServers(final CharSequence dnsServers) throws BadConfigException { try { - for (final String dnsServer : Attribute.split(dnsServers)) - addDnsServer(InetAddresses.parse(dnsServer)); + for (final String dnsServer : Attribute.split(dnsServers)) { + try { + addDnsServer(InetAddresses.parse(dnsServer)); + } catch (final ParseException e) { + if (e.getParsingClass() != InetAddress.class || !InetAddresses.isHostname(dnsServer)) + throw e; + addDnsSearchDomain(dnsServer); + } + } return this; } catch (final ParseException e) { throw new BadConfigException(Section.INTERFACE, Location.DNS, e); @@ -339,11 +368,11 @@ public final class Interface { } public Builder parseExcludedApplications(final CharSequence apps) { - return excludeApplications(Lists.of(Attribute.split(apps))); + return excludeApplications(List.of(Attribute.split(apps))); } public Builder parseIncludedApplications(final CharSequence apps) { - return includeApplications(Lists.of(Attribute.split(apps))); + return includeApplications(List.of(Attribute.split(apps))); } public Builder parseListenPort(final String listenPort) throws BadConfigException { diff --git a/tunnel/src/main/java/com/wireguard/config/ParseException.java b/tunnel/src/main/java/com/wireguard/config/ParseException.java index 289f1120..e72ef3d7 100644 --- a/tunnel/src/main/java/com/wireguard/config/ParseException.java +++ b/tunnel/src/main/java/com/wireguard/config/ParseException.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/main/java/com/wireguard/config/Peer.java b/tunnel/src/main/java/com/wireguard/config/Peer.java index 984dbe9c..8a0fd763 100644 --- a/tunnel/src/main/java/com/wireguard/config/Peer.java +++ b/tunnel/src/main/java/com/wireguard/config/Peer.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -17,10 +17,10 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.Locale; import java.util.Objects; +import java.util.Optional; import java.util.Set; import androidx.annotation.Nullable; -import java9.util.Optional; /** * Represents the configuration for a WireGuard peer (a [Peer] block). Peers must have a public key, diff --git a/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java b/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java index 10f51351..aa66d1ca 100644 --- a/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java +++ b/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java @@ -1,6 +1,6 @@ /* * Copyright © 2016 Southern Storm Software, Pty Ltd. - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -13,7 +13,7 @@ import java.util.Arrays; import androidx.annotation.Nullable; /** - * Implementation of the Curve25519 elliptic curve algorithm. + * Implementation of Curve25519 ECDH. * <p> * This implementation was imported to WireGuard from noise-java: * https://github.com/rweather/noise-java @@ -28,7 +28,7 @@ import androidx.annotation.Nullable; */ @SuppressWarnings({"MagicNumber", "NonConstantFieldWithUpperCaseName", "SuspiciousNameCombination"}) @NonNullForAll -final class Curve25519 { +public final class Curve25519 { // Numbers modulo 2^255 - 19 are broken up into ten 26-bit words. private static final int NUM_LIMBS_255BIT = 10; private static final int NUM_LIMBS_510BIT = 20; diff --git a/tunnel/src/main/java/com/wireguard/crypto/Key.java b/tunnel/src/main/java/com/wireguard/crypto/Key.java index c11688d5..5fa93a46 100644 --- a/tunnel/src/main/java/com/wireguard/crypto/Key.java +++ b/tunnel/src/main/java/com/wireguard/crypto/Key.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java b/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java index 8608fc36..c64b3dc8 100644 --- a/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java +++ b/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java b/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java index 22c21734..7a564689 100644 --- a/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java +++ b/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java b/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java index eb5b683f..1c395621 100644 --- a/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java +++ b/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java b/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java index 3743852d..a24e049e 100644 --- a/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java +++ b/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/test/java/com/wireguard/config/ConfigTest.java b/tunnel/src/test/java/com/wireguard/config/ConfigTest.java index 693a37ea..92143e72 100644 --- a/tunnel/src/test/java/com/wireguard/config/ConfigTest.java +++ b/tunnel/src/test/java/com/wireguard/config/ConfigTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ diff --git a/tunnel/src/test/resources/invalid-value.conf b/tunnel/src/test/resources/invalid-value.conf index 2889111e..6a1e3b62 100644 --- a/tunnel/src/test/resources/invalid-value.conf +++ b/tunnel/src/test/resources/invalid-value.conf @@ -1,6 +1,6 @@ [Interface] Address = 192.0.2.2/32,2001:db8:ffff:ffff:ffff:ffff:ffff:ffff/128 -DNS = 192.0.2.0,yes +DNS = 192.0.2.0,invalid_value PrivateKey = TFlmmEUC7V7VtiDYLKsbP5rySTKLIZq1yn8lMqK83wo= [Peer] AllowedIPs = 0.0.0.0/0, ::0/0 diff --git a/tunnel/tools/CMakeLists.txt b/tunnel/tools/CMakeLists.txt index 91b28534..490a1755 100644 --- a/tunnel/tools/CMakeLists.txt +++ b/tunnel/tools/CMakeLists.txt @@ -1,34 +1,44 @@ # SPDX-License-Identifier: Apache-2.0 # -# Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. +# Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. cmake_minimum_required(VERSION 3.4.1) +project("WireGuard") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") - -# Work around https://github.com/android-ndk/ndk/issues/602 -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold") +add_link_options(LINKER:--build-id=none) +add_compile_options(-Wall -Werror) add_executable(libwg-quick.so wireguard-tools/src/wg-quick/android.c ndk-compat/compat.c) -target_compile_options(libwg-quick.so PUBLIC -O3 -std=gnu11 -Wall -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DWG_PACKAGE_NAME=\"${ANDROID_PACKAGE_NAME}\") +target_compile_options(libwg-quick.so PUBLIC -std=gnu11 -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DWG_PACKAGE_NAME=\"${ANDROID_PACKAGE_NAME}\") target_link_libraries(libwg-quick.so -ldl) file(GLOB WG_SOURCES wireguard-tools/src/*.c ndk-compat/compat.c) add_executable(libwg.so ${WG_SOURCES}) -target_include_directories(libwg.so PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/wireguard-tools/src/uapi/" "${CMAKE_CURRENT_SOURCE_DIR}/wireguard-tools/src/") -target_compile_options(libwg.so PUBLIC -O3 -std=gnu11 -D_GNU_SOURCE -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DHAVE_VISIBILITY_HIDDEN -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\") +target_include_directories(libwg.so PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/wireguard-tools/src/uapi/linux/" "${CMAKE_CURRENT_SOURCE_DIR}/wireguard-tools/src/") +target_compile_options(libwg.so PUBLIC -std=gnu11 -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\") -add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go" VERBATIM COMMAND make +add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go" VERBATIM COMMAND "${ANDROID_HOST_PREBUILTS}/bin/make" ANDROID_ARCH_NAME=${ANDROID_ARCH_NAME} - ANDROID_C_COMPILER=${ANDROID_C_COMPILER} - ANDROID_TOOLCHAIN_ROOT=${ANDROID_TOOLCHAIN_ROOT} - ANDROID_LLVM_TRIPLE=${ANDROID_LLVM_TRIPLE} - ANDROID_SYSROOT=${ANDROID_SYSROOT} ANDROID_PACKAGE_NAME=${ANDROID_PACKAGE_NAME} GRADLE_USER_HOME=${GRADLE_USER_HOME} - CFLAGS=${CMAKE_C_FLAGS}\ -Wno-unused-command-line-argument - LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS}\ -fuse-ld=gold + CC=${CMAKE_C_COMPILER} + CFLAGS=${CMAKE_C_FLAGS} + LDFLAGS=${CMAKE_SHARED_LINKER_FLAGS} + SYSROOT=${CMAKE_SYSROOT} + TARGET=${CMAKE_C_COMPILER_TARGET} DESTDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} BUILDDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../generated-src ) -# Hack to make it actually build as part of the default target -add_dependencies(libwg.so libwg-go.so) + +# Strip unwanted ELF sections to prevent DT_FLAGS_1 warnings on old Android versions +file(GLOB ELF_CLEANER_SOURCES elf-cleaner/*.c elf-cleaner/*.cpp) +add_custom_target(elf-cleaner COMMENT "Building elf-cleaner" VERBATIM COMMAND cc + -O2 -DPACKAGE_NAME="elf-cleaner" -DPACKAGE_VERSION="" -DCOPYRIGHT="" + -o "${CMAKE_CURRENT_BINARY_DIR}/elf-cleaner" ${ELF_CLEANER_SOURCES} +) +add_custom_command(TARGET libwg.so POST_BUILD VERBATIM COMMAND "${CMAKE_CURRENT_BINARY_DIR}/elf-cleaner" + --api-level "${ANDROID_NATIVE_API_LEVEL}" "$<TARGET_FILE:libwg.so>") +add_dependencies(libwg.so elf-cleaner) +add_custom_command(TARGET libwg-quick.so POST_BUILD VERBATIM COMMAND "${CMAKE_CURRENT_BINARY_DIR}/elf-cleaner" + --api-level "${ANDROID_NATIVE_API_LEVEL}" "$<TARGET_FILE:libwg-quick.so>") +add_dependencies(libwg-quick.so elf-cleaner) diff --git a/tunnel/tools/elf-cleaner b/tunnel/tools/elf-cleaner new file mode 160000 +Subproject 7efc05090675ec6161b7def862728086a26c3b1 diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile index abb42884..427bfdc3 100644 --- a/tunnel/tools/libwg-go/Makefile +++ b/tunnel/tools/libwg-go/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 # -# Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. +# Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. BUILDDIR ?= $(CURDIR)/build DESTDIR ?= $(CURDIR)/out @@ -12,19 +12,20 @@ NDK_GO_ARCH_MAP_arm64 := arm64 NDK_GO_ARCH_MAP_mips := mipsx NDK_GO_ARCH_MAP_mips64 := mips64x -CLANG_FLAGS := --target=$(ANDROID_LLVM_TRIPLE) --gcc-toolchain=$(ANDROID_TOOLCHAIN_ROOT) --sysroot=$(ANDROID_SYSROOT) -export CGO_CFLAGS := $(CLANG_FLAGS) $(CFLAGS) -export CGO_LDFLAGS := $(CLANG_FLAGS) $(LDFLAGS) -Wl,-soname=libwg-go.so -export CC := $(ANDROID_C_COMPILER) +comma := , +CLANG_FLAGS := --target=$(TARGET) --sysroot=$(SYSROOT) +export CGO_CFLAGS := $(CLANG_FLAGS) $(subst -mthumb,-marm,$(CFLAGS)) +export CGO_LDFLAGS := $(CLANG_FLAGS) $(patsubst -Wl$(comma)--build-id=%,-Wl$(comma)--build-id=none,$(LDFLAGS)) -Wl,-soname=libwg-go.so export GOARCH := $(NDK_GO_ARCH_MAP_$(ANDROID_ARCH_NAME)) export GOOS := android export CGO_ENABLED := 1 -GO_VERSION := 1.14.1 +GO_VERSION := 1.21.3 GO_PLATFORM := $(shell uname -s | tr '[:upper:]' '[:lower:]')-$(NDK_GO_ARCH_MAP_$(shell uname -m)) GO_TARBALL := go$(GO_VERSION).$(GO_PLATFORM).tar.gz -GO_HASH_darwin-amd64 := 6632f9d53fd95632e431e8c34295349cca3f0a124e3a28b760ae5c42b32816e3 -GO_HASH_linux-amd64 := 2f49eb17ce8b48c680cdb166ffd7389702c0dec6effa090c324804a5cac8a7f8 +GO_HASH_darwin-amd64 := 27014fc69e301d7588a169ca239b3cc609f0aa1abf38528bf0d20d3b259211eb +GO_HASH_darwin-arm64 := 65302a7a9f7a4834932b3a7a14cb8be51beddda757b567a2f9e0cbd0d7b5a6ab +GO_HASH_linux-amd64 := 1241381b2843fae5a9707eec1f8fb2ef94d827990582c7c7c32f5bdfbfd420c8 default: $(DESTDIR)/libwg-go.so @@ -46,6 +47,6 @@ $(BUILDDIR)/go-$(GO_VERSION)/.prepared: $(GRADLE_USER_HOME)/caches/golang/$(GO_T $(DESTDIR)/libwg-go.so: export PATH := $(BUILDDIR)/go-$(GO_VERSION)/bin/:$(PATH) $(DESTDIR)/libwg-go.so: $(BUILDDIR)/go-$(GO_VERSION)/.prepared go.mod - go build -tags linux -ldflags="-X golang.zx2c4.com/wireguard/ipc.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -trimpath -o "$@" -buildmode c-shared + go build -tags linux -ldflags="-X golang.zx2c4.com/wireguard/ipc.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard -buildid=" -v -trimpath -buildvcs=false -o "$@" -buildmode c-shared .DELETE_ON_ERROR: diff --git a/tunnel/tools/libwg-go/api-android.go b/tunnel/tools/libwg-go/api-android.go index 7a393cae..d47c5d76 100644 --- a/tunnel/tools/libwg-go/api-android.go +++ b/tunnel/tools/libwg-go/api-android.go @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 * - * Copyright (C) 2017-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. + * Copyright © 2017-2022 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */ package main @@ -10,30 +10,39 @@ package main import "C" import ( - "bufio" - "golang.org/x/sys/unix" - "golang.zx2c4.com/wireguard/device" - "golang.zx2c4.com/wireguard/ipc" - "golang.zx2c4.com/wireguard/tun" - "bytes" - "log" + "fmt" "math" "net" "os" "os/signal" "runtime" + "runtime/debug" "strings" "unsafe" + + "golang.org/x/sys/unix" + "golang.zx2c4.com/wireguard/conn" + "golang.zx2c4.com/wireguard/device" + "golang.zx2c4.com/wireguard/ipc" + "golang.zx2c4.com/wireguard/tun" ) type AndroidLogger struct { - level C.int - interfaceName string + level C.int + tag *C.char } -func (l AndroidLogger) Write(p []byte) (int, error) { - C.__android_log_write(l.level, C.CString("WireGuard/GoBackend/"+l.interfaceName), C.CString(string(p))) - return len(p), nil +func cstring(s string) *C.char { + b, err := unix.BytePtrFromString(s) + if err != nil { + b := [1]C.char{} + return &b[0] + } + return (*C.char)(unsafe.Pointer(b)) +} + +func (l AndroidLogger) Printf(format string, args ...interface{}) { + C.__android_log_write(l.level, l.tag, cstring(fmt.Sprintf(format, args...))) } type TunnelHandle struct { @@ -44,7 +53,6 @@ type TunnelHandle struct { var tunnelHandles map[int32]TunnelHandle func init() { - device.RoamingDisabled = true tunnelHandles = make(map[int32]TunnelHandle) signals := make(chan os.Signal) signal.Notify(signals, unix.SIGUSR2) @@ -54,52 +62,52 @@ func init() { select { case <-signals: n := runtime.Stack(buf, true) + if n == len(buf) { + n-- + } buf[n] = 0 - C.__android_log_write(C.ANDROID_LOG_ERROR, C.CString("WireGuard/GoBackend/Stacktrace"), (*C.char)(unsafe.Pointer(&buf[0]))) + C.__android_log_write(C.ANDROID_LOG_ERROR, cstring("WireGuard/GoBackend/Stacktrace"), (*C.char)(unsafe.Pointer(&buf[0]))) } } }() } //export wgTurnOn -func wgTurnOn(ifnameRef string, tunFd int32, settings string) int32 { - interfaceName := string([]byte(ifnameRef)) - +func wgTurnOn(interfaceName string, tunFd int32, settings string) int32 { + tag := cstring("WireGuard/GoBackend/" + interfaceName) logger := &device.Logger{ - Debug: log.New(&AndroidLogger{level: C.ANDROID_LOG_DEBUG, interfaceName: interfaceName}, "", 0), - Info: log.New(&AndroidLogger{level: C.ANDROID_LOG_INFO, interfaceName: interfaceName}, "", 0), - Error: log.New(&AndroidLogger{level: C.ANDROID_LOG_ERROR, interfaceName: interfaceName}, "", 0), + Verbosef: AndroidLogger{level: C.ANDROID_LOG_DEBUG, tag: tag}.Printf, + Errorf: AndroidLogger{level: C.ANDROID_LOG_ERROR, tag: tag}.Printf, } - logger.Debug.Println("Debug log enabled") - tun, name, err := tun.CreateUnmonitoredTUNFromFD(int(tunFd)) if err != nil { unix.Close(int(tunFd)) - logger.Error.Println(err) + logger.Errorf("CreateUnmonitoredTUNFromFD: %v", err) return -1 } - logger.Info.Println("Attaching to interface", name) - device := device.NewDevice(tun, logger) + logger.Verbosef("Attaching to interface %v", name) + device := device.NewDevice(tun, conn.NewStdNetBind(), logger) - setError := device.IpcSetOperation(bufio.NewReader(strings.NewReader(settings))) - if setError != nil { + err = device.IpcSet(settings) + if err != nil { unix.Close(int(tunFd)) - logger.Error.Println(setError) + logger.Errorf("IpcSet: %v", err) return -1 } + device.DisableSomeRoamingForBrokenMobileSemantics() var uapi net.Listener uapiFile, err := ipc.UAPIOpen(name) if err != nil { - logger.Error.Println(err) + logger.Errorf("UAPIOpen: %v", err) } else { uapi, err = ipc.UAPIListen(name, uapiFile) if err != nil { uapiFile.Close() - logger.Error.Println(err) + logger.Errorf("UAPIListen: %v", err) } else { go func() { for { @@ -113,8 +121,14 @@ func wgTurnOn(ifnameRef string, tunFd int32, settings string) int32 { } } - device.Up() - logger.Info.Println("Device started") + err = device.Up() + if err != nil { + logger.Errorf("Unable to bring up device: %v", err) + uapiFile.Close() + device.Close() + return -1 + } + logger.Verbosef("Device started") var i int32 for i = 0; i < math.MaxInt32; i++ { @@ -123,7 +137,9 @@ func wgTurnOn(ifnameRef string, tunFd int32, settings string) int32 { } } if i == math.MaxInt32 { - unix.Close(int(tunFd)) + logger.Errorf("Unable to find empty handle") + uapiFile.Close() + device.Close() return -1 } tunnelHandles[i] = TunnelHandle{device: device, uapi: uapi} @@ -149,7 +165,11 @@ func wgGetSocketV4(tunnelHandle int32) int32 { if !ok { return -1 } - fd, err := handle.device.PeekLookAtSocketFd4() + bind, _ := handle.device.Bind().(conn.PeekLookAtSocketFd) + if bind == nil { + return -1 + } + fd, err := bind.PeekLookAtSocketFd4() if err != nil { return -1 } @@ -162,7 +182,11 @@ func wgGetSocketV6(tunnelHandle int32) int32 { if !ok { return -1 } - fd, err := handle.device.PeekLookAtSocketFd6() + bind, _ := handle.device.Bind().(conn.PeekLookAtSocketFd) + if bind == nil { + return -1 + } + fd, err := bind.PeekLookAtSocketFd6() if err != nil { return -1 } @@ -175,19 +199,29 @@ func wgGetConfig(tunnelHandle int32) *C.char { if !ok { return nil } - settings := new(bytes.Buffer) - writer := bufio.NewWriter(settings) - err := handle.device.IpcGetOperation(writer) + settings, err := handle.device.IpcGet() if err != nil { return nil } - writer.Flush() - return C.CString(settings.String()) + return C.CString(settings) } //export wgVersion func wgVersion() *C.char { - return C.CString(device.WireGuardGoVersion) + info, ok := debug.ReadBuildInfo() + if !ok { + return C.CString("unknown") + } + for _, dep := range info.Deps { + if dep.Path == "golang.zx2c4.com/wireguard" { + parts := strings.Split(dep.Version, "-") + if len(parts) == 3 && len(parts[2]) == 12 { + return C.CString(parts[2][:7]) + } + return C.CString(dep.Version) + } + } + return C.CString("unknown") } func main() {} diff --git a/tunnel/tools/libwg-go/go.mod b/tunnel/tools/libwg-go/go.mod index 7460da43..9f9381ff 100644 --- a/tunnel/tools/libwg-go/go.mod +++ b/tunnel/tools/libwg-go/go.mod @@ -1,10 +1,14 @@ module golang.zx2c4.com/wireguard/android -go 1.13 +go 1.20 require ( - golang.org/x/crypto v0.0.0-20200320181102-891825fb96df // indirect - golang.org/x/net v0.0.0-20200320220750-118fecf932d8 // indirect - golang.org/x/sys v0.0.0-20200321134203-328b4cd54aae - golang.zx2c4.com/wireguard v0.0.20200320 + golang.org/x/sys v0.13.0 + golang.zx2c4.com/wireguard v0.0.0-20231022001213-2e0774f246fb +) + +require ( + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect ) diff --git a/tunnel/tools/libwg-go/go.sum b/tunnel/tools/libwg-go/go.sum index ddebd50c..e5f8fc83 100644 --- a/tunnel/tools/libwg-go/go.sum +++ b/tunnel/tools/libwg-go/go.sum @@ -1,19 +1,13 @@ -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200320181102-891825fb96df h1:lDWgvUvNnaTnNBc/dwOty86cFeKoKWbwy2wQj0gIxbU= -golang.org/x/crypto v0.0.0-20200320181102-891825fb96df/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200320220750-118fecf932d8 h1:1+zQlQqEEhUeStBTi653GZAnAuivZq/2hz+Iz+OP7rg= -golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200321134203-328b4cd54aae h1:3tcmuaB7wwSZtelmiv479UjUB+vviwABz7a133ZwOKQ= -golang.org/x/sys v0.0.0-20200321134203-328b4cd54aae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.zx2c4.com/wireguard v0.0.20200320 h1:1vE6zVeO7fix9cJX1Z9ZQ+ikPIIx7vIyU0o0tLDD88g= -golang.zx2c4.com/wireguard v0.0.20200320/go.mod h1:lDian4Sw4poJ04SgHh35nzMVwGSYlPumkdnHcucAQoY= +github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= +golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg= +golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI= +golang.zx2c4.com/wireguard v0.0.0-20231022001213-2e0774f246fb h1:c5tyN8sSp8jSDxdCCDXVOpJwYXXhmTkNMt+g0zTSOic= +golang.zx2c4.com/wireguard v0.0.0-20231022001213-2e0774f246fb/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA= +gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 h1:TbRPT0HtzFP3Cno1zZo7yPzEEnfu8EjLfl6IU9VfqkQ= diff --git a/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff b/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff index f7918fbe..5d78242b 100644 --- a/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff +++ b/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff @@ -1,7 +1,8 @@ -From e44f456f1d0e429e08afed64a161175ff493f3ac Mon Sep 17 00:00:00 2001 +From 61f3ae8298d1c503cbc31539e0f3a73446c7db9d Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> -Date: Wed, 27 Feb 2019 05:05:44 +0100 -Subject: [PATCH] runtime: use CLOCK_BOOTTIME in nanotime on Linux +Date: Tue, 21 Mar 2023 15:33:56 +0100 +Subject: [PATCH] [release-branch.go1.20] runtime: use CLOCK_BOOTTIME in + nanotime on Linux This makes timers account for having expired while a computer was asleep, which is quite common on mobile devices. Note that BOOTTIME is @@ -21,17 +22,17 @@ Change-Id: I7b2a6ca0c5bc5fce57ec0eeafe7b68270b429321 src/runtime/sys_linux_amd64.s | 2 +- src/runtime/sys_linux_arm.s | 4 ++-- src/runtime/sys_linux_arm64.s | 4 ++-- - src/runtime/sys_linux_mips64x.s | 2 +- + src/runtime/sys_linux_mips64x.s | 4 ++-- src/runtime/sys_linux_mipsx.s | 2 +- src/runtime/sys_linux_ppc64x.s | 2 +- src/runtime/sys_linux_s390x.s | 2 +- - 8 files changed, 11 insertions(+), 11 deletions(-) + 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s -index 1b28098ad9..46b7071ed8 100644 +index 12a294153d..17e3524b40 100644 --- a/src/runtime/sys_linux_386.s +++ b/src/runtime/sys_linux_386.s -@@ -317,13 +317,13 @@ noswitch: +@@ -352,13 +352,13 @@ noswitch: LEAL 8(SP), BX // &ts (struct timespec) MOVL BX, 4(SP) @@ -48,20 +49,20 @@ index 1b28098ad9..46b7071ed8 100644 INVOKE_SYSCALL diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s -index 58d3bc54b4..4bb9bde3d0 100644 +index c7a89ba536..01f0a6a26e 100644 --- a/src/runtime/sys_linux_amd64.s +++ b/src/runtime/sys_linux_amd64.s -@@ -293,7 +293,7 @@ noswitch: - MOVQ runtime·vdsoClockgettimeSym(SB), AX - CMPQ AX, $0 - JEQ fallback +@@ -255,7 +255,7 @@ noswitch: + SUBQ $16, SP // Space for results + ANDQ $~15, SP // Align for C code + - MOVL $1, DI // CLOCK_MONOTONIC + MOVL $7, DI // CLOCK_BOOTTIME LEAQ 0(SP), SI - CALL AX - MOVQ 0(SP), AX // sec + MOVQ runtime·vdsoClockgettimeSym(SB), AX + CMPQ AX, $0 diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s -index e103da56dc..0b872b90a6 100644 +index 7b8c4f0e04..9798a1334e 100644 --- a/src/runtime/sys_linux_arm.s +++ b/src/runtime/sys_linux_arm.s @@ -11,7 +11,7 @@ @@ -73,20 +74,20 @@ index e103da56dc..0b872b90a6 100644 // for EABI, as we don't support OABI #define SYS_BASE 0x0 -@@ -345,7 +345,7 @@ noswitch: - SUB $24, R13 // Space for results - BIC $0x7, R13 // Align for C code +@@ -374,7 +374,7 @@ finish: + // func nanotime1() int64 + TEXT runtime·nanotime1(SB),NOSPLIT,$12-8 - MOVW $CLOCK_MONOTONIC, R0 + MOVW $CLOCK_BOOTTIME, R0 - MOVW $8(R13), R1 // timespec - MOVW runtime·vdsoClockgettimeSym(SB), R2 - CMP $0, R2 + MOVW $spec-12(SP), R1 // timespec + + MOVW runtime·vdsoClockgettimeSym(SB), R4 diff --git a/src/runtime/sys_linux_arm64.s b/src/runtime/sys_linux_arm64.s -index b9588cec30..e444d50df4 100644 +index 38ff6ac330..6b819c5441 100644 --- a/src/runtime/sys_linux_arm64.s +++ b/src/runtime/sys_linux_arm64.s -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ #define AT_FDCWD -100 #define CLOCK_REALTIME 0 @@ -95,7 +96,7 @@ index b9588cec30..e444d50df4 100644 #define SYS_exit 93 #define SYS_read 63 -@@ -297,7 +297,7 @@ noswitch: +@@ -338,7 +338,7 @@ noswitch: BIC $15, R1 MOVD R1, RSP @@ -105,10 +106,10 @@ index b9588cec30..e444d50df4 100644 CBZ R2, fallback diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s -index 723cfe43d9..edd7a195eb 100644 +index 47f2da524d..a8b387f193 100644 --- a/src/runtime/sys_linux_mips64x.s +++ b/src/runtime/sys_linux_mips64x.s -@@ -278,7 +278,7 @@ noswitch: +@@ -326,7 +326,7 @@ noswitch: AND $~15, R1 // Align for C code MOVV R1, R29 @@ -117,11 +118,20 @@ index 723cfe43d9..edd7a195eb 100644 MOVV $0(R29), R5 MOVV runtime·vdsoClockgettimeSym(SB), R25 +@@ -336,7 +336,7 @@ noswitch: + // see walltime for detail + BEQ R2, R0, finish + MOVV R0, runtime·vdsoClockgettimeSym(SB) +- MOVW $1, R4 // CLOCK_MONOTONIC ++ MOVW $7, R4 // CLOCK_BOOTTIME + MOVV $0(R29), R5 + JMP fallback + diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s -index 15893a7a28..f3edf9a83a 100644 +index 5e6b6c1504..7f5fd2a80e 100644 --- a/src/runtime/sys_linux_mipsx.s +++ b/src/runtime/sys_linux_mipsx.s -@@ -235,7 +235,7 @@ TEXT runtime·walltime1(SB),NOSPLIT,$8-12 +@@ -243,7 +243,7 @@ TEXT runtime·walltime(SB),NOSPLIT,$8-12 RET TEXT runtime·nanotime1(SB),NOSPLIT,$8-8 @@ -131,31 +141,31 @@ index 15893a7a28..f3edf9a83a 100644 MOVW $SYS_clock_gettime, R2 SYSCALL diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s -index 8629fe3233..2402e2623a 100644 +index d0427a4807..05ee9fede9 100644 --- a/src/runtime/sys_linux_ppc64x.s +++ b/src/runtime/sys_linux_ppc64x.s -@@ -233,7 +233,7 @@ fallback: - JMP finish +@@ -298,7 +298,7 @@ fallback: + JMP return - TEXT runtime·nanotime1(SB),NOSPLIT,$16 + TEXT runtime·nanotime1(SB),NOSPLIT,$16-8 - MOVD $1, R3 // CLOCK_MONOTONIC + MOVD $7, R3 // CLOCK_BOOTTIME MOVD R1, R15 // R15 is unchanged by C code MOVD g_m(g), R21 // R21 = m diff --git a/src/runtime/sys_linux_s390x.s b/src/runtime/sys_linux_s390x.s -index c15a1d5364..f52c4d5098 100644 +index 1448670b91..7d2ee3231c 100644 --- a/src/runtime/sys_linux_s390x.s +++ b/src/runtime/sys_linux_s390x.s -@@ -207,7 +207,7 @@ TEXT runtime·walltime1(SB),NOSPLIT,$16 +@@ -296,7 +296,7 @@ fallback: RET - TEXT runtime·nanotime1(SB),NOSPLIT,$16 -- MOVW $1, R2 // CLOCK_MONOTONIC -+ MOVW $7, R2 // CLOCK_BOOTTIME - MOVD $tp-16(SP), R3 - MOVW $SYS_clock_gettime, R1 - SYSCALL + TEXT runtime·nanotime1(SB),NOSPLIT,$32-8 +- MOVW $1, R2 // CLOCK_MONOTONIC ++ MOVW $7, R2 // CLOCK_BOOTTIME + + MOVD R15, R7 // Backup stack pointer + -- -2.25.1 +2.17.1 diff --git a/tunnel/tools/libwg-go/jni.c b/tunnel/tools/libwg-go/jni.c index 3f877d47..7ad94d35 100644 --- a/tunnel/tools/libwg-go/jni.c +++ b/tunnel/tools/libwg-go/jni.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 * - * Copyright © 2017-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. + * Copyright © 2017-2021 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */ #include <jni.h> diff --git a/tunnel/tools/ndk-compat/compat.c b/tunnel/tools/ndk-compat/compat.c index 7cc99fc4..c5ce85ec 100644 --- a/tunnel/tools/ndk-compat/compat.c +++ b/tunnel/tools/ndk-compat/compat.c @@ -1,64 +1,12 @@ /* SPDX-License-Identifier: BSD * - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * */ #define FILE_IS_EMPTY -#if defined(__ANDROID_API__) && __ANDROID_API__ < 18 -#undef FILE_IS_EMPTY -#include <stdio.h> -#include <stdlib.h> - -ssize_t getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) -{ - char *ptr, *eptr; - - if (*buf == NULL || *bufsiz == 0) { - *bufsiz = BUFSIZ; - if ((*buf = malloc(*bufsiz)) == NULL) - return -1; - } - - for (ptr = *buf, eptr = *buf + *bufsiz;;) { - int c = fgetc(fp); - if (c == -1) { - if (feof(fp)) { - ssize_t diff = (ssize_t)(ptr - *buf); - if (diff != 0) { - *ptr = '\0'; - return diff; - } - } - return -1; - } - *ptr++ = c; - if (c == delimiter) { - *ptr = '\0'; - return ptr - *buf; - } - if (ptr + 2 >= eptr) { - char *nbuf; - size_t nbufsiz = *bufsiz * 2; - ssize_t d = ptr - *buf; - if ((nbuf = realloc(*buf, nbufsiz)) == NULL) - return -1; - *buf = nbuf; - *bufsiz = nbufsiz; - eptr = nbuf + nbufsiz; - ptr = nbuf + d; - } - } -} - -ssize_t getline(char **buf, size_t *bufsiz, FILE *fp) -{ - return getdelim(buf, bufsiz, '\n', fp); -} -#endif - -#if defined(__ANDROID_API__) && __ANDROID_API__ < 24 +#if defined(__ANDROID_MIN_SDK_VERSION__) && __ANDROID_MIN_SDK_VERSION__ < 24 #undef FILE_IS_EMPTY #include <string.h> diff --git a/tunnel/tools/ndk-compat/compat.h b/tunnel/tools/ndk-compat/compat.h index 52f6c127..7dfd8e14 100644 --- a/tunnel/tools/ndk-compat/compat.h +++ b/tunnel/tools/ndk-compat/compat.h @@ -1,16 +1,10 @@ /* SPDX-License-Identifier: BSD * - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * */ -#if defined(__ANDROID_API__) && __ANDROID_API__ < 18 -#include <stdio.h> -ssize_t getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp); -ssize_t getline(char **buf, size_t *bufsiz, FILE *fp); -#endif - -#if defined(__ANDROID_API__) && __ANDROID_API__ < 24 +#if defined(__ANDROID_MIN_SDK_VERSION__) && __ANDROID_MIN_SDK_VERSION__ < 24 char *strchrnul(const char *s, int c); #endif diff --git a/tunnel/tools/wireguard-tools b/tunnel/tools/wireguard-tools -Subproject e189f9942d54b6900f7140c1f4a41312cb6889e +Subproject b4f6b4f229d291daf7c35c6f1e7f4841cc6d69b diff --git a/ui/build.gradle b/ui/build.gradle deleted file mode 100644 index 96813d67..00000000 --- a/ui/build.gradle +++ /dev/null @@ -1,90 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' - -version wireguardVersionName -group groupName - -// Create a variable called keystorePropertiesFile, and initialize it to your -// keystore.properties file, in the rootProject folder. -final def keystorePropertiesFile = rootProject.file("keystore.properties") - -android { - buildToolsVersion '29.0.3' - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = '1.8' - } - } - compileSdkVersion 29 - dataBinding.enabled true - viewBinding.enabled true - defaultConfig { - applicationId 'com.wireguard.android' - minSdkVersion 21 - targetSdkVersion 29 - versionCode wireguardVersionCode - versionName wireguardVersionName - buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel" - } - // If the keystore file exists - if (keystorePropertiesFile.exists()) { - // Initialize a new Properties() object called keystoreProperties. - final def keystoreProperties = new Properties() - - // Load your keystore.properties file into the keystoreProperties object. - keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) - - signingConfigs { - release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile rootProject.file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] - } - } - } - buildTypes { - release { - if (keystorePropertiesFile.exists()) signingConfig signingConfigs.release - minifyEnabled true - proguardFiles "proguard-android-optimize.txt", "proguard-rules.pro" - } - debug { - applicationIdSuffix ".debug" - versionNameSuffix "-debug" - } - } - lintOptions { - disable('LongLogTag') - } -} - -dependencies { - implementation project(":tunnel") - implementation "androidx.annotation:annotation:$annotationsVersion" - implementation "androidx.appcompat:appcompat:$appcompatVersion" - implementation "androidx.cardview:cardview:$cardviewVersion" - implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion" - implementation "androidx.coordinatorlayout:coordinatorlayout:$coordinatorLayoutVersion" - implementation "androidx.biometric:biometric:$biometricVersion" - implementation "androidx.core:core-ktx:$coreKtxVersion" - implementation "androidx.databinding:databinding-runtime:$agpVersion" - implementation "androidx.fragment:fragment:$fragmentVersion" - implementation "androidx.preference:preference:$preferenceVersion" - implementation "com.google.android.material:material:$materialComponentsVersion" - implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion" -} - -tasks.withType(JavaCompile) { - options.compilerArgs << '-Xlint:unchecked' - options.deprecation = true -} diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts new file mode 100644 index 00000000..5cdcb6a1 --- /dev/null +++ b/ui/build.gradle.kts @@ -0,0 +1,93 @@ +@file:Suppress("UnstableApiUsage") + +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +val pkg: String = providers.gradleProperty("wireguardPackageName").get() + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.kapt) +} + +android { + compileSdk = 34 + buildFeatures { + buildConfig = true + dataBinding = true + viewBinding = true + } + namespace = pkg + defaultConfig { + applicationId = pkg + minSdk = 21 + targetSdk = 34 + versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt() + versionName = providers.gradleProperty("wireguardVersionName").get() + buildConfigField("int", "MIN_SDK_VERSION", minSdk.toString()) + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + isCoreLibraryDesugaringEnabled = true + } + buildTypes { + release { + isMinifyEnabled = true + isShrinkResources = true + proguardFiles("proguard-android-optimize.txt") + packaging { + resources { + excludes += "DebugProbesKt.bin" + excludes += "kotlin-tooling-metadata.json" + excludes += "META-INF/*.version" + } + } + } + debug { + applicationIdSuffix = ".debug" + versionNameSuffix = "-debug" + } + create("googleplay") { + initWith(getByName("release")) + matchingFallbacks += "release" + } + } + androidResources { + generateLocaleConfig = true + } + lint { + disable += "LongLogTag" + warning += "MissingTranslation" + warning += "ImpliedQuantity" + } +} + +dependencies { + implementation(project(":tunnel")) + implementation(libs.androidx.activity.ktx) + implementation(libs.androidx.annotation) + implementation(libs.androidx.appcompat) + implementation(libs.androidx.constraintlayout) + implementation(libs.androidx.coordinatorlayout) + implementation(libs.androidx.biometric) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.fragment.ktx) + implementation(libs.androidx.preference.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.datastore.preferences) + implementation(libs.google.material) + implementation(libs.zxing.android.embedded) + implementation(libs.kotlinx.coroutines.android) + coreLibraryDesugaring(libs.desugarJdkLibs) +} + +tasks.withType<JavaCompile>().configureEach { + options.compilerArgs.add("-Xlint:unchecked") + options.isDeprecation = true +} + +tasks.withType<KotlinCompile>().configureEach { + compilerOptions.jvmTarget.set(JvmTarget.JVM_17) +} diff --git a/ui/proguard-android-optimize.txt b/ui/proguard-android-optimize.txt index e2095ad6..7bbc2b88 100644 --- a/ui/proguard-android-optimize.txt +++ b/ui/proguard-android-optimize.txt @@ -1,7 +1,6 @@ -allowaccessmodification --dontpreverify -dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses +-dontobfuscate -verbose -keepattributes *Annotation* diff --git a/ui/proguard-rules.pro b/ui/proguard-rules.pro deleted file mode 100644 index fc3eb888..00000000 --- a/ui/proguard-rules.pro +++ /dev/null @@ -1,14 +0,0 @@ -# Squelch all warnings, they're harmless but ProGuard -# escalates them as errors. --dontwarn sun.misc.Unsafe - -# Retain some information to keep stacktraces usable --keepattributes SourceFile,LineNumberTable - -# Fragment 1.2.4 allows Fragment classes to be obfuscated but -# databinding references in XML seem to not be rewritten to -# match, so we preserve the names as 1.2.3 did. --if public class ** extends androidx.fragment.app.Fragment --keep public class <1> { - public <init>(); -} diff --git a/ui/src/debug/res/values/strings.xml b/ui/src/debug/res/values/strings.xml index 60e016ea..947b7381 100644 --- a/ui/src/debug/res/values/strings.xml +++ b/ui/src/debug/res/values/strings.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">WireGuard β</string> + <string name="app_name" translatable="false">WireGuard β</string> </resources> diff --git a/ui/src/googleplay/AndroidManifest.xml b/ui/src/googleplay/AndroidManifest.xml new file mode 100644 index 00000000..6d64f732 --- /dev/null +++ b/ui/src/googleplay/AndroidManifest.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> + + <uses-permission + android:name="android.permission.REQUEST_INSTALL_PACKAGES" + tools:node="remove" /> +</manifest> diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml index 47a833e1..754992d5 100644 --- a/ui/src/main/AndroidManifest.xml +++ b/ui/src/main/AndroidManifest.xml @@ -1,13 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - package="com.wireguard.android" android:installLocation="internalOnly"> <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> + <uses-permission + android:name="android.permission.SYSTEM_ALERT_WINDOW" + android:minSdkVersion="34" /> + <uses-permission + android:name="android.permission.WRITE_EXTERNAL_STORAGE" + android:maxSdkVersion="28" + tools:ignore="ScopedStorage" /> <uses-feature android:name="android.hardware.touchscreen" @@ -16,6 +22,9 @@ android:name="android.software.leanback" android:required="false" /> <uses-feature + android:name="android.hardware.camera.any" + android:required="false" /> + <uses-feature android:name="android.hardware.camera" android:required="false" /> @@ -30,6 +39,7 @@ android:name=".Application" android:allowBackup="false" android:banner="@mipmap/banner" + android:enableOnBackInvokedCallback="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" @@ -38,14 +48,16 @@ <activity android:name=".activity.TunnelToggleActivity" + android:excludeFromRecents="true" android:theme="@style/NoBackgroundTheme" /> - <activity android:name=".activity.MainActivity"> + <activity + android:name=".activity.MainActivity" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> - <category android:name="android.intent.category.LEANBACK_LAUNCHER" /> </intent-filter> <intent-filter> @@ -54,6 +66,16 @@ </activity> <activity + android:name=".activity.TvMainActivity" + android:exported="true" + android:theme="@style/TvTheme"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LEANBACK_LAUNCHER" /> + </intent-filter> + </activity> + + <activity android:name=".activity.SettingsActivity" android:label="@string/settings" android:parentActivityName=".activity.MainActivity" /> @@ -70,6 +92,7 @@ <activity android:name=".activity.LogViewerActivity" + android:exported="false" android:label="@string/log_viewer_title"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -82,7 +105,9 @@ android:exported="false" android:grantUriPermissions="true" /> - <receiver android:name=".BootShutdownReceiver"> + <receiver + android:name=".BootShutdownReceiver" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.ACTION_SHUTDOWN" /> <action android:name="android.intent.action.BOOT_COMPLETED" /> @@ -90,7 +115,16 @@ </receiver> <receiver + android:name=".updater.Updater$AppUpdatedReceiver" + android:exported="true"> + <intent-filter> + <action android:name="android.intent.action.MY_PACKAGE_REPLACED" /> + </intent-filter> + </receiver> + + <receiver android:name=".model.TunnelManager$IntentReceiver" + android:exported="true" android:permission="${applicationId}.permission.CONTROL_TUNNELS"> <intent-filter> <action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" /> @@ -101,6 +135,7 @@ <service android:name=".QuickTileService" + android:exported="true" android:icon="@drawable/ic_tile" android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"> @@ -111,6 +146,21 @@ <meta-data android:name="android.service.quicksettings.ACTIVE_TILE" android:value="false" /> + + <meta-data + android:name="android.service.quicksettings.TOGGLEABLE_TILE" + android:value="true" /> </service> + + <meta-data + android:name="android.content.APP_RESTRICTIONS" + android:resource="@xml/app_restrictions" /> </application> + + <queries> + <intent> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent> + </queries> </manifest> diff --git a/ui/src/main/java/com/wireguard/android/Application.kt b/ui/src/main/java/com/wireguard/android/Application.kt index d533028f..4dcec508 100644 --- a/ui/src/main/java/com/wireguard/android/Application.kt +++ b/ui/src/main/java/com/wireguard/android/Application.kt @@ -1,43 +1,51 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android import android.content.Context import android.content.Intent -import android.content.SharedPreferences -import android.content.SharedPreferences.OnSharedPreferenceChangeListener -import android.os.AsyncTask import android.os.Build -import android.os.Handler -import android.os.Looper import android.os.StrictMode +import android.os.StrictMode.ThreadPolicy import android.os.StrictMode.VmPolicy import android.util.Log import androidx.appcompat.app.AppCompatDelegate -import androidx.preference.PreferenceManager +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.PreferenceDataStoreFactory +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.preferencesDataStoreFile +import com.google.android.material.color.DynamicColors import com.wireguard.android.backend.Backend import com.wireguard.android.backend.GoBackend import com.wireguard.android.backend.WgQuickBackend import com.wireguard.android.configStore.FileConfigStore import com.wireguard.android.model.TunnelManager -import com.wireguard.android.util.AsyncWorker -import com.wireguard.android.util.ExceptionLoggers -import com.wireguard.android.util.ModuleLoader +import com.wireguard.android.updater.Updater import com.wireguard.android.util.RootShell import com.wireguard.android.util.ToolsInstaller -import java9.util.concurrent.CompletableFuture +import com.wireguard.android.util.UserKnobs +import com.wireguard.android.util.applicationScope +import kotlinx.coroutines.CompletableDeferred +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking import java.lang.ref.WeakReference import java.util.Locale -class Application : android.app.Application(), OnSharedPreferenceChangeListener { - private val futureBackend = CompletableFuture<Backend>() - private lateinit var asyncWorker: AsyncWorker +class Application : android.app.Application() { + private val futureBackend = CompletableDeferred<Backend>() + private val coroutineScope = CoroutineScope(Job() + Dispatchers.Main.immediate) private var backend: Backend? = null - private lateinit var moduleLoader: ModuleLoader private lateinit var rootShell: RootShell - private lateinit var sharedPreferences: SharedPreferences + private lateinit var preferencesDataStore: DataStore<Preferences> private lateinit var toolsInstaller: ToolsInstaller private lateinit var tunnelManager: TunnelManager @@ -51,38 +59,73 @@ class Application : android.app.Application(), OnSharedPreferenceChangeListener startActivity(intent) System.exit(0) } - if (BuildConfig.DEBUG) { - StrictMode.setVmPolicy(VmPolicy.Builder().detectAll().penaltyLog().build()) + } + + private suspend fun determineBackend(): Backend { + var backend: Backend? = null + if (UserKnobs.enableKernelModule.first() && WgQuickBackend.hasKernelSupport()) { + try { + rootShell.start() + val wgQuickBackend = WgQuickBackend(applicationContext, rootShell, toolsInstaller) + wgQuickBackend.setMultipleTunnels(UserKnobs.multipleTunnels.first()) + backend = wgQuickBackend + UserKnobs.multipleTunnels.onEach { + wgQuickBackend.setMultipleTunnels(it) + }.launchIn(coroutineScope) + } catch (ignored: Exception) { + } + } + if (backend == null) { + backend = GoBackend(applicationContext) + GoBackend.setAlwaysOnCallback { get().applicationScope.launch { get().tunnelManager.restoreState(true) } } } + return backend } override fun onCreate() { Log.i(TAG, USER_AGENT) super.onCreate() - asyncWorker = AsyncWorker(AsyncTask.SERIAL_EXECUTOR, Handler(Looper.getMainLooper())) + DynamicColors.applyToActivitiesIfAvailable(this) rootShell = RootShell(applicationContext) toolsInstaller = ToolsInstaller(applicationContext, rootShell) - moduleLoader = ModuleLoader(applicationContext, rootShell, USER_AGENT) - sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext) + preferencesDataStore = PreferenceDataStoreFactory.create { applicationContext.preferencesDataStoreFile("settings") } if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { - AppCompatDelegate.setDefaultNightMode( - if (sharedPreferences.getBoolean("dark_theme", false)) AppCompatDelegate.MODE_NIGHT_YES else AppCompatDelegate.MODE_NIGHT_NO) + runBlocking { + AppCompatDelegate.setDefaultNightMode(if (UserKnobs.darkTheme.first()) AppCompatDelegate.MODE_NIGHT_YES else AppCompatDelegate.MODE_NIGHT_NO) + } + UserKnobs.darkTheme.onEach { + val newMode = if (it) { + AppCompatDelegate.MODE_NIGHT_YES + } else { + AppCompatDelegate.MODE_NIGHT_NO + } + if (AppCompatDelegate.getDefaultNightMode() != newMode) { + AppCompatDelegate.setDefaultNightMode(newMode) + } + }.launchIn(coroutineScope) } else { AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) } tunnelManager = TunnelManager(FileConfigStore(applicationContext)) tunnelManager.onCreate() - asyncWorker.supplyAsync(Companion::getBackend).thenAccept { futureBackend.complete(it) } - sharedPreferences.registerOnSharedPreferenceChangeListener(this) - } + coroutineScope.launch(Dispatchers.IO) { + try { + backend = determineBackend() + futureBackend.complete(backend!!) + } catch (e: Throwable) { + Log.e(TAG, Log.getStackTraceString(e)) + } + } + Updater.monitorForUpdates() - override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { - if ("multiple_tunnels" == key && backend != null && backend is WgQuickBackend) - (backend as WgQuickBackend).setMultipleTunnels(sharedPreferences.getBoolean(key, false)) + if (BuildConfig.DEBUG) { + StrictMode.setVmPolicy(VmPolicy.Builder().detectAll().penaltyLog().build()) + StrictMode.setThreadPolicy(ThreadPolicy.Builder().detectAll().penaltyLog().build()) + } } override fun onTerminate() { - sharedPreferences.unregisterOnSharedPreferenceChangeListener(this) + coroutineScope.cancel() super.onTerminate() } @@ -91,66 +134,21 @@ class Application : android.app.Application(), OnSharedPreferenceChangeListener private const val TAG = "WireGuard/Application" private lateinit var weakSelf: WeakReference<Application> - @JvmStatic fun get(): Application { return weakSelf.get()!! } - @JvmStatic - fun getAsyncWorker() = get().asyncWorker - - @JvmStatic - fun getBackend(): Backend { - val app = get() - synchronized(app.futureBackend) { - if (app.backend == null) { - var backend: Backend? = null - var didStartRootShell = false - if (!ModuleLoader.isModuleLoaded() && app.moduleLoader.moduleMightExist()) { - try { - app.rootShell.start() - didStartRootShell = true - app.moduleLoader.loadModule() - } catch (ignored: Exception) { - } - } - if (!app.sharedPreferences.getBoolean("disable_kernel_module", false) && ModuleLoader.isModuleLoaded()) { - try { - if (!didStartRootShell) - app.rootShell.start() - val wgQuickBackend = WgQuickBackend(app.applicationContext, app.rootShell, app.toolsInstaller) - wgQuickBackend.setMultipleTunnels(app.sharedPreferences.getBoolean("multiple_tunnels", false)) - backend = wgQuickBackend - } catch (ignored: Exception) { - } - } - if (backend == null) { - backend = GoBackend(app.applicationContext) - GoBackend.setAlwaysOnCallback { get().tunnelManager.restoreState(true).whenComplete(ExceptionLoggers.D) } - } - app.backend = backend - } - return app.backend!! - } - } - - @JvmStatic - fun getBackendAsync() = get().futureBackend + suspend fun getBackend() = get().futureBackend.await() - @JvmStatic - fun getModuleLoader() = get().moduleLoader - - @JvmStatic fun getRootShell() = get().rootShell - @JvmStatic - fun getSharedPreferences() = get().sharedPreferences + fun getPreferencesDataStore() = get().preferencesDataStore - @JvmStatic fun getToolsInstaller() = get().toolsInstaller - @JvmStatic fun getTunnelManager() = get().tunnelManager + + fun getCoroutineScope() = get().coroutineScope } init { diff --git a/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt b/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt index 41aff76d..a859bf71 100644 --- a/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt +++ b/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android @@ -8,19 +8,19 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.util.Log -import com.wireguard.android.backend.Backend import com.wireguard.android.backend.WgQuickBackend -import com.wireguard.android.util.ExceptionLoggers +import com.wireguard.android.util.applicationScope +import kotlinx.coroutines.launch class BootShutdownReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { - Application.getBackendAsync().thenAccept { backend: Backend? -> - if (backend !is WgQuickBackend) return@thenAccept - val action = intent.action ?: return@thenAccept + val action = intent.action ?: return + applicationScope.launch { + if (Application.getBackend() !is WgQuickBackend) return@launch val tunnelManager = Application.getTunnelManager() if (Intent.ACTION_BOOT_COMPLETED == action) { Log.i(TAG, "Broadcast receiver restoring state (boot)") - tunnelManager.restoreState(false).whenComplete(ExceptionLoggers.D) + tunnelManager.restoreState(false) } else if (Intent.ACTION_SHUTDOWN == action) { Log.i(TAG, "Broadcast receiver saving state (shutdown)") tunnelManager.saveState() diff --git a/ui/src/main/java/com/wireguard/android/QuickTileService.kt b/ui/src/main/java/com/wireguard/android/QuickTileService.kt index 5099668e..9be2cc2b 100644 --- a/ui/src/main/java/com/wireguard/android/QuickTileService.kt +++ b/ui/src/main/java/com/wireguard/android/QuickTileService.kt @@ -1,15 +1,18 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android +import android.app.PendingIntent import android.content.Intent import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.drawable.Icon +import android.net.Uri import android.os.Build import android.os.IBinder +import android.provider.Settings import android.service.quicksettings.Tile import android.service.quicksettings.TileService import android.util.Log @@ -20,7 +23,9 @@ import com.wireguard.android.activity.MainActivity import com.wireguard.android.activity.TunnelToggleActivity import com.wireguard.android.backend.Tunnel import com.wireguard.android.model.ObservableTunnel +import com.wireguard.android.util.applicationScope import com.wireguard.android.widget.SlashDrawable +import kotlinx.coroutines.launch /** * Service that maintains the application's custom Quick Settings tile. This service is bound by the @@ -40,38 +45,49 @@ class QuickTileService : TileService() { var ret: IBinder? = null try { ret = super.onBind(intent) - } catch (e: Exception) { + } catch (e: Throwable) { Log.d(TAG, "Failed to bind to TileService", e) } return ret } override fun onClick() { - if (tunnel != null) { - unlockAndRun { - val tile = qsTile - if (tile != null) { - tile.icon = if (tile.icon == iconOn) iconOff else iconOn - tile.updateTile() + when (val tunnel = tunnel) { + null -> { + val intent = Intent(this, MainActivity::class.java) + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + startActivityAndCollapse(PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE)) + } else { + @Suppress("DEPRECATION") + startActivityAndCollapse(intent) } - tunnel!!.setStateAsync(Tunnel.State.TOGGLE).whenComplete { _, t -> - if (t == null) { - updateTile() - } else { - val toggleIntent = Intent(this, TunnelToggleActivity::class.java) - toggleIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - startActivity(toggleIntent) + } + else -> { + unlockAndRun { + applicationScope.launch { + try { + tunnel.setStateAsync(Tunnel.State.TOGGLE) + updateTile() + } catch (_: Throwable) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && !Settings.canDrawOverlays(this@QuickTileService)) { + val permissionIntent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:$packageName")) + permissionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + startActivityAndCollapse(PendingIntent.getActivity(this@QuickTileService, 0, permissionIntent, PendingIntent.FLAG_IMMUTABLE)) + return@launch + } + val toggleIntent = Intent(this@QuickTileService, TunnelToggleActivity::class.java) + toggleIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + startActivity(toggleIntent) + } } } } - } else { - val intent = Intent(this, MainActivity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - startActivityAndCollapse(intent) } } override fun onCreate() { + isAdded = true if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { iconOn = Icon.createWithResource(this, R.drawable.ic_tile) iconOff = iconOn @@ -81,55 +97,64 @@ class QuickTileService : TileService() { icon.setAnimationEnabled(false) /* Unfortunately we can't have animations, since Icons are marshaled. */ icon.setSlashed(false) var b = Bitmap.createBitmap(icon.intrinsicWidth, icon.intrinsicHeight, Bitmap.Config.ARGB_8888) - ?: return var c = Canvas(b) icon.setBounds(0, 0, c.width, c.height) icon.draw(c) iconOn = Icon.createWithBitmap(b) icon.setSlashed(true) b = Bitmap.createBitmap(icon.intrinsicWidth, icon.intrinsicHeight, Bitmap.Config.ARGB_8888) - ?: return c = Canvas(b) icon.setBounds(0, 0, c.width, c.height) icon.draw(c) iconOff = Icon.createWithBitmap(b) } + override fun onDestroy() { + super.onDestroy() + isAdded = false + } + override fun onStartListening() { Application.getTunnelManager().addOnPropertyChangedCallback(onTunnelChangedCallback) - if (tunnel != null) tunnel!!.addOnPropertyChangedCallback(onStateChangedCallback) + tunnel?.addOnPropertyChangedCallback(onStateChangedCallback) updateTile() } override fun onStopListening() { - if (tunnel != null) tunnel!!.removeOnPropertyChangedCallback(onStateChangedCallback) + tunnel?.removeOnPropertyChangedCallback(onStateChangedCallback) Application.getTunnelManager().removeOnPropertyChangedCallback(onTunnelChangedCallback) } + override fun onTileAdded() { + isAdded = true + } + + override fun onTileRemoved() { + isAdded = false + } + private fun updateTile() { // Update the tunnel. val newTunnel = Application.getTunnelManager().lastUsedTunnel if (newTunnel != tunnel) { - if (tunnel != null) tunnel!!.removeOnPropertyChangedCallback(onStateChangedCallback) + tunnel?.removeOnPropertyChangedCallback(onStateChangedCallback) tunnel = newTunnel - if (tunnel != null) tunnel!!.addOnPropertyChangedCallback(onStateChangedCallback) + tunnel?.addOnPropertyChangedCallback(onStateChangedCallback) } // Update the tile contents. - val label: String - val state: Int - val tile = qsTile - if (tunnel != null) { - label = tunnel!!.name - state = if (tunnel!!.state == Tunnel.State.UP) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE - } else { - label = getString(R.string.app_name) - state = Tile.STATE_INACTIVE - } - if (tile == null) return - tile.label = label - if (tile.state != state) { - tile.icon = if (state == Tile.STATE_ACTIVE) iconOn else iconOff - tile.state = state + val tile = qsTile ?: return + + when (val tunnel = tunnel) { + null -> { + tile.label = getString(R.string.app_name) + tile.state = Tile.STATE_INACTIVE + tile.icon = iconOff + } + else -> { + tile.label = tunnel.name + tile.state = if (tunnel.state == Tunnel.State.UP) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE + tile.icon = if (tunnel.state == Tunnel.State.UP) iconOn else iconOff + } } tile.updateTile() } @@ -140,19 +165,23 @@ class QuickTileService : TileService() { sender.removeOnPropertyChangedCallback(this) return } - if (propertyId != 0 && propertyId != BR.state) return + if (propertyId != 0 && propertyId != BR.state) + return updateTile() } } private inner class OnTunnelChangedCallback : OnPropertyChangedCallback() { override fun onPropertyChanged(sender: Observable, propertyId: Int) { - if (propertyId != 0 && propertyId != BR.lastUsedTunnel) return + if (propertyId != 0 && propertyId != BR.lastUsedTunnel) + return updateTile() } } companion object { private const val TAG = "WireGuard/QuickTileService" + var isAdded: Boolean = false + private set } } diff --git a/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt b/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt index 14ab0bdb..56810377 100644 --- a/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/BaseActivity.kt @@ -1,27 +1,36 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.activity import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import androidx.databinding.CallbackRegistry import androidx.databinding.CallbackRegistry.NotifierCallback +import androidx.lifecycle.lifecycleScope import com.wireguard.android.Application import com.wireguard.android.model.ObservableTunnel +import kotlinx.coroutines.launch /** * Base class for activities that need to remember the currently-selected tunnel. */ -abstract class BaseActivity : ThemeChangeAwareActivity() { +abstract class BaseActivity : AppCompatActivity() { private val selectionChangeRegistry = SelectionChangeRegistry() + private var created = false var selectedTunnel: ObservableTunnel? = null set(value) { val oldTunnel = field if (oldTunnel == value) return field = value - onSelectedTunnelChanged(oldTunnel, value) - selectionChangeRegistry.notifyCallbacks(oldTunnel, 0, value) + if (created) { + if (!onSelectedTunnelChanged(oldTunnel, value)) { + field = oldTunnel + } else { + selectionChangeRegistry.notifyCallbacks(oldTunnel, 0, value) + } + } } fun addOnSelectedTunnelChangedListener(listener: OnSelectedTunnelChangedListener) { @@ -29,6 +38,8 @@ abstract class BaseActivity : ThemeChangeAwareActivity() { } override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + // Restore the saved tunnel if there is one; otherwise grab it from the arguments. val savedTunnelName = when { savedInstanceState != null -> savedInstanceState.getString(KEY_SELECTED_TUNNEL) @@ -36,13 +47,16 @@ abstract class BaseActivity : ThemeChangeAwareActivity() { else -> null } if (savedTunnelName != null) { - Application.getTunnelManager() - .tunnels - .thenAccept { selectedTunnel = it[savedTunnelName] } + lifecycleScope.launch { + val tunnel = Application.getTunnelManager().getTunnels()[savedTunnelName] + if (tunnel == null) + created = true + selectedTunnel = tunnel + created = true + } + } else { + created = true } - - // The selected tunnel must be set before the superclass method recreates fragments. - super.onCreate(savedInstanceState) } override fun onSaveInstanceState(outState: Bundle) { @@ -50,9 +64,11 @@ abstract class BaseActivity : ThemeChangeAwareActivity() { super.onSaveInstanceState(outState) } - protected abstract fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?) + protected abstract fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?): Boolean + fun removeOnSelectedTunnelChangedListener( - listener: OnSelectedTunnelChangedListener) { + listener: OnSelectedTunnelChangedListener + ) { selectionChangeRegistry.remove(listener) } @@ -62,17 +78,17 @@ abstract class BaseActivity : ThemeChangeAwareActivity() { private class SelectionChangeNotifier : NotifierCallback<OnSelectedTunnelChangedListener, ObservableTunnel, ObservableTunnel>() { override fun onNotifyCallback( - listener: OnSelectedTunnelChangedListener, - oldTunnel: ObservableTunnel?, - ignored: Int, - newTunnel: ObservableTunnel? + listener: OnSelectedTunnelChangedListener, + oldTunnel: ObservableTunnel?, + ignored: Int, + newTunnel: ObservableTunnel? ) { listener.onSelectedTunnelChanged(oldTunnel, newTunnel) } } private class SelectionChangeRegistry : - CallbackRegistry<OnSelectedTunnelChangedListener, ObservableTunnel, ObservableTunnel>(SelectionChangeNotifier()) + CallbackRegistry<OnSelectedTunnelChangedListener, ObservableTunnel, ObservableTunnel>(SelectionChangeNotifier()) companion object { private const val KEY_SELECTED_TUNNEL = "selected_tunnel" diff --git a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt index 87fdc236..69e33bc9 100644 --- a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -19,13 +19,18 @@ import android.text.Spannable import android.text.SpannableString import android.text.style.ForegroundColorSpan import android.text.style.StyleSpan +import android.util.Log import android.view.LayoutInflater import android.view.Menu import android.view.MenuItem import android.view.View import android.view.ViewGroup +import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity +import androidx.collection.CircularArray import androidx.core.app.ShareCompat +import androidx.core.content.res.ResourcesCompat +import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -36,13 +41,9 @@ import com.wireguard.android.R import com.wireguard.android.databinding.LogViewerActivityBinding import com.wireguard.android.util.DownloadsFileSaver import com.wireguard.android.util.ErrorMessages -import com.wireguard.android.widget.EdgeToEdge.setUpFAB -import com.wireguard.android.widget.EdgeToEdge.setUpRoot -import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent +import com.wireguard.android.util.resolveAttribute import com.wireguard.crypto.KeyPair -import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.cancel import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.io.BufferedReader @@ -60,33 +61,26 @@ import java.util.regex.Matcher import java.util.regex.Pattern class LogViewerActivity : AppCompatActivity() { - private lateinit var binding: LogViewerActivityBinding private lateinit var logAdapter: LogEntryAdapter - private var logLines = arrayListOf<LogLine>() - private var rawLogLines = StringBuffer() + private var logLines = CircularArray<LogLine>() + private var rawLogLines = CircularArray<String>() private var recyclerView: RecyclerView? = null private var saveButton: MenuItem? = null - private val coroutineScope = CoroutineScope(Dispatchers.Default) private val year by lazy { val yearFormatter: DateFormat = SimpleDateFormat("yyyy", Locale.US) yearFormatter.format(Date()) } - @Suppress("Deprecation") - private val defaultColor by lazy { resources.getColor(R.color.primary_text_color) } + private val defaultColor by lazy { resolveAttribute(com.google.android.material.R.attr.colorOnSurface) } - @Suppress("Deprecation") - private val debugColor by lazy { resources.getColor(R.color.debug_tag_color) } + private val debugColor by lazy { ResourcesCompat.getColor(resources, R.color.debug_tag_color, theme) } - @Suppress("Deprecation") - private val errorColor by lazy { resources.getColor(R.color.error_tag_color) } + private val errorColor by lazy { ResourcesCompat.getColor(resources, R.color.error_tag_color, theme) } - @Suppress("Deprecation") - private val infoColor by lazy { resources.getColor(R.color.info_tag_color) } + private val infoColor by lazy { ResourcesCompat.getColor(resources, R.color.info_tag_color, theme) } - @Suppress("Deprecation") - private val warningColor by lazy { resources.getColor(R.color.warning_tag_color) } + private val warningColor by lazy { ResourcesCompat.getColor(resources, R.color.warning_tag_color, theme) } private var lastUri: Uri? = null @@ -103,9 +97,6 @@ class LogViewerActivity : AppCompatActivity() { binding = LogViewerActivityBinding.inflate(layoutInflater) setContentView(binding.root) supportActionBar?.setDisplayHomeAsUpEnabled(true) - setUpFAB(binding.shareFab) - setUpRoot(binding.root) - setUpScrollingContent(binding.recyclerView, binding.shareFab) logAdapter = LogEntryAdapter() binding.recyclerView.apply { recyclerView = this @@ -114,35 +105,34 @@ class LogViewerActivity : AppCompatActivity() { addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL)) } - coroutineScope.launch { streamingLog() } + lifecycleScope.launch(Dispatchers.IO) { streamingLog() } - binding.shareFab.setOnClickListener { + val revokeLastActivityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { revokeLastUri() - val key = KeyPair().privateKey.toHex() - LOGS[key] = rawLogLines.toString().toByteArray(Charsets.UTF_8) - lastUri = Uri.parse("content://${BuildConfig.APPLICATION_ID}.exported-log/$key") - val shareIntent = ShareCompat.IntentBuilder.from(this) + } + + binding.shareFab.setOnClickListener { + lifecycleScope.launch { + revokeLastUri() + val key = KeyPair().privateKey.toHex() + LOGS[key] = rawLogBytes() + lastUri = Uri.parse("content://${BuildConfig.APPLICATION_ID}.exported-log/$key") + val shareIntent = ShareCompat.IntentBuilder(this@LogViewerActivity) .setType("text/plain") .setSubject(getString(R.string.log_export_subject)) .setStream(lastUri) .setChooserTitle(R.string.log_export_title) .createChooserIntent() .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) - grantUriPermission("android", lastUri, Intent.FLAG_GRANT_READ_URI_PERMISSION) - startActivityForResult(shareIntent, SHARE_ACTIVITY_REQUEST) - } - } - - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - if (requestCode == SHARE_ACTIVITY_REQUEST) { - revokeLastUri() + grantUriPermission("android", lastUri, Intent.FLAG_GRANT_READ_URI_PERMISSION) + revokeLastActivityResultLauncher.launch(shareIntent) + } } - super.onActivityResult(requestCode, resultCode, data) } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.log_viewer, menu) - saveButton = menu?.findItem(R.id.save_log) + saveButton = menu.findItem(R.id.save_log) return true } @@ -152,94 +142,126 @@ class LogViewerActivity : AppCompatActivity() { finish() true } + R.id.save_log -> { - coroutineScope.launch { saveLog() } + saveButton?.isEnabled = false + lifecycleScope.launch { saveLog() } true } + else -> super.onOptionsItemSelected(item) } } - override fun onDestroy() { - super.onDestroy() - coroutineScope.cancel() + private val downloadsFileSaver = DownloadsFileSaver(this) + + private suspend fun rawLogBytes(): ByteArray { + val builder = StringBuilder() + withContext(Dispatchers.IO) { + for (i in 0 until rawLogLines.size()) { + builder.append(rawLogLines[i]) + builder.append('\n') + } + } + return builder.toString().toByteArray(Charsets.UTF_8) } private suspend fun saveLog() { - val context = this - withContext(Dispatchers.Main) { - saveButton?.isEnabled = false - withContext(Dispatchers.IO) { - var exception: Throwable? = null - var outputFile: DownloadsFileSaver.DownloadsFile? = null - try { - outputFile = DownloadsFileSaver.save(context, "wireguard-log.txt", "text/plain", true) - outputFile.outputStream.use { - it.write(rawLogLines.toString().toByteArray(Charsets.UTF_8)) - } - } catch (e: Throwable) { - outputFile?.delete() - exception = e - } - withContext(Dispatchers.Main) { - saveButton?.isEnabled = true - Snackbar.make(findViewById(android.R.id.content), - if (exception == null) getString(R.string.log_export_success, outputFile?.fileName) - else getString(R.string.log_export_error, ErrorMessages[exception]), - if (exception == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG) - .setAnchorView(binding.shareFab) - .show() - } + var exception: Throwable? = null + var outputFile: DownloadsFileSaver.DownloadsFile? = null + withContext(Dispatchers.IO) { + try { + outputFile = downloadsFileSaver.save("wireguard-log.txt", "text/plain", true) + outputFile?.outputStream?.write(rawLogBytes()) + } catch (e: Throwable) { + outputFile?.delete() + exception = e } } + saveButton?.isEnabled = true + if (outputFile == null) + return + Snackbar.make( + findViewById(android.R.id.content), + if (exception == null) getString(R.string.log_export_success, outputFile?.fileName) + else getString(R.string.log_export_error, ErrorMessages[exception]), + if (exception == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG + ) + .setAnchorView(binding.shareFab) + .show() } private suspend fun streamingLog() = withContext(Dispatchers.IO) { val builder = ProcessBuilder().command("logcat", "-b", "all", "-v", "threadtime", "*:V") builder.environment()["LC_ALL"] = "C" - val process = try { - builder.start() - } catch (e: IOException) { - e.printStackTrace() - return@withContext - } - val stdout = BufferedReader(InputStreamReader(process!!.inputStream, StandardCharsets.UTF_8)) - var haveScrolled = false - val start = System.nanoTime() - var startPeriod = start - while (true) { - val line = stdout.readLine() ?: break - rawLogLines.append(line) - rawLogLines.append('\n') - val logLine = parseLine(line) - withContext(Dispatchers.Main) { + var process: Process? = null + try { + process = try { + builder.start() + } catch (e: IOException) { + Log.e(TAG, Log.getStackTraceString(e)) + return@withContext + } + val stdout = BufferedReader(InputStreamReader(process!!.inputStream, StandardCharsets.UTF_8)) + + var posStart = 0 + var timeLastNotify = System.nanoTime() + var priorModified = false + val bufferedLogLines = arrayListOf<LogLine>() + var timeout = 1000000000L / 2 // The timeout is initially small so that the view gets populated immediately. + val MAX_LINES = (1 shl 16) - 1 + val MAX_BUFFERED_LINES = (1 shl 14) - 1 + + while (true) { + val line = stdout.readLine() ?: break + if (rawLogLines.size() >= MAX_LINES) + rawLogLines.popFirst() + rawLogLines.addLast(line) + val logLine = parseLine(line) if (logLine != null) { - recyclerView?.let { - val shouldScroll = haveScrolled && !it.canScrollVertically(1) - logLines.add(logLine) - if (haveScrolled) logAdapter.notifyDataSetChanged() - if (shouldScroll) - it.scrollToPosition(logLines.size - 1) - } + bufferedLogLines.add(logLine) } else { - /* I'd prefer for the next line to be: - * logLines.lastOrNull()?.msg += "\n$line" - * However, as of writing, that causes the kotlin compiler to freak out and crash, spewing bytecode. - */ - logLines.lastOrNull()?.apply { msg += "\n$line" } - if (haveScrolled) logAdapter.notifyDataSetChanged() + if (bufferedLogLines.isNotEmpty()) { + bufferedLogLines.last().msg += "\n$line" + } else if (!logLines.isEmpty()) { + logLines[logLines.size() - 1].msg += "\n$line" + priorModified = true + } } - if (!haveScrolled) { - val end = System.nanoTime() - val scroll = (end - start) > 1000000000L * 2.5 || !stdout.ready() - if (logLines.isNotEmpty() && (scroll || (end - startPeriod) > 1000000000L / 4)) { - logAdapter.notifyDataSetChanged() - recyclerView?.scrollToPosition(logLines.size - 1) - startPeriod = end + val timeNow = System.nanoTime() + if (bufferedLogLines.size < MAX_BUFFERED_LINES && (timeNow - timeLastNotify) < timeout && stdout.ready()) + continue + timeout = 1000000000L * 5 / 2 // Increase the timeout after the initial view has something in it. + timeLastNotify = timeNow + + withContext(Dispatchers.Main.immediate) { + val isScrolledToBottomAlready = recyclerView?.canScrollVertically(1) == false + if (priorModified) { + logAdapter.notifyItemChanged(posStart - 1) + priorModified = false + } + val fullLen = logLines.size() + bufferedLogLines.size + if (fullLen >= MAX_LINES) { + val numToRemove = fullLen - MAX_LINES + 1 + logLines.removeFromStart(numToRemove) + logAdapter.notifyItemRangeRemoved(0, numToRemove) + posStart -= numToRemove + + } + for (bufferedLine in bufferedLogLines) { + logLines.addLast(bufferedLine) + } + bufferedLogLines.clear() + logAdapter.notifyItemRangeInserted(posStart, logLines.size() - posStart) + posStart = logLines.size() + + if (isScrolledToBottomAlready) { + recyclerView?.scrollToPosition(logLines.size() - 1) } - if (scroll) haveScrolled = true } } + } finally { + process?.destroy() } } @@ -269,9 +291,10 @@ class LogViewerActivity : AppCompatActivity() { * * <pre>05-26 11:02:36.886 5689 5689 D AndroidRuntime: CheckJNI is OFF.</pre> */ - private val THREADTIME_LINE: Pattern = Pattern.compile("^(\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d{3})(?:\\s+[0-9A-Za-z]+)?\\s+(\\d+)\\s+(\\d+)\\s+([A-Z])\\s+(.+?)\\s*: (.*)$") + private val THREADTIME_LINE: Pattern = + Pattern.compile("^(\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d{3})(?:\\s+[0-9A-Za-z]+)?\\s+(\\d+)\\s+(\\d+)\\s+([A-Z])\\s+(.+?)\\s*: (.*)$") private val LOGS: MutableMap<String, ByteArray> = ConcurrentHashMap() - private const val SHARE_ACTIVITY_REQUEST = 49133 + private const val TAG = "WireGuard/LogViewerActivity" } private inner class LogEntryAdapter : RecyclerView.Adapter<LogEntryAdapter.ViewHolder>() { @@ -280,7 +303,7 @@ class LogViewerActivity : AppCompatActivity() { private fun levelToColor(level: String): Int { return when (level) { - "D" -> debugColor + "V", "D" -> debugColor "E" -> errorColor "I" -> infoColor "W" -> warningColor @@ -288,11 +311,11 @@ class LogViewerActivity : AppCompatActivity() { } } - override fun getItemCount() = logLines.size + override fun getItemCount() = logLines.size() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val view = LayoutInflater.from(parent.context) - .inflate(R.layout.log_viewer_entry, parent, false) + .inflate(R.layout.log_viewer_entry, parent, false) return ViewHolder(view) } @@ -303,8 +326,10 @@ class LogViewerActivity : AppCompatActivity() { else SpannableString("${line.tag}: ${line.msg}").apply { setSpan(StyleSpan(BOLD), 0, "${line.tag}:".length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) - setSpan(ForegroundColorSpan(levelToColor(line.level)), - 0, "${line.tag}:".length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + setSpan( + ForegroundColorSpan(levelToColor(line.level)), + 0, "${line.tag}:".length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ) } holder.layout.apply { findViewById<MaterialTextView>(R.id.log_date).text = line.time.toString() @@ -326,11 +351,11 @@ class LogViewerActivity : AppCompatActivity() { override fun insert(uri: Uri, values: ContentValues?): Uri? = null override fun query(uri: Uri, projection: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, sortOrder: String?): Cursor? = - logForUri(uri)?.let { - val m = MatrixCursor(arrayOf(android.provider.OpenableColumns.DISPLAY_NAME, android.provider.OpenableColumns.SIZE), 1) - m.addRow(arrayOf("wireguard-log.txt", it.size.toLong())) - m - } + logForUri(uri)?.let { + val m = MatrixCursor(arrayOf(android.provider.OpenableColumns.DISPLAY_NAME, android.provider.OpenableColumns.SIZE), 1) + m.addRow(arrayOf("wireguard-log.txt", it.size.toLong())) + m + } override fun onCreate(): Boolean = true @@ -340,7 +365,8 @@ class LogViewerActivity : AppCompatActivity() { override fun getType(uri: Uri): String? = logForUri(uri)?.let { "text/plain" } - override fun getStreamTypes(uri: Uri, mimeTypeFilter: String): Array<String>? = getType(uri)?.let { if (compareMimeTypes(it, mimeTypeFilter)) arrayOf(it) else null } + override fun getStreamTypes(uri: Uri, mimeTypeFilter: String): Array<String>? = + getType(uri)?.let { if (compareMimeTypes(it, mimeTypeFilter)) arrayOf(it) else null } override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor? { if (mode != "r") return null @@ -348,7 +374,7 @@ class LogViewerActivity : AppCompatActivity() { return openPipeHelper(uri, "text/plain", null, log) { output, _, _, _, l -> try { FileOutputStream(output.fileDescriptor).write(l!!) - } catch (_: Exception) { + } catch (_: Throwable) { } } } diff --git a/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt b/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt index 237a75f4..80c4868c 100644 --- a/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/MainActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.activity @@ -9,10 +9,12 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import android.view.View -import android.widget.LinearLayout +import androidx.activity.OnBackPressedCallback +import androidx.activity.addCallback import androidx.appcompat.app.ActionBar import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction +import androidx.fragment.app.commit import com.wireguard.android.R import com.wireguard.android.fragment.TunnelDetailFragment import com.wireguard.android.fragment.TunnelEditorFragment @@ -26,27 +28,29 @@ import com.wireguard.android.model.ObservableTunnel class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener { private var actionBar: ActionBar? = null private var isTwoPaneLayout = false + private var backPressedCallback: OnBackPressedCallback? = null - override fun onBackPressed() { + private fun handleBackPressed() { val backStackEntries = supportFragmentManager.backStackEntryCount // If the two-pane layout does not have an editor open, going back should exit the app. if (isTwoPaneLayout && backStackEntries <= 1) { finish() return } - // Deselect the current tunnel on navigating back from the detail pane to the one-pane list. - if (!isTwoPaneLayout && backStackEntries == 1) { + + if (backStackEntries >= 1) supportFragmentManager.popBackStack() + + // Deselect the current tunnel on navigating back from the detail pane to the one-pane list. + if (backStackEntries == 1) selectedTunnel = null - return - } - super.onBackPressed() } override fun onBackStackChanged() { + val backStackEntries = supportFragmentManager.backStackEntryCount + backPressedCallback?.isEnabled = backStackEntries >= 1 if (actionBar == null) return // Do not show the home menu when the two-pane layout is at the detail view (see above). - val backStackEntries = supportFragmentManager.backStackEntryCount val minBackStackEntries = if (isTwoPaneLayout) 2 else 1 actionBar!!.setDisplayHomeAsUpEnabled(backStackEntries >= minBackStackEntries) } @@ -55,20 +59,10 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener super.onCreate(savedInstanceState) setContentView(R.layout.main_activity) actionBar = supportActionBar - isTwoPaneLayout = findViewById<View>(R.id.master_detail_wrapper) is LinearLayout + isTwoPaneLayout = findViewById<View?>(R.id.master_detail_wrapper) != null supportFragmentManager.addOnBackStackChangedListener(this) + backPressedCallback = onBackPressedDispatcher.addCallback(this) { handleBackPressed() } onBackStackChanged() - // Dispatch insets on back stack change - // This is required to ensure replaced fragments are also able to consume insets - findViewById<View>(R.id.master_detail_wrapper).setOnApplyWindowInsetsListener { _, insets -> - val fragmentManager = supportFragmentManager - fragmentManager.addOnBackStackChangedListener { - fragmentManager.fragments.forEach { - it.requireView().dispatchApplyWindowInsets(insets) - } - } - insets - } } override fun onCreateOptionsMenu(menu: Menu): Boolean { @@ -80,15 +74,16 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener return when (item.itemId) { android.R.id.home -> { // The back arrow in the action bar should act the same as the back button. - onBackPressed() + onBackPressedDispatcher.onBackPressed() true } + R.id.menu_action_edit -> { - supportFragmentManager.beginTransaction() - .replace(R.id.detail_container, TunnelEditorFragment()) - .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) - .addToBackStack(null) - .commit() + supportFragmentManager.commit { + replace(R.id.detail_container, TunnelEditorFragment()) + setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) + addToBackStack(null) + } true } // This menu item is handled by the editor fragment. @@ -97,18 +92,25 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener startActivity(Intent(this, SettingsActivity::class.java)) true } + else -> super.onOptionsItemSelected(item) } } - override fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, - newTunnel: ObservableTunnel?) { + override fun onSelectedTunnelChanged( + oldTunnel: ObservableTunnel?, + newTunnel: ObservableTunnel? + ): Boolean { val fragmentManager = supportFragmentManager + if (fragmentManager.isStateSaved) { + return false + } + val backStackEntries = fragmentManager.backStackEntryCount if (newTunnel == null) { // Clear everything off the back stack (all editors and detail fragments). fragmentManager.popBackStackImmediate(0, FragmentManager.POP_BACK_STACK_INCLUSIVE) - return + return true } if (backStackEntries == 2) { // Pop the editor off the back stack to reveal the detail fragment. Use the immediate @@ -116,11 +118,12 @@ class MainActivity : BaseActivity(), FragmentManager.OnBackStackChangedListener fragmentManager.popBackStackImmediate() } else if (backStackEntries == 0) { // Create and show a new detail fragment. - fragmentManager.beginTransaction() - .add(R.id.detail_container, TunnelDetailFragment()) - .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) - .addToBackStack(null) - .commit() + fragmentManager.commit { + add(R.id.detail_container, TunnelDetailFragment()) + setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) + addToBackStack(null) + } } + return true } } diff --git a/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt b/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt index 103b6b44..bd6e1f78 100644 --- a/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/SettingsActivity.kt @@ -1,58 +1,40 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.activity +import android.content.ComponentName import android.content.Intent -import android.content.pm.PackageManager import android.os.Build import android.os.Bundle -import android.util.SparseArray +import android.service.quicksettings.TileService import android.view.MenuItem -import androidx.core.app.ActivityCompat -import androidx.core.content.ContextCompat +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.commit +import androidx.lifecycle.lifecycleScope import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import com.wireguard.android.Application +import com.wireguard.android.QuickTileService import com.wireguard.android.R import com.wireguard.android.backend.WgQuickBackend -import com.wireguard.android.util.ModuleLoader -import java.util.ArrayList -import java.util.Arrays +import com.wireguard.android.preference.PreferencesPreferenceDataStore +import com.wireguard.android.util.AdminKnobs +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext /** * Interface for changing application-global persistent settings. */ -class SettingsActivity : ThemeChangeAwareActivity() { - private val permissionRequestCallbacks = SparseArray<(permissions: Array<String>, granted: IntArray) -> Unit>() - private var permissionRequestCounter = 0 - - fun ensurePermissions(permissions: Array<String>, cb: (permissions: Array<String>, granted: IntArray) -> Unit) { - val needPermissions: MutableList<String> = ArrayList(permissions.size) - permissions.forEach { - if (ContextCompat.checkSelfPermission(this, it) != PackageManager.PERMISSION_GRANTED) { - needPermissions.add(it) - } - } - if (needPermissions.isEmpty()) { - val granted = IntArray(permissions.size) - Arrays.fill(granted, PackageManager.PERMISSION_GRANTED) - cb.invoke(permissions, granted) - return - } - val idx = permissionRequestCounter++ - permissionRequestCallbacks.put(idx, cb) - ActivityCompat.requestPermissions(this, - needPermissions.toTypedArray(), idx) - } - +class SettingsActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) if (supportFragmentManager.findFragmentById(android.R.id.content) == null) { - supportFragmentManager.beginTransaction() - .add(android.R.id.content, SettingsFragment()) - .commit() + supportFragmentManager.commit { + add(android.R.id.content, SettingsFragment()) + } } } @@ -64,20 +46,17 @@ class SettingsActivity : ThemeChangeAwareActivity() { return super.onOptionsItemSelected(item) } - override fun onRequestPermissionsResult(requestCode: Int, - permissions: Array<String>, - grantResults: IntArray) { - val f = permissionRequestCallbacks[requestCode] - if (f != null) { - permissionRequestCallbacks.remove(requestCode) - f.invoke(permissions, grantResults) - } - } - class SettingsFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, key: String?) { + preferenceManager.preferenceDataStore = PreferencesPreferenceDataStore(lifecycleScope, Application.getPreferencesDataStore()) addPreferencesFromResource(R.xml.preferences) - preferenceScreen.initialExpandedChildrenCount = 4 + preferenceScreen.initialExpandedChildrenCount = 5 + + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || QuickTileService.isAdded) { + val quickTile = preferenceManager.findPreference<Preference>("quick_tile") + quickTile?.parent?.removePreference(quickTile) + --preferenceScreen.initialExpandedChildrenCount + } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { val darkTheme = preferenceManager.findPreference<Preference>("dark_theme") darkTheme?.parent?.removePreference(darkTheme) @@ -87,14 +66,18 @@ class SettingsActivity : ThemeChangeAwareActivity() { val remoteApps = preferenceManager.findPreference<Preference>("allow_remote_control_intents") remoteApps?.parent?.removePreference(remoteApps) } + if (AdminKnobs.disableConfigExport) { + val zipExporter = preferenceManager.findPreference<Preference>("zip_exporter") + zipExporter?.parent?.removePreference(zipExporter) + } val wgQuickOnlyPrefs = arrayOf( - preferenceManager.findPreference("tools_installer"), - preferenceManager.findPreference("restore_on_boot"), - preferenceManager.findPreference<Preference>("multiple_tunnels") + preferenceManager.findPreference("tools_installer"), + preferenceManager.findPreference("restore_on_boot"), + preferenceManager.findPreference<Preference>("multiple_tunnels") ).filterNotNull() wgQuickOnlyPrefs.forEach { it.isVisible = false } - Application.getBackendAsync().thenAccept { backend -> - if (backend is WgQuickBackend) { + lifecycleScope.launch { + if (Application.getBackend() is WgQuickBackend) { ++preferenceScreen.initialExpandedChildrenCount wgQuickOnlyPrefs.forEach { it.isVisible = true } } else { @@ -105,19 +88,19 @@ class SettingsActivity : ThemeChangeAwareActivity() { startActivity(Intent(requireContext(), LogViewerActivity::class.java)) true } - val moduleInstaller = preferenceManager.findPreference<Preference>("module_downloader") - val kernelModuleDisabler = preferenceManager.findPreference<Preference>("kernel_module_disabler") - moduleInstaller?.isVisible = false - if (ModuleLoader.isModuleLoaded()) { - moduleInstaller?.parent?.removePreference(moduleInstaller) - } else { - kernelModuleDisabler?.parent?.removePreference(kernelModuleDisabler) - Application.getAsyncWorker().runAsync(Application.getRootShell()::start).whenComplete { _, e -> - if (e == null) - moduleInstaller?.isVisible = true - else - moduleInstaller?.parent?.removePreference(moduleInstaller) + val kernelModuleEnabler = preferenceManager.findPreference<Preference>("kernel_module_enabler") + if (WgQuickBackend.hasKernelSupport()) { + lifecycleScope.launch { + if (Application.getBackend() !is WgQuickBackend) { + try { + withContext(Dispatchers.IO) { Application.getRootShell().start() } + } catch (_: Throwable) { + kernelModuleEnabler?.parent?.removePreference(kernelModuleEnabler) + } + } } + } else { + kernelModuleEnabler?.parent?.removePreference(kernelModuleEnabler) } } } diff --git a/ui/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.kt b/ui/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.kt deleted file mode 100644 index bd124cbc..00000000 --- a/ui/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ -package com.wireguard.android.activity - -import android.content.SharedPreferences -import android.content.SharedPreferences.OnSharedPreferenceChangeListener -import android.os.Build -import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity -import androidx.appcompat.app.AppCompatDelegate -import com.wireguard.android.Application - -abstract class ThemeChangeAwareActivity : AppCompatActivity(), OnSharedPreferenceChangeListener { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { - Application.getSharedPreferences().registerOnSharedPreferenceChangeListener(this) - } - } - - override fun onDestroy() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { - Application.getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this) - } - super.onDestroy() - } - - override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { - when (key) { - "dark_theme" -> { - AppCompatDelegate.setDefaultNightMode(if (sharedPreferences.getBoolean(key, false)) { - AppCompatDelegate.MODE_NIGHT_YES - } else { - AppCompatDelegate.MODE_NIGHT_NO - }) - recreate() - } - } - } -} diff --git a/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt index d3d4d4f9..bdf798ca 100644 --- a/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.kt @@ -1,10 +1,11 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.activity import android.os.Bundle +import androidx.fragment.app.commit import com.wireguard.android.fragment.TunnelEditorFragment import com.wireguard.android.model.ObservableTunnel @@ -15,13 +16,14 @@ class TunnelCreatorActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) if (supportFragmentManager.findFragmentById(android.R.id.content) == null) { - supportFragmentManager.beginTransaction() - .add(android.R.id.content, TunnelEditorFragment()) - .commit() + supportFragmentManager.commit { + add(android.R.id.content, TunnelEditorFragment()) + } } } - override fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?) { + override fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?): Boolean { finish() + return true } } diff --git a/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt index 44d81c01..59b9349f 100644 --- a/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.activity @@ -10,32 +10,54 @@ import android.os.Bundle import android.service.quicksettings.TileService import android.util.Log import android.widget.Toast +import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.lifecycleScope import com.wireguard.android.Application import com.wireguard.android.QuickTileService import com.wireguard.android.R +import com.wireguard.android.backend.GoBackend import com.wireguard.android.backend.Tunnel import com.wireguard.android.util.ErrorMessages +import kotlinx.coroutines.launch @RequiresApi(Build.VERSION_CODES.N) class TunnelToggleActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) + private val permissionActivityResultLauncher = + registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { toggleTunnelWithPermissionsResult() } + + private fun toggleTunnelWithPermissionsResult() { val tunnel = Application.getTunnelManager().lastUsedTunnel ?: return - tunnel.setStateAsync(Tunnel.State.TOGGLE).whenComplete { _, t -> - TileService.requestListeningState(this, ComponentName(this, QuickTileService::class.java)) - onToggleFinished(t) + lifecycleScope.launch { + try { + tunnel.setStateAsync(Tunnel.State.TOGGLE) + } catch (e: Throwable) { + TileService.requestListeningState(this@TunnelToggleActivity, ComponentName(this@TunnelToggleActivity, QuickTileService::class.java)) + val error = ErrorMessages[e] + val message = getString(R.string.toggle_error, error) + Log.e(TAG, message, e) + Toast.makeText(this@TunnelToggleActivity, message, Toast.LENGTH_LONG).show() + finishAffinity() + return@launch + } + TileService.requestListeningState(this@TunnelToggleActivity, ComponentName(this@TunnelToggleActivity, QuickTileService::class.java)) finishAffinity() } } - private fun onToggleFinished(throwable: Throwable?) { - if (throwable == null) return - val error = ErrorMessages[throwable] - val message = getString(R.string.toggle_error, error) - Log.e(TAG, message, throwable) - Toast.makeText(this, message, Toast.LENGTH_LONG).show() + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + lifecycleScope.launch { + if (Application.getBackend() is GoBackend) { + val intent = GoBackend.VpnService.prepare(this@TunnelToggleActivity) + if (intent != null) { + permissionActivityResultLauncher.launch(intent) + return@launch + } + } + toggleTunnelWithPermissionsResult() + } } companion object { diff --git a/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt new file mode 100644 index 00000000..4c86b4c8 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/activity/TvMainActivity.kt @@ -0,0 +1,445 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.activity + +import android.Manifest +import android.content.ActivityNotFoundException +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.net.Uri +import android.os.Build +import android.os.Bundle +import android.os.Environment +import android.os.storage.StorageManager +import android.os.storage.StorageVolume +import android.util.Log +import android.view.View +import android.widget.Toast +import androidx.activity.addCallback +import androidx.activity.result.contract.ActivityResultContracts +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.app.AppCompatDelegate +import androidx.core.content.ContextCompat +import androidx.core.content.getSystemService +import androidx.core.view.forEach +import androidx.databinding.DataBindingUtil +import androidx.databinding.Observable +import androidx.databinding.ObservableBoolean +import androidx.databinding.ObservableField +import androidx.lifecycle.lifecycleScope +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.wireguard.android.Application +import com.wireguard.android.R +import com.wireguard.android.backend.GoBackend +import com.wireguard.android.backend.Tunnel +import com.wireguard.android.databinding.Keyed +import com.wireguard.android.databinding.ObservableKeyedArrayList +import com.wireguard.android.databinding.ObservableKeyedRecyclerViewAdapter +import com.wireguard.android.databinding.TvActivityBinding +import com.wireguard.android.databinding.TvFileListItemBinding +import com.wireguard.android.databinding.TvTunnelListItemBinding +import com.wireguard.android.model.ObservableTunnel +import com.wireguard.android.util.ErrorMessages +import com.wireguard.android.util.QuantityFormatter +import com.wireguard.android.util.TunnelImporter +import com.wireguard.android.util.UserKnobs +import com.wireguard.android.util.applicationScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File + +class TvMainActivity : AppCompatActivity() { + private val tunnelFileImportResultLauncher = registerForActivityResult(object : ActivityResultContracts.GetContent() { + override fun createIntent(context: Context, input: String): Intent { + val intent = super.createIntent(context, input) + + /* AndroidTV now comes with stubs that do nothing but display a Toast less helpful than + * what we can do, so detect this and throw an exception that we can catch later. */ + val activitiesToResolveIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + context.packageManager.queryIntentActivities(intent, PackageManager.ResolveInfoFlags.of(PackageManager.MATCH_DEFAULT_ONLY.toLong())) + } else { + @Suppress("DEPRECATION") + context.packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY) + } + if (activitiesToResolveIntent.all { + val name = it.activityInfo.packageName + name.startsWith("com.google.android.tv.frameworkpackagestubs") || name.startsWith("com.android.tv.frameworkpackagestubs") + }) { + throw ActivityNotFoundException() + } + return intent + } + }) { data -> + if (data == null) return@registerForActivityResult + lifecycleScope.launch { + TunnelImporter.importTunnel(contentResolver, data) { + Toast.makeText(this@TvMainActivity, it, Toast.LENGTH_LONG).show() + } + } + } + private var pendingTunnel: ObservableTunnel? = null + private val permissionActivityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { + val tunnel = pendingTunnel + if (tunnel != null) + setTunnelStateWithPermissionsResult(tunnel) + pendingTunnel = null + } + + private fun setTunnelStateWithPermissionsResult(tunnel: ObservableTunnel) { + lifecycleScope.launch { + try { + tunnel.setStateAsync(Tunnel.State.TOGGLE) + } catch (e: Throwable) { + val error = ErrorMessages[e] + val message = getString(R.string.error_up, error) + Toast.makeText(this@TvMainActivity, message, Toast.LENGTH_LONG).show() + Log.e(TAG, message, e) + } + updateStats() + } + } + + private lateinit var binding: TvActivityBinding + private val isDeleting = ObservableBoolean() + private val files = ObservableKeyedArrayList<String, KeyedFile>() + private val filesRoot = ObservableField("") + + override fun onCreate(savedInstanceState: Bundle?) { + if (AppCompatDelegate.getDefaultNightMode() != AppCompatDelegate.MODE_NIGHT_YES) { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES) + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + applicationScope.launch { + UserKnobs.setDarkTheme(true) + } + } + } + super.onCreate(savedInstanceState) + binding = TvActivityBinding.inflate(layoutInflater) + lifecycleScope.launch { + binding.tunnels = Application.getTunnelManager().getTunnels() + if (binding.tunnels?.isEmpty() == true) + binding.importButton.requestFocus() + else + binding.tunnelList.requestFocus() + } + binding.isDeleting = isDeleting + binding.files = files + binding.filesRoot = filesRoot + val gridManager = binding.tunnelList.layoutManager as GridLayoutManager + gridManager.spanSizeLookup = SlatedSpanSizeLookup(gridManager) + binding.tunnelRowConfigurationHandler = object : ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler<TvTunnelListItemBinding, ObservableTunnel> { + override fun onConfigureRow(binding: TvTunnelListItemBinding, item: ObservableTunnel, position: Int) { + binding.isDeleting = isDeleting + binding.isFocused = ObservableBoolean() + binding.root.setOnFocusChangeListener { _, focused -> + binding.isFocused?.set(focused) + } + binding.root.setOnClickListener { + lifecycleScope.launch { + if (isDeleting.get()) { + try { + item.deleteAsync() + if (this@TvMainActivity.binding.tunnels?.isEmpty() != false) + isDeleting.set(false) + } catch (e: Throwable) { + val error = ErrorMessages[e] + val message = getString(R.string.config_delete_error, error) + Toast.makeText(this@TvMainActivity, message, Toast.LENGTH_LONG).show() + Log.e(TAG, message, e) + } + } else { + if (Application.getBackend() is GoBackend) { + val intent = GoBackend.VpnService.prepare(binding.root.context) + if (intent != null) { + pendingTunnel = item + permissionActivityResultLauncher.launch(intent) + return@launch + } + } + setTunnelStateWithPermissionsResult(item) + } + } + } + } + } + + binding.filesRowConfigurationHandler = object : ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler<TvFileListItemBinding, KeyedFile> { + override fun onConfigureRow(binding: TvFileListItemBinding, item: KeyedFile, position: Int) { + binding.root.setOnClickListener { + if (item.file.isDirectory) + navigateTo(item.file) + else { + val uri = Uri.fromFile(item.file) + files.clear() + filesRoot.set("") + lifecycleScope.launch { + TunnelImporter.importTunnel(contentResolver, uri) { + Toast.makeText(this@TvMainActivity, it, Toast.LENGTH_LONG).show() + } + } + runOnUiThread { + this@TvMainActivity.binding.tunnelList.requestFocus() + } + } + } + } + } + + binding.importButton.setOnClickListener { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + if (filesRoot.get()?.isEmpty() != false) { + navigateTo(File("/")) + runOnUiThread { + binding.filesList.requestFocus() + } + } else { + files.clear() + filesRoot.set("") + runOnUiThread { + binding.tunnelList.requestFocus() + } + } + } else { + try { + tunnelFileImportResultLauncher.launch("*/*") + } catch (_: Throwable) { + MaterialAlertDialogBuilder(binding.root.context).setMessage(R.string.tv_no_file_picker).setCancelable(false) + .setPositiveButton(android.R.string.ok) { _, _ -> + try { + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://webstoreredirect"))) + } catch (_: Throwable) { + } + }.show() + } + } + } + + binding.deleteButton.setOnClickListener { + isDeleting.set(!isDeleting.get()) + runOnUiThread { + binding.tunnelList.requestFocus() + } + } + + val backPressedCallback = onBackPressedDispatcher.addCallback(this) { handleBackPressed() } + val updateBackPressedCallback = object : Observable.OnPropertyChangedCallback() { + override fun onPropertyChanged(sender: Observable?, propertyId: Int) { + backPressedCallback.isEnabled = isDeleting.get() || filesRoot.get()?.isNotEmpty() == true + } + } + isDeleting.addOnPropertyChangedCallback(updateBackPressedCallback) + filesRoot.addOnPropertyChangedCallback(updateBackPressedCallback) + backPressedCallback.isEnabled = false + + binding.executePendingBindings() + setContentView(binding.root) + + lifecycleScope.launch { + while (true) { + updateStats() + delay(1000) + } + } + } + + private var pendingNavigation: File? = null + private val permissionRequestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { + val to = pendingNavigation + if (it && to != null) + navigateTo(to) + pendingNavigation = null + } + + private var cachedRoots: Collection<KeyedFile>? = null + + private suspend fun makeStorageRoots(): Collection<KeyedFile> = withContext(Dispatchers.IO) { + cachedRoots?.let { return@withContext it } + val list = HashSet<KeyedFile>() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + val storageManager: StorageManager = getSystemService() ?: return@withContext list + list.addAll(storageManager.storageVolumes.mapNotNull { volume -> + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + volume.directory?.let { KeyedFile(it, volume.getDescription(this@TvMainActivity)) } + } else { + KeyedFile((StorageVolume::class.java.getMethod("getPathFile").invoke(volume) as File), volume.getDescription(this@TvMainActivity)) + } + }) + } else { + @Suppress("DEPRECATION") + list.add(KeyedFile(Environment.getExternalStorageDirectory())) + try { + File("/storage").listFiles()?.forEach { + if (!it.isDirectory) return@forEach + try { + if (Environment.isExternalStorageRemovable(it)) { + list.add(KeyedFile(it)) + } + } catch (_: Throwable) { + } + } + } catch (_: Throwable) { + } + } + cachedRoots = list + list + } + + private fun isBelowCachedRoots(maybeChild: File): Boolean { + val cachedRoots = cachedRoots ?: return true + for (root in cachedRoots) { + if (maybeChild.canonicalPath.startsWith(root.file.canonicalPath)) + return false + } + return true + } + + private fun navigateTo(directory: File) { + require(Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) + + if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { + pendingNavigation = directory + permissionRequestPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE) + return + } + + lifecycleScope.launch { + if (isBelowCachedRoots(directory)) { + val roots = makeStorageRoots() + if (roots.count() == 1) { + navigateTo(roots.first().file) + return@launch + } + files.clear() + files.addAll(roots) + filesRoot.set(getString(R.string.tv_select_a_storage_drive)) + return@launch + } + + val newFiles = withContext(Dispatchers.IO) { + val newFiles = ArrayList<KeyedFile>() + try { + directory.parentFile?.let { + newFiles.add(KeyedFile(it, "../")) + } + val listing = directory.listFiles() ?: return@withContext null + listing.forEach { + if (it.extension == "conf" || it.extension == "zip" || it.isDirectory) + newFiles.add(KeyedFile(it)) + } + newFiles.sortWith { a, b -> + if (a.file.isDirectory && !b.file.isDirectory) -1 + else if (!a.file.isDirectory && b.file.isDirectory) 1 + else a.file.compareTo(b.file) + } + } catch (e: Throwable) { + Log.e(TAG, Log.getStackTraceString(e)) + } + newFiles + } + if (newFiles?.isEmpty() != false) + return@launch + files.clear() + files.addAll(newFiles) + filesRoot.set(directory.canonicalPath) + } + } + + private fun handleBackPressed() { + when { + isDeleting.get() -> { + isDeleting.set(false) + runOnUiThread { + binding.tunnelList.requestFocus() + } + } + + filesRoot.get()?.isNotEmpty() == true -> { + files.clear() + filesRoot.set("") + runOnUiThread { + binding.tunnelList.requestFocus() + } + } + } + } + + private suspend fun updateStats() { + binding.tunnelList.forEach { viewItem -> + val listItem = DataBindingUtil.findBinding<TvTunnelListItemBinding>(viewItem) + ?: return@forEach + try { + val tunnel = listItem.item!! + if (tunnel.state != Tunnel.State.UP || isDeleting.get()) { + throw Exception() + } + val statistics = tunnel.getStatisticsAsync() + val rx = statistics.totalRx() + val tx = statistics.totalTx() + listItem.tunnelTransfer.text = getString(R.string.transfer_rx_tx, QuantityFormatter.formatBytes(rx), QuantityFormatter.formatBytes(tx)) + listItem.tunnelTransfer.visibility = View.VISIBLE + } catch (_: Throwable) { + listItem.tunnelTransfer.visibility = View.GONE + listItem.tunnelTransfer.text = "" + } + } + } + + class KeyedFile(val file: File, private val forcedKey: String? = null) : Keyed<String> { + override val key: String + get() = forcedKey ?: if (file.isDirectory) "${file.name}/" else file.name + } + + private class SlatedSpanSizeLookup(private val gridManager: GridLayoutManager) : SpanSizeLookup() { + private val originalHeight = gridManager.spanCount + private var newWidth = 0 + private lateinit var sizeMap: Array<IntArray?> + + private fun emptyUnderIndex(index: Int, size: Int): Int { + sizeMap[size - 1]?.let { return it[index] } + val sizes = IntArray(size) + val oh = originalHeight + val nw = newWidth + var empties = 0 + for (i in 0 until size) { + val ox = (i + empties) / oh + val oy = (i + empties) % oh + var empty = 0 + for (j in oy + 1 until oh) { + val ni = nw * j + ox + if (ni < size) + break + empty++ + } + empties += empty + sizes[i] = empty + } + sizeMap[size - 1] = sizes + return sizes[index] + } + + override fun getSpanSize(position: Int): Int { + if (newWidth == 0) { + val child = gridManager.getChildAt(0) ?: return 1 + if (child.width == 0) return 1 + newWidth = gridManager.width / child.width + sizeMap = Array(originalHeight * newWidth - 1) { null } + } + val total = gridManager.itemCount + if (total >= originalHeight * newWidth || total == 0) + return 1 + return emptyUnderIndex(position, total) + 1 + } + } + + companion object { + private const val TAG = "WireGuard/TvMainActivity" + } +} diff --git a/ui/src/main/java/com/wireguard/android/configStore/ConfigStore.kt b/ui/src/main/java/com/wireguard/android/configStore/ConfigStore.kt index 6c381b69..7336e78f 100644 --- a/ui/src/main/java/com/wireguard/android/configStore/ConfigStore.kt +++ b/ui/src/main/java/com/wireguard/android/configStore/ConfigStore.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.configStore diff --git a/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt b/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt index 6fe2bece..17e3221b 100644 --- a/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt +++ b/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.configStore @@ -40,9 +40,9 @@ class FileConfigStore(private val context: Context) : ConfigStore { override fun enumerate(): Set<String> { return context.fileList() - .filter { it.endsWith(".conf") } - .map { it.substring(0, it.length - ".conf".length) } - .toSet() + .filter { it.endsWith(".conf") } + .map { it.substring(0, it.length - ".conf".length) } + .toSet() } private fun fileFor(name: String): File { diff --git a/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.kt b/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.kt index 055c2f06..afba41cb 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.kt +++ b/ui/src/main/java/com/wireguard/android/databinding/BindingAdapters.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.databinding @@ -23,10 +23,11 @@ import com.wireguard.android.R import com.wireguard.android.databinding.ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler import com.wireguard.android.widget.ToggleSwitch import com.wireguard.android.widget.ToggleSwitch.OnBeforeCheckedChangeListener +import com.wireguard.android.widget.TvCardView import com.wireguard.config.Attribute import com.wireguard.config.InetNetwork -import java9.util.Optional import java.net.InetAddress +import java.util.Optional /** * Static methods for use by generated code in the Android data binding library. @@ -46,9 +47,11 @@ object BindingAdapters { @JvmStatic @BindingAdapter("items", "layout", "fragment") - fun <E> setItems(view: LinearLayout, - oldList: ObservableList<E>?, oldLayoutId: Int, @Suppress("UNUSED_PARAMETER") oldFragment: Fragment?, - newList: ObservableList<E>?, newLayoutId: Int, newFragment: Fragment?) { + fun <E> setItems( + view: LinearLayout, + oldList: ObservableList<E>?, oldLayoutId: Int, @Suppress("UNUSED_PARAMETER") oldFragment: Fragment?, + newList: ObservableList<E>?, newLayoutId: Int, newFragment: Fragment? + ) { if (oldList === newList && oldLayoutId == newLayoutId) return var listener: ItemChangeListener<E>? = ListenerUtil.getListener(view, R.id.item_change_listener) @@ -72,9 +75,11 @@ object BindingAdapters { @JvmStatic @BindingAdapter("items", "layout") - fun <E> setItems(view: LinearLayout, - oldList: Iterable<E>?, oldLayoutId: Int, - newList: Iterable<E>?, newLayoutId: Int) { + fun <E> setItems( + view: LinearLayout, + oldList: Iterable<E>?, oldLayoutId: Int, + newList: Iterable<E>?, newLayoutId: Int + ) { if (oldList === newList && oldLayoutId == newLayoutId) return view.removeAllViews() @@ -92,11 +97,13 @@ object BindingAdapters { @JvmStatic @BindingAdapter(requireAll = false, value = ["items", "layout", "configurationHandler"]) - fun <K, E : Keyed<out K>> setItems(view: RecyclerView, - oldList: ObservableKeyedArrayList<K, E>?, oldLayoutId: Int, - @Suppress("UNUSED_PARAMETER") oldRowConfigurationHandler: RowConfigurationHandler<*, *>?, - newList: ObservableKeyedArrayList<K, E>?, newLayoutId: Int, - newRowConfigurationHandler: RowConfigurationHandler<*, *>?) { + fun <K, E : Keyed<out K>> setItems( + view: RecyclerView, + oldList: ObservableKeyedArrayList<K, E>?, oldLayoutId: Int, + @Suppress("UNUSED_PARAMETER") oldRowConfigurationHandler: RowConfigurationHandler<*, *>?, + newList: ObservableKeyedArrayList<K, E>?, newLayoutId: Int, + newRowConfigurationHandler: RowConfigurationHandler<*, *>? + ) { if (view.layoutManager == null) view.layoutManager = LinearLayoutManager(view.context, RecyclerView.VERTICAL, false) if (oldList === newList && oldLayoutId == newLayoutId) @@ -122,16 +129,20 @@ object BindingAdapters { @JvmStatic @BindingAdapter("onBeforeCheckedChanged") - fun setOnBeforeCheckedChanged(view: ToggleSwitch, - listener: OnBeforeCheckedChangeListener?) { + fun setOnBeforeCheckedChanged( + view: ToggleSwitch, + listener: OnBeforeCheckedChangeListener? + ) { view.setOnBeforeCheckedChangeListener(listener) } @JvmStatic @BindingAdapter("onFocusChange") - fun setOnFocusChange(view: EditText, - listener: View.OnFocusChangeListener?) { - view.setOnFocusChangeListener(listener) + fun setOnFocusChange( + view: EditText, + listener: View.OnFocusChangeListener? + ) { + view.onFocusChangeListener = listener } @JvmStatic @@ -153,13 +164,31 @@ object BindingAdapters { } @JvmStatic + @BindingAdapter("android:text") + fun setStringSetText(view: TextView, strings: Iterable<String?>?) { + view.text = if (strings != null) Attribute.join(strings) else "" + } + + @JvmStatic fun tryParseInt(s: String?): Int { if (s == null) return 0 return try { Integer.parseInt(s) - } catch (_: Exception) { + } catch (_: Throwable) { 0 } } + + @JvmStatic + @BindingAdapter("isUp") + fun setIsUp(card: TvCardView, up: Boolean) { + card.isUp = up + } + + @JvmStatic + @BindingAdapter("isDeleting") + fun setIsDeleting(card: TvCardView, deleting: Boolean) { + card.isDeleting = deleting + } } diff --git a/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.kt b/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.kt index 29784a75..da153bbe 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.kt +++ b/ui/src/main/java/com/wireguard/android/databinding/ItemChangeListener.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.databinding @@ -61,8 +61,10 @@ internal class ItemChangeListener<T>(private val container: ViewGroup, private v } } - override fun onItemRangeChanged(sender: ObservableList<T>, positionStart: Int, - itemCount: Int) { + override fun onItemRangeChanged( + sender: ObservableList<T>, positionStart: Int, + itemCount: Int + ) { val listener = weakListener.get() if (listener != null) { for (i in positionStart until positionStart + itemCount) { @@ -75,8 +77,10 @@ internal class ItemChangeListener<T>(private val container: ViewGroup, private v } } - override fun onItemRangeInserted(sender: ObservableList<T>, positionStart: Int, - itemCount: Int) { + override fun onItemRangeInserted( + sender: ObservableList<T>, positionStart: Int, + itemCount: Int + ) { val listener = weakListener.get() if (listener != null) { for (i in positionStart until positionStart + itemCount) @@ -86,8 +90,10 @@ internal class ItemChangeListener<T>(private val container: ViewGroup, private v } } - override fun onItemRangeMoved(sender: ObservableList<T>, fromPosition: Int, - toPosition: Int, itemCount: Int) { + override fun onItemRangeMoved( + sender: ObservableList<T>, fromPosition: Int, + toPosition: Int, itemCount: Int + ) { val listener = weakListener.get() if (listener != null) { val views = arrayOfNulls<View>(itemCount) @@ -99,8 +105,10 @@ internal class ItemChangeListener<T>(private val container: ViewGroup, private v } } - override fun onItemRangeRemoved(sender: ObservableList<T>, positionStart: Int, - itemCount: Int) { + override fun onItemRangeRemoved( + sender: ObservableList<T>, positionStart: Int, + itemCount: Int + ) { val listener = weakListener.get() if (listener != null) { listener.container.removeViews(positionStart, itemCount) diff --git a/ui/src/main/java/com/wireguard/android/databinding/Keyed.kt b/ui/src/main/java/com/wireguard/android/databinding/Keyed.kt index dd03e4c9..f91581d0 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/Keyed.kt +++ b/ui/src/main/java/com/wireguard/android/databinding/Keyed.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.databinding diff --git a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedArrayList.kt b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedArrayList.kt index c00f553c..947644b3 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedArrayList.kt +++ b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedArrayList.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.databinding diff --git a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt index 29d09fbc..91223ad1 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt +++ b/ui/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.databinding diff --git a/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt b/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt index 98e9e915..a09d726f 100644 --- a/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt +++ b/ui/src/main/java/com/wireguard/android/databinding/ObservableSortedKeyedArrayList.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.databinding diff --git a/ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt b/ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt index 17bdac04..78b9f3d7 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt @@ -1,10 +1,10 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.fragment -import android.content.Intent +import android.content.pm.PackageManager import android.graphics.drawable.GradientDrawable import android.os.Bundle import android.view.LayoutInflater @@ -12,13 +12,12 @@ import android.view.View import android.view.ViewGroup import android.view.ViewTreeObserver import android.widget.FrameLayout +import androidx.core.os.bundleOf +import androidx.fragment.app.setFragmentResult import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.google.zxing.integration.android.IntentIntegrator import com.wireguard.android.R -import com.wireguard.android.activity.TunnelCreatorActivity -import com.wireguard.android.util.requireTargetFragment import com.wireguard.android.util.resolveAttribute class AddTunnelsSheet : BottomSheetDialogFragment() { @@ -35,13 +34,15 @@ class AddTunnelsSheet : BottomSheetDialogFragment() { } } - override fun getTheme(): Int { - return R.style.BottomSheetDialogTheme - } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { if (savedInstanceState != null) dismiss() - return inflater.inflate(R.layout.add_tunnels_bottom_sheet, container, false) + val view = inflater.inflate(R.layout.add_tunnels_bottom_sheet, container, false) + if (activity?.packageManager?.hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY) != true) { + val qrcode = view.findViewById<View>(R.id.create_from_qrcode) + qrcode.isEnabled = false + qrcode.visibility = View.GONE + } + return view } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -71,7 +72,7 @@ class AddTunnelsSheet : BottomSheetDialogFragment() { } }) val gradientDrawable = GradientDrawable().apply { - setColor(requireContext().resolveAttribute(R.attr.colorBackground)) + setColor(requireContext().resolveAttribute(com.google.android.material.R.attr.colorSurface)) } view.background = gradientDrawable } @@ -82,23 +83,22 @@ class AddTunnelsSheet : BottomSheetDialogFragment() { } private fun onRequestCreateConfig() { - startActivity(Intent(activity, TunnelCreatorActivity::class.java)) + setFragmentResult(REQUEST_KEY_NEW_TUNNEL, bundleOf(REQUEST_METHOD to REQUEST_CREATE)) } private fun onRequestImportConfig() { - val intent = Intent(Intent.ACTION_GET_CONTENT).apply { - addCategory(Intent.CATEGORY_OPENABLE) - type = "*/*" - } - requireTargetFragment().startActivityForResult(intent, TunnelListFragment.REQUEST_IMPORT) + setFragmentResult(REQUEST_KEY_NEW_TUNNEL, bundleOf(REQUEST_METHOD to REQUEST_IMPORT)) } private fun onRequestScanQRCode() { - val integrator = IntentIntegrator.forSupportFragment(requireTargetFragment()).apply { - setOrientationLocked(false) - setBeepEnabled(false) - setPrompt(getString(R.string.qr_code_hint)) - } - integrator.initiateScan(listOf(IntentIntegrator.QR_CODE)) + setFragmentResult(REQUEST_KEY_NEW_TUNNEL, bundleOf(REQUEST_METHOD to REQUEST_SCAN)) + } + + companion object { + const val REQUEST_KEY_NEW_TUNNEL = "request_new_tunnel" + const val REQUEST_METHOD = "request_method" + const val REQUEST_CREATE = "request_create" + const val REQUEST_IMPORT = "request_import" + const val REQUEST_SCAN = "request_scan" } } diff --git a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt index 35bd3ce9..1cd19934 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt @@ -1,27 +1,35 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.fragment +import android.Manifest import android.app.Dialog -import android.content.Intent +import android.content.pm.PackageInfo +import android.content.pm.PackageManager +import android.content.pm.PackageManager.PackageInfoFlags +import android.os.Build import android.os.Bundle import android.widget.Button import android.widget.Toast import androidx.appcompat.app.AlertDialog +import androidx.core.os.bundleOf import androidx.databinding.Observable import androidx.fragment.app.DialogFragment -import androidx.fragment.app.Fragment +import androidx.fragment.app.setFragmentResult +import androidx.lifecycle.lifecycleScope +import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.tabs.TabLayout -import com.wireguard.android.Application import com.wireguard.android.BR import com.wireguard.android.R import com.wireguard.android.databinding.AppListDialogFragmentBinding import com.wireguard.android.databinding.ObservableKeyedArrayList import com.wireguard.android.model.ApplicationData import com.wireguard.android.util.ErrorMessages -import com.wireguard.android.util.requireTargetFragment +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext class AppListDialogFragment : DialogFragment() { private val appData = ObservableKeyedArrayList<String, ApplicationData>() @@ -33,44 +41,57 @@ class AppListDialogFragment : DialogFragment() { private fun loadData() { val activity = activity ?: return val pm = activity.packageManager - Application.getAsyncWorker().supplyAsync<List<ApplicationData>> { - val launcherIntent = Intent(Intent.ACTION_MAIN, null) - launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER) - val resolveInfos = pm.queryIntentActivities(launcherIntent, 0) - val applicationData: MutableList<ApplicationData> = ArrayList() - resolveInfos.forEach { - val packageName = it.activityInfo.packageName - val appData = ApplicationData(it.loadIcon(pm), it.loadLabel(pm).toString(), packageName, currentlySelectedApps.contains(packageName)) - applicationData.add(appData) - appData.addOnPropertyChangedCallback(object : Observable.OnPropertyChangedCallback() { - override fun onPropertyChanged(sender: Observable?, propertyId: Int) { - if (propertyId == BR.selected) - setButtonText() + lifecycleScope.launch(Dispatchers.Default) { + try { + val applicationData: MutableList<ApplicationData> = ArrayList() + withContext(Dispatchers.IO) { + val packageInfos = getPackagesHoldingPermissions(pm, arrayOf(Manifest.permission.INTERNET)) + packageInfos.forEach { + val packageName = it.packageName + val appInfo = it.applicationInfo + val appData = + ApplicationData(appInfo.loadIcon(pm), appInfo.loadLabel(pm).toString(), packageName, currentlySelectedApps.contains(packageName)) + applicationData.add(appData) + appData.addOnPropertyChangedCallback(object : Observable.OnPropertyChangedCallback() { + override fun onPropertyChanged(sender: Observable?, propertyId: Int) { + if (propertyId == BR.selected) + setButtonText() + } + }) } - }) - } - applicationData.sortWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name }) - applicationData - }.whenComplete { data, throwable -> - if (data != null) { - appData.clear() - appData.addAll(data) - } else { - val error = ErrorMessages[throwable] - val message = activity.getString(R.string.error_fetching_apps, error) - Toast.makeText(activity, message, Toast.LENGTH_LONG).show() - dismissAllowingStateLoss() + } + applicationData.sortWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name }) + withContext(Dispatchers.Main.immediate) { + appData.clear() + appData.addAll(applicationData) + setButtonText() + } + } catch (e: Throwable) { + withContext(Dispatchers.Main.immediate) { + val error = ErrorMessages[e] + val message = activity.getString(R.string.error_fetching_apps, error) + Toast.makeText(activity, message, Toast.LENGTH_LONG).show() + dismissAllowingStateLoss() + } } } } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - require(requireTargetFragment() is AppSelectionListener) { "${requireTargetFragment()} must implement AppSelectionListener" } currentlySelectedApps = (arguments?.getStringArrayList(KEY_SELECTED_APPS) ?: emptyList()) initiallyExcluded = arguments?.getBoolean(KEY_IS_EXCLUDED) ?: true } + private fun getPackagesHoldingPermissions(pm: PackageManager, permissions: Array<String>): List<PackageInfo> { + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + pm.getPackagesHoldingPermissions(permissions, PackageInfoFlags.of(0L)) + } else { + @Suppress("DEPRECATION") + pm.getPackagesHoldingPermissions(permissions, 0) + } + } + private fun setButtonText() { val numSelected = appData.count { it.isSelected } button?.text = if (numSelected == 0) @@ -83,7 +104,7 @@ class AppListDialogFragment : DialogFragment() { } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val alertDialogBuilder = AlertDialog.Builder(requireActivity()) + val alertDialogBuilder = MaterialAlertDialogBuilder(requireActivity()) val binding = AppListDialogFragmentBinding.inflate(requireActivity().layoutInflater, null, false) binding.executePendingBindings() alertDialogBuilder.setView(binding.root) @@ -123,23 +144,25 @@ class AppListDialogFragment : DialogFragment() { selectedApps.add(data.packageName) } } - (requireTargetFragment() as AppSelectionListener).onSelectedAppsSelected(selectedApps, tabs?.selectedTabPosition == 0) + setFragmentResult( + REQUEST_SELECTION, bundleOf( + KEY_SELECTED_APPS to selectedApps.toTypedArray(), + KEY_IS_EXCLUDED to (tabs?.selectedTabPosition == 0) + ) + ) dismiss() } - interface AppSelectionListener { - fun onSelectedAppsSelected(selectedApps: List<String>, isExcluded: Boolean) - } - companion object { - private const val KEY_SELECTED_APPS = "selected_apps" - private const val KEY_IS_EXCLUDED = "is_excluded" - fun <T> newInstance(selectedApps: ArrayList<String?>?, isExcluded: Boolean, target: T): AppListDialogFragment where T : Fragment?, T : AppSelectionListener? { + const val KEY_SELECTED_APPS = "selected_apps" + const val KEY_IS_EXCLUDED = "is_excluded" + const val REQUEST_SELECTION = "request_selection" + + fun newInstance(selectedApps: ArrayList<String?>?, isExcluded: Boolean): AppListDialogFragment { val extras = Bundle() extras.putStringArrayList(KEY_SELECTED_APPS, selectedApps) extras.putBoolean(KEY_IS_EXCLUDED, isExcluded) val fragment = AppListDialogFragment() - fragment.setTargetFragment(target, 0) fragment.arguments = extras return fragment } diff --git a/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt index 82802623..d5c1723f 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt @@ -1,66 +1,60 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.fragment import android.content.Context -import android.content.Intent import android.util.Log import android.view.View import android.widget.Toast +import androidx.activity.result.contract.ActivityResultContracts import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.fragment.app.Fragment +import androidx.lifecycle.lifecycleScope import com.google.android.material.snackbar.Snackbar import com.wireguard.android.Application import com.wireguard.android.R import com.wireguard.android.activity.BaseActivity import com.wireguard.android.activity.BaseActivity.OnSelectedTunnelChangedListener -import com.wireguard.android.backend.Backend import com.wireguard.android.backend.GoBackend import com.wireguard.android.backend.Tunnel import com.wireguard.android.databinding.TunnelDetailFragmentBinding import com.wireguard.android.databinding.TunnelListItemBinding import com.wireguard.android.model.ObservableTunnel import com.wireguard.android.util.ErrorMessages +import kotlinx.coroutines.launch /** * Base class for fragments that need to know the currently-selected tunnel. Only does anything when * attached to a `BaseActivity`. */ abstract class BaseFragment : Fragment(), OnSelectedTunnelChangedListener { - private var baseActivity: BaseActivity? = null private var pendingTunnel: ObservableTunnel? = null private var pendingTunnelUp: Boolean? = null + private val permissionActivityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { + val tunnel = pendingTunnel + val checked = pendingTunnelUp + if (tunnel != null && checked != null) + setTunnelStateWithPermissionsResult(tunnel, checked) + pendingTunnel = null + pendingTunnelUp = null + } + protected var selectedTunnel: ObservableTunnel? - get() = baseActivity?.selectedTunnel + get() = (activity as? BaseActivity)?.selectedTunnel protected set(tunnel) { - baseActivity?.selectedTunnel = tunnel + (activity as? BaseActivity)?.selectedTunnel = tunnel } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - super.onActivityResult(requestCode, resultCode, data) - if (requestCode == REQUEST_CODE_VPN_PERMISSION) { - if (pendingTunnel != null && pendingTunnelUp != null) setTunnelStateWithPermissionsResult(pendingTunnel!!, pendingTunnelUp!!) - pendingTunnel = null - pendingTunnelUp = null - } - } - override fun onAttach(context: Context) { super.onAttach(context) - if (context is BaseActivity) { - baseActivity = context - baseActivity?.addOnSelectedTunnelChangedListener(this) - } else { - baseActivity = null - } + (activity as? BaseActivity)?.addOnSelectedTunnelChangedListener(this) } override fun onDetach() { - baseActivity?.removeOnSelectedTunnelChangedListener(this) - baseActivity = null + (activity as? BaseActivity)?.removeOnSelectedTunnelChangedListener(this) super.onDetach() } @@ -70,14 +64,23 @@ abstract class BaseFragment : Fragment(), OnSelectedTunnelChangedListener { is TunnelListItemBinding -> binding.item else -> return } ?: return - Application.getBackendAsync().thenAccept { backend: Backend? -> - if (backend is GoBackend) { - val intent = GoBackend.VpnService.prepare(view.context) - if (intent != null) { - pendingTunnel = tunnel - pendingTunnelUp = checked - startActivityForResult(intent, REQUEST_CODE_VPN_PERMISSION) - return@thenAccept + val activity = activity ?: return + activity.lifecycleScope.launch { + if (Application.getBackend() is GoBackend) { + try { + val intent = GoBackend.VpnService.prepare(activity) + if (intent != null) { + pendingTunnel = tunnel + pendingTunnelUp = checked + permissionActivityResultLauncher.launch(intent) + return@launch + } + } catch (e: Throwable) { + val message = activity.getString(R.string.error_prepare, ErrorMessages[e]) + Snackbar.make(view, message, Snackbar.LENGTH_LONG) + .setAnchorView(view.findViewById(R.id.create_fab)) + .show() + Log.e(TAG, message, e) } } setTunnelStateWithPermissionsResult(tunnel, checked) @@ -85,24 +88,27 @@ abstract class BaseFragment : Fragment(), OnSelectedTunnelChangedListener { } private fun setTunnelStateWithPermissionsResult(tunnel: ObservableTunnel, checked: Boolean) { - tunnel.setStateAsync(Tunnel.State.of(checked)).whenComplete { _, throwable -> - if (throwable == null) return@whenComplete - val error = ErrorMessages[throwable] - val messageResId = if (checked) R.string.error_up else R.string.error_down - val message = requireContext().getString(messageResId, error) - val view = view - if (view != null) - Snackbar.make(view, message, Snackbar.LENGTH_LONG) - .setAnchorView(view.findViewById<View>(R.id.create_fab)) + val activity = activity ?: return + activity.lifecycleScope.launch { + try { + tunnel.setStateAsync(Tunnel.State.of(checked)) + } catch (e: Throwable) { + val error = ErrorMessages[e] + val messageResId = if (checked) R.string.error_up else R.string.error_down + val message = activity.getString(messageResId, error) + val view = view + if (view != null) + Snackbar.make(view, message, Snackbar.LENGTH_LONG) + .setAnchorView(view.findViewById(R.id.create_fab)) .show() - else - Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show() - Log.e(TAG, message, throwable) + else + Toast.makeText(activity, message, Toast.LENGTH_LONG).show() + Log.e(TAG, message, e) + } } } companion object { - private const val REQUEST_CODE_VPN_PERMISSION = 23491 private const val TAG = "WireGuard/BaseFragment" } } diff --git a/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt index d1b01944..34c96505 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.kt @@ -1,21 +1,21 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.fragment import android.app.Dialog -import android.content.Context -import android.content.DialogInterface import android.os.Bundle -import android.view.inputmethod.InputMethodManager -import androidx.appcompat.app.AlertDialog +import android.view.WindowManager import androidx.fragment.app.DialogFragment +import androidx.lifecycle.lifecycleScope +import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.wireguard.android.Application import com.wireguard.android.R import com.wireguard.android.databinding.ConfigNamingDialogFragmentBinding import com.wireguard.config.BadConfigException import com.wireguard.config.Config +import kotlinx.coroutines.launch import java.io.ByteArrayInputStream import java.io.IOException import java.nio.charset.StandardCharsets @@ -23,33 +23,28 @@ import java.nio.charset.StandardCharsets class ConfigNamingDialogFragment : DialogFragment() { private var binding: ConfigNamingDialogFragmentBinding? = null private var config: Config? = null - private var imm: InputMethodManager? = null private fun createTunnelAndDismiss() { - binding?.let { - val name = it.tunnelNameText.text.toString() - Application.getTunnelManager().create(name, config).whenComplete { tunnel, throwable -> - if (tunnel != null) { - dismiss() - } else { - it.tunnelNameTextLayout.error = throwable.message - } + val binding = binding ?: return + val activity = activity ?: return + val name = binding.tunnelNameText.text.toString() + activity.lifecycleScope.launch { + try { + Application.getTunnelManager().create(name, config) + dismiss() + } catch (e: Throwable) { + binding.tunnelNameTextLayout.error = e.message } } } - override fun dismiss() { - setKeyboardVisible(false) - super.dismiss() - } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val configText = requireArguments().getString(KEY_CONFIG_TEXT) val configBytes = configText!!.toByteArray(StandardCharsets.UTF_8) config = try { Config.parse(ByteArrayInputStream(configBytes)) - } catch (e: Exception) { + } catch (e: Throwable) { when (e) { is BadConfigException, is IOException -> throw IllegalArgumentException("Invalid config passed to ${javaClass.simpleName}", e) else -> throw e @@ -59,40 +54,23 @@ class ConfigNamingDialogFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val activity = requireActivity() - imm = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager - val alertDialogBuilder = AlertDialog.Builder(activity) + val alertDialogBuilder = MaterialAlertDialogBuilder(activity) alertDialogBuilder.setTitle(R.string.import_from_qr_code) binding = ConfigNamingDialogFragmentBinding.inflate(activity.layoutInflater, null, false) binding?.apply { executePendingBindings() alertDialogBuilder.setView(root) } - alertDialogBuilder.setPositiveButton(R.string.create_tunnel, null) + alertDialogBuilder.setPositiveButton(R.string.create_tunnel) { _, _ -> createTunnelAndDismiss() } alertDialogBuilder.setNegativeButton(R.string.cancel) { _, _ -> dismiss() } - return alertDialogBuilder.create() - } - - override fun onResume() { - super.onResume() - val dialog = dialog as AlertDialog? - if (dialog != null) { - dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { createTunnelAndDismiss() } - setKeyboardVisible(true) - } - } - - private fun setKeyboardVisible(visible: Boolean) { - if (visible) { - imm!!.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0) - } else if (binding != null) { - imm!!.hideSoftInputFromWindow(binding!!.tunnelNameText.windowToken, 0) - } + val dialog = alertDialogBuilder.create() + dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE) + return dialog } companion object { private const val KEY_CONFIG_TEXT = "config_text" - @JvmStatic fun newInstance(configText: String?): ConfigNamingDialogFragment { val extras = Bundle() extras.putString(KEY_CONFIG_TEXT, configText) diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt index 2b5a4ba6..81d8e8c6 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.fragment @@ -8,57 +8,51 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.Menu import android.view.MenuInflater +import android.view.MenuItem import android.view.View import android.view.ViewGroup +import androidx.core.view.MenuProvider import androidx.databinding.DataBindingUtil +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.lifecycleScope import com.wireguard.android.R import com.wireguard.android.backend.Tunnel import com.wireguard.android.databinding.TunnelDetailFragmentBinding import com.wireguard.android.databinding.TunnelDetailPeerBinding import com.wireguard.android.model.ObservableTunnel -import com.wireguard.android.widget.EdgeToEdge.setUpRoot -import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent -import java.util.Timer -import java.util.TimerTask +import com.wireguard.android.util.QuantityFormatter +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch /** * Fragment that shows details about a specific tunnel. */ -class TunnelDetailFragment : BaseFragment() { +class TunnelDetailFragment : BaseFragment(), MenuProvider { private var binding: TunnelDetailFragmentBinding? = null private var lastState = Tunnel.State.TOGGLE - private var timer: Timer? = null + private var timerActive = true - private fun formatBytes(bytes: Long): String { - val context = requireContext() - return when { - bytes < 1024 -> context.getString(R.string.transfer_bytes, bytes) - bytes < 1024 * 1024 -> context.getString(R.string.transfer_kibibytes, bytes / 1024.0) - bytes < 1024 * 1024 * 1024 -> context.getString(R.string.transfer_mibibytes, bytes / (1024.0 * 1024.0)) - bytes < 1024 * 1024 * 1024 * 1024L -> context.getString(R.string.transfer_gibibytes, bytes / (1024.0 * 1024.0 * 1024.0)) - else -> context.getString(R.string.transfer_tibibytes, bytes / (1024.0 * 1024.0 * 1024.0) / 1024.0) - } - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setHasOptionsMenu(true) + override fun onMenuItemSelected(menuItem: MenuItem): Boolean { + return false } - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - inflater.inflate(R.menu.tunnel_detail, menu) + override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { + menuInflater.inflate(R.menu.tunnel_detail, menu) } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle?): View? { + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { super.onCreateView(inflater, container, savedInstanceState) binding = TunnelDetailFragmentBinding.inflate(inflater, container, false) - binding?.apply { - executePendingBindings() - setUpRoot(root as ViewGroup) - setUpScrollingContent(root as ViewGroup, null) - } - return binding!!.root + binding?.executePendingBindings() + return binding?.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED) } override fun onDestroyView() { @@ -68,28 +62,36 @@ class TunnelDetailFragment : BaseFragment() { override fun onResume() { super.onResume() - timer = Timer() - timer!!.scheduleAtFixedRate(object : TimerTask() { - override fun run() { + timerActive = true + lifecycleScope.launch { + while (timerActive) { updateStats() + delay(1000) } - }, 0, 1000) + } } override fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?) { - binding ?: return - binding!!.tunnel = newTunnel - if (newTunnel == null) binding!!.config = null else newTunnel.configAsync.thenAccept { config -> binding!!.config = config } + val binding = binding ?: return + binding.tunnel = newTunnel + if (newTunnel == null) { + binding.config = null + } else { + lifecycleScope.launch { + try { + binding.config = newTunnel.getConfigAsync() + } catch (_: Throwable) { + binding.config = null + } + } + } lastState = Tunnel.State.TOGGLE - updateStats() + lifecycleScope.launch { updateStats() } } override fun onStop() { + timerActive = false super.onStop() - if (timer != null) { - timer!!.cancel() - timer = null - } } override fun onViewStateRestored(savedInstanceState: Bundle?) { @@ -99,36 +101,49 @@ class TunnelDetailFragment : BaseFragment() { super.onViewStateRestored(savedInstanceState) } - private fun updateStats() { - if (binding == null || !isResumed) return - val tunnel = binding!!.tunnel ?: return + private suspend fun updateStats() { + val binding = binding ?: return + val tunnel = binding.tunnel ?: return + if (!isResumed) return val state = tunnel.state if (state != Tunnel.State.UP && lastState == state) return lastState = state - tunnel.statisticsAsync.whenComplete { statistics, throwable -> - if (throwable != null) { - for (i in 0 until binding!!.peersLayout.childCount) { - val peer: TunnelDetailPeerBinding = DataBindingUtil.getBinding(binding!!.peersLayout.getChildAt(i)) - ?: continue - peer.transferLabel.visibility = View.GONE - peer.transferText.visibility = View.GONE - } - return@whenComplete - } - for (i in 0 until binding!!.peersLayout.childCount) { - val peer: TunnelDetailPeerBinding = DataBindingUtil.getBinding(binding!!.peersLayout.getChildAt(i)) - ?: continue + try { + val statistics = tunnel.getStatisticsAsync() + for (i in 0 until binding.peersLayout.childCount) { + val peer: TunnelDetailPeerBinding = DataBindingUtil.getBinding(binding.peersLayout.getChildAt(i)) + ?: continue val publicKey = peer.item!!.publicKey - val rx = statistics.peerRx(publicKey) - val tx = statistics.peerTx(publicKey) - if (rx == 0L && tx == 0L) { + val peerStats = statistics.peer(publicKey) + if (peerStats == null || (peerStats.rxBytes == 0L && peerStats.txBytes == 0L)) { peer.transferLabel.visibility = View.GONE peer.transferText.visibility = View.GONE - continue + } else { + peer.transferText.text = getString( + R.string.transfer_rx_tx, + QuantityFormatter.formatBytes(peerStats.rxBytes), + QuantityFormatter.formatBytes(peerStats.txBytes) + ) + peer.transferLabel.visibility = View.VISIBLE + peer.transferText.visibility = View.VISIBLE } - peer.transferText.text = requireContext().getString(R.string.transfer_rx_tx, formatBytes(rx), formatBytes(tx)) - peer.transferLabel.visibility = View.VISIBLE - peer.transferText.visibility = View.VISIBLE + if (peerStats == null || peerStats.latestHandshakeEpochMillis == 0L) { + peer.latestHandshakeLabel.visibility = View.GONE + peer.latestHandshakeText.visibility = View.GONE + } else { + peer.latestHandshakeText.text = QuantityFormatter.formatEpochAgo(peerStats.latestHandshakeEpochMillis) + peer.latestHandshakeLabel.visibility = View.VISIBLE + peer.latestHandshakeText.visibility = View.VISIBLE + } + } + } catch (e: Throwable) { + for (i in 0 until binding.peersLayout.childCount) { + val peer: TunnelDetailPeerBinding = DataBindingUtil.getBinding(binding.peersLayout.getChildAt(i)) + ?: continue + peer.transferLabel.visibility = View.GONE + peer.transferText.visibility = View.GONE + peer.latestHandshakeLabel.visibility = View.GONE + peer.latestHandshakeText.visibility = View.GONE } } } diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt index dc1b8aa2..edf4b226 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.fragment @@ -18,118 +18,106 @@ import android.view.WindowManager import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.Toast +import androidx.core.os.BundleCompat +import androidx.core.view.MenuProvider +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.lifecycleScope import com.google.android.material.snackbar.Snackbar import com.wireguard.android.Application import com.wireguard.android.R import com.wireguard.android.backend.Tunnel import com.wireguard.android.databinding.TunnelEditorFragmentBinding -import com.wireguard.android.fragment.AppListDialogFragment.AppSelectionListener import com.wireguard.android.model.ObservableTunnel +import com.wireguard.android.util.AdminKnobs import com.wireguard.android.util.BiometricAuthenticator import com.wireguard.android.util.ErrorMessages import com.wireguard.android.viewmodel.ConfigProxy -import com.wireguard.android.widget.EdgeToEdge.setUpRoot -import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent import com.wireguard.config.Config +import kotlinx.coroutines.launch /** * Fragment for editing a WireGuard configuration. */ -class TunnelEditorFragment : BaseFragment(), AppSelectionListener { +class TunnelEditorFragment : BaseFragment(), MenuProvider { private var haveShownKeys = false private var binding: TunnelEditorFragmentBinding? = null private var tunnel: ObservableTunnel? = null + private fun onConfigLoaded(config: Config) { binding?.config = ConfigProxy(config) } private fun onConfigSaved(savedTunnel: Tunnel, throwable: Throwable?) { - val message: String + val ctx = activity ?: Application.get() if (throwable == null) { - message = getString(R.string.config_save_success, savedTunnel.name) + val message = ctx.getString(R.string.config_save_success, savedTunnel.name) Log.d(TAG, message) - Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show() + Toast.makeText(ctx, message, Toast.LENGTH_SHORT).show() onFinished() } else { val error = ErrorMessages[throwable] - message = getString(R.string.config_save_error, savedTunnel.name, error) + val message = ctx.getString(R.string.config_save_error, savedTunnel.name, error) Log.e(TAG, message, throwable) - binding?.let { - Snackbar.make(it.mainContainer, message, Snackbar.LENGTH_LONG).show() - } + val binding = binding + if (binding != null) + Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show() + else + Toast.makeText(ctx, message, Toast.LENGTH_SHORT).show() } } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setHasOptionsMenu(true) - } - - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - inflater.inflate(R.menu.config_editor, menu) + override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { + menuInflater.inflate(R.menu.config_editor, menu) } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle?): View? { + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { super.onCreateView(inflater, container, savedInstanceState) binding = TunnelEditorFragmentBinding.inflate(inflater, container, false) binding?.apply { executePendingBindings() - setUpRoot(root as ViewGroup) - setUpScrollingContent(mainContainer, null) privateKeyTextLayout.setEndIconOnClickListener { config?.`interface`?.generateKeyPair() } } return binding?.root } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED) + } + override fun onDestroyView() { activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) binding = null super.onDestroyView() } - override fun onSelectedAppsSelected(selectedApps: List<String>, isExcluded: Boolean) { - requireNotNull(binding) { "Tried to set excluded/included apps while no view was loaded" } - if (isExcluded) { - binding!!.config!!.`interface`.includedApplications.clear() - binding!!.config!!.`interface`.excludedApplications.apply { - clear() - addAll(selectedApps) - } - } else { - binding!!.config!!.`interface`.excludedApplications.clear() - binding!!.config!!.`interface`.includedApplications.apply { - clear() - addAll(selectedApps) - } - } - } - private fun onFinished() { // Hide the keyboard; it rarely goes away on its own. val activity = activity ?: return val focusedView = activity.currentFocus if (focusedView != null) { val inputManager = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager - inputManager?.hideSoftInputFromWindow(focusedView.windowToken, - InputMethodManager.HIDE_NOT_ALWAYS) - } - // Tell the activity to finish itself or go back to the detail view. - activity.runOnUiThread { - // TODO(smaeul): Remove this hack when fixing the Config ViewModel - // The selected tunnel has to actually change, but we have to remember this one. - val savedTunnel = tunnel - if (savedTunnel === selectedTunnel) selectedTunnel = null - selectedTunnel = savedTunnel + inputManager?.hideSoftInputFromWindow( + focusedView.windowToken, + InputMethodManager.HIDE_NOT_ALWAYS + ) } + parentFragmentManager.popBackStackImmediate() + + // If we just made a new one, save it to select the details page. + if (selectedTunnel != tunnel) + selectedTunnel = tunnel } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - if (item.itemId == R.id.menu_action_save) { + override fun onMenuItemSelected(menuItem: MenuItem): Boolean { + if (menuItem.itemId == R.id.menu_action_save) { binding ?: return false val newConfig = try { binding!!.config!!.resolve() - } catch (e: Exception) { + } catch (e: Throwable) { val error = ErrorMessages[e] val tunnelName = if (tunnel == null) binding!!.name else tunnel!!.name val message = getString(R.string.config_save_error, tunnelName, error) @@ -137,25 +125,43 @@ class TunnelEditorFragment : BaseFragment(), AppSelectionListener { Snackbar.make(binding!!.mainContainer, error, Snackbar.LENGTH_LONG).show() return false } - when { - tunnel == null -> { - Log.d(TAG, "Attempting to create new tunnel " + binding!!.name) - val manager = Application.getTunnelManager() - manager.create(binding!!.name!!, newConfig).whenComplete(this::onTunnelCreated) - } - tunnel!!.name != binding!!.name -> { - Log.d(TAG, "Attempting to rename tunnel to " + binding!!.name) - tunnel!!.setNameAsync(binding!!.name!!).whenComplete { _, t -> onTunnelRenamed(tunnel!!, newConfig, t) } - } - else -> { - Log.d(TAG, "Attempting to save config of " + tunnel!!.name) - tunnel!!.setConfigAsync(newConfig) - .whenComplete { _, t -> onConfigSaved(tunnel!!, t) } + val activity = requireActivity() + activity.lifecycleScope.launch { + when { + tunnel == null -> { + Log.d(TAG, "Attempting to create new tunnel " + binding!!.name) + val manager = Application.getTunnelManager() + try { + onTunnelCreated(manager.create(binding!!.name!!, newConfig), null) + } catch (e: Throwable) { + onTunnelCreated(null, e) + } + } + + tunnel!!.name != binding!!.name -> { + Log.d(TAG, "Attempting to rename tunnel to " + binding!!.name) + try { + tunnel!!.setNameAsync(binding!!.name!!) + onTunnelRenamed(tunnel!!, newConfig, null) + } catch (e: Throwable) { + onTunnelRenamed(tunnel!!, newConfig, e) + } + } + + else -> { + Log.d(TAG, "Attempting to save config of " + tunnel!!.name) + try { + tunnel!!.setConfigAsync(newConfig) + onConfigSaved(tunnel!!, null) + } catch (e: Throwable) { + onConfigSaved(tunnel!!, e) + } + } } } return true } - return super.onOptionsItemSelected(item) + return false } @Suppress("UNUSED_PARAMETER") @@ -168,8 +174,26 @@ class TunnelEditorFragment : BaseFragment(), AppSelectionListener { if (selectedApps.isNotEmpty()) isExcluded = false } - val fragment = AppListDialogFragment.newInstance(selectedApps, isExcluded, this) - fragment.show(parentFragmentManager, null) + val fragment = AppListDialogFragment.newInstance(selectedApps, isExcluded) + childFragmentManager.setFragmentResultListener(AppListDialogFragment.REQUEST_SELECTION, viewLifecycleOwner) { _, bundle -> + requireNotNull(binding) { "Tried to set excluded/included apps while no view was loaded" } + val newSelections = requireNotNull(bundle.getStringArray(AppListDialogFragment.KEY_SELECTED_APPS)) + val excluded = requireNotNull(bundle.getBoolean(AppListDialogFragment.KEY_IS_EXCLUDED)) + if (excluded) { + binding!!.config!!.`interface`.includedApplications.clear() + binding!!.config!!.`interface`.excludedApplications.apply { + clear() + addAll(newSelections) + } + } else { + binding!!.config!!.`interface`.excludedApplications.clear() + binding!!.config!!.`interface`.includedApplications.apply { + clear() + addAll(newSelections) + } + } + } + fragment.show(childFragmentManager, null) } } @@ -179,53 +203,71 @@ class TunnelEditorFragment : BaseFragment(), AppSelectionListener { super.onSaveInstanceState(outState) } - override fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, - newTunnel: ObservableTunnel?) { + override fun onSelectedTunnelChanged( + oldTunnel: ObservableTunnel?, + newTunnel: ObservableTunnel? + ) { tunnel = newTunnel if (binding == null) return binding!!.config = ConfigProxy() if (tunnel != null) { binding!!.name = tunnel!!.name - tunnel!!.configAsync.thenAccept(this::onConfigLoaded) + lifecycleScope.launch { + try { + onConfigLoaded(tunnel!!.getConfigAsync()) + } catch (_: Throwable) { + } + } } else { binding!!.name = "" } } - private fun onTunnelCreated(newTunnel: ObservableTunnel, throwable: Throwable?) { - val message: String + private fun onTunnelCreated(newTunnel: ObservableTunnel?, throwable: Throwable?) { + val ctx = activity ?: Application.get() if (throwable == null) { tunnel = newTunnel - message = getString(R.string.tunnel_create_success, tunnel!!.name) + val message = ctx.getString(R.string.tunnel_create_success, tunnel!!.name) Log.d(TAG, message) - Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show() + Toast.makeText(ctx, message, Toast.LENGTH_SHORT).show() onFinished() } else { val error = ErrorMessages[throwable] - message = getString(R.string.tunnel_create_error, error) + val message = ctx.getString(R.string.tunnel_create_error, error) Log.e(TAG, message, throwable) - binding?.let { - Snackbar.make(it.mainContainer, message, Snackbar.LENGTH_LONG).show() - } + val binding = binding + if (binding != null) + Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show() + else + Toast.makeText(ctx, message, Toast.LENGTH_SHORT).show() } } - private fun onTunnelRenamed(renamedTunnel: ObservableTunnel, newConfig: Config, - throwable: Throwable?) { - val message: String + private suspend fun onTunnelRenamed( + renamedTunnel: ObservableTunnel, newConfig: Config, + throwable: Throwable? + ) { + val ctx = activity ?: Application.get() if (throwable == null) { - message = getString(R.string.tunnel_rename_success, renamedTunnel.name) + val message = ctx.getString(R.string.tunnel_rename_success, renamedTunnel.name) Log.d(TAG, message) // Now save the rest of configuration changes. Log.d(TAG, "Attempting to save config of renamed tunnel " + tunnel!!.name) - renamedTunnel.setConfigAsync(newConfig).whenComplete { _, t -> onConfigSaved(renamedTunnel, t) } + try { + renamedTunnel.setConfigAsync(newConfig) + onConfigSaved(renamedTunnel, null) + } catch (e: Throwable) { + onConfigSaved(renamedTunnel, e) + } } else { val error = ErrorMessages[throwable] - message = getString(R.string.tunnel_rename_error, error) + val message = ctx.getString(R.string.tunnel_rename_error, error) Log.e(TAG, message, throwable) - binding?.let { - Snackbar.make(it.mainContainer, message, Snackbar.LENGTH_LONG).show() - } + val binding = binding + if (binding != null) + Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show() + else + Toast.makeText(ctx, message, Toast.LENGTH_SHORT).show() } } @@ -236,7 +278,7 @@ class TunnelEditorFragment : BaseFragment(), AppSelectionListener { onSelectedTunnelChanged(null, selectedTunnel) } else { tunnel = selectedTunnel - val config: ConfigProxy = savedInstanceState.getParcelable(KEY_LOCAL_CONFIG)!! + val config = BundleCompat.getParcelable(savedInstanceState, KEY_LOCAL_CONFIG, ConfigProxy::class.java)!! val originalName = savedInstanceState.getString(KEY_ORIGINAL_NAME) if (tunnel != null && tunnel!!.name != originalName) onSelectedTunnelChanged(null, tunnel) else binding!!.config = config } @@ -252,6 +294,7 @@ class TunnelEditorFragment : BaseFragment(), AppSelectionListener { val edit = view as? EditText ?: return if (edit.inputType == InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS or InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) return if (!haveShownKeys && edit.text.isNotEmpty()) { + if (AdminKnobs.disableConfigExport) return showingAuthenticator = true BiometricAuthenticator.authenticate(R.string.biometric_prompt_private_key_title, this) { showingAuthenticator = false @@ -260,13 +303,16 @@ class TunnelEditorFragment : BaseFragment(), AppSelectionListener { haveShownKeys = true showPrivateKey(edit) } + is BiometricAuthenticator.Result.Failure -> { Snackbar.make( - binding!!.mainContainer, - it.message, - Snackbar.LENGTH_SHORT + binding!!.mainContainer, + it.message, + Snackbar.LENGTH_SHORT ).show() } + + is BiometricAuthenticator.Result.Cancelled -> {} } } } else { diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt index f19c7c2c..cba7c476 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt @@ -1,49 +1,47 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.fragment -import android.annotation.SuppressLint -import android.app.Activity import android.content.Intent import android.content.res.Resources -import android.net.Uri import android.os.Bundle -import android.provider.OpenableColumns import android.util.Log import android.view.LayoutInflater import android.view.Menu import android.view.MenuItem import android.view.View import android.view.ViewGroup +import android.view.animation.Animation +import android.view.animation.AnimationUtils +import android.widget.Toast +import androidx.activity.OnBackPressedCallback +import androidx.activity.addCallback +import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.view.ActionMode +import androidx.lifecycle.lifecycleScope import com.google.android.material.snackbar.Snackbar -import com.google.zxing.integration.android.IntentIntegrator +import com.google.zxing.qrcode.QRCodeReader +import com.journeyapps.barcodescanner.ScanContract +import com.journeyapps.barcodescanner.ScanOptions import com.wireguard.android.Application import com.wireguard.android.R +import com.wireguard.android.activity.TunnelCreatorActivity import com.wireguard.android.databinding.ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler import com.wireguard.android.databinding.TunnelListFragmentBinding import com.wireguard.android.databinding.TunnelListItemBinding -import com.wireguard.android.fragment.ConfigNamingDialogFragment.Companion.newInstance import com.wireguard.android.model.ObservableTunnel +import com.wireguard.android.updater.SnackbarUpdateShower import com.wireguard.android.util.ErrorMessages -import com.wireguard.android.widget.EdgeToEdge.setUpFAB -import com.wireguard.android.widget.EdgeToEdge.setUpRoot -import com.wireguard.android.widget.EdgeToEdge.setUpScrollingContent +import com.wireguard.android.util.QrCodeFromFileScanner +import com.wireguard.android.util.TunnelImporter import com.wireguard.android.widget.MultiselectableRelativeLayout -import com.wireguard.config.Config -import java9.util.concurrent.CompletableFuture -import java.io.BufferedReader -import java.io.ByteArrayInputStream -import java.io.InputStreamReader -import java.nio.charset.StandardCharsets -import java.util.ArrayList -import java.util.HashSet -import java.util.Locale -import java.util.zip.ZipEntry -import java.util.zip.ZipInputStream +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.async +import kotlinx.coroutines.awaitAll +import kotlinx.coroutines.launch /** * Fragment containing a list of known WireGuard tunnels. It allows creating and deleting tunnels. @@ -51,123 +49,42 @@ import java.util.zip.ZipInputStream class TunnelListFragment : BaseFragment() { private val actionModeListener = ActionModeListener() private var actionMode: ActionMode? = null + private var backPressedCallback: OnBackPressedCallback? = null private var binding: TunnelListFragmentBinding? = null - private fun importTunnel(configText: String) { - try { - // Ensure the config text is parseable before proceeding… - Config.parse(ByteArrayInputStream(configText.toByteArray(StandardCharsets.UTF_8))) - - // Config text is valid, now create the tunnel… - newInstance(configText).show(parentFragmentManager, null) - } catch (e: Exception) { - onTunnelImportFinished(emptyList(), listOf<Throwable>(e)) - } - } - - private fun importTunnel(uri: Uri?) { - val activity = activity - if (activity == null || uri == null) { - return - } - val contentResolver = activity.contentResolver - - val futureTunnels = ArrayList<CompletableFuture<ObservableTunnel>>() - val throwables = ArrayList<Throwable>() - Application.getAsyncWorker().supplyAsync { - val columns = arrayOf(OpenableColumns.DISPLAY_NAME) - var name = "" - contentResolver.query(uri, columns, null, null, null)?.use { cursor -> - if (cursor.moveToFirst() && !cursor.isNull(0)) { - name = cursor.getString(0) - } - } - if (name.isEmpty()) { - name = Uri.decode(uri.lastPathSegment) - } - var idx = name.lastIndexOf('/') - if (idx >= 0) { - require(idx < name.length - 1) { resources.getString(R.string.illegal_filename_error, name) } - name = name.substring(idx + 1) - } - val isZip = name.toLowerCase(Locale.ROOT).endsWith(".zip") - if (name.toLowerCase(Locale.ROOT).endsWith(".conf")) { - name = name.substring(0, name.length - ".conf".length) - } else { - require(isZip) { resources.getString(R.string.bad_extension_error) } - } - - if (isZip) { - ZipInputStream(contentResolver.openInputStream(uri)).use { zip -> - val reader = BufferedReader(InputStreamReader(zip, StandardCharsets.UTF_8)) - var entry: ZipEntry? - while (true) { - entry = zip.nextEntry ?: break - name = entry.name - idx = name.lastIndexOf('/') - if (idx >= 0) { - if (idx >= name.length - 1) { - continue - } - name = name.substring(name.lastIndexOf('/') + 1) - } - if (name.toLowerCase(Locale.ROOT).endsWith(".conf")) { - name = name.substring(0, name.length - ".conf".length) - } else { - continue - } - try { - Config.parse(reader) - } catch (e: Exception) { - throwables.add(e) - null - }?.let { - futureTunnels.add(Application.getTunnelManager().create(name, it).toCompletableFuture()) - } - } + private val tunnelFileImportResultLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { data -> + if (data == null) return@registerForActivityResult + val activity = activity ?: return@registerForActivityResult + val contentResolver = activity.contentResolver ?: return@registerForActivityResult + activity.lifecycleScope.launch { + if (QrCodeFromFileScanner.validContentType(contentResolver, data)) { + try { + val qrCodeFromFileScanner = QrCodeFromFileScanner(contentResolver, QRCodeReader()) + val result = qrCodeFromFileScanner.scan(data) + TunnelImporter.importTunnel(parentFragmentManager, result.text) { showSnackbar(it) } + } catch (e: Exception) { + val error = ErrorMessages[e] + val message = Application.get().resources.getString(R.string.import_error, error) + Log.e(TAG, message, e) + showSnackbar(message) } } else { - futureTunnels.add( - Application.getTunnelManager().create( - name, - Config.parse(contentResolver.openInputStream(uri)!!) - ).toCompletableFuture() - ) - } - - if (futureTunnels.isEmpty()) { - if (throwables.size == 1) { - throw throwables[0] - } else { - require(throwables.isNotEmpty()) { resources.getString(R.string.no_configs_error) } - } + TunnelImporter.importTunnel(contentResolver, data) { showSnackbar(it) } } - CompletableFuture.allOf(*futureTunnels.toTypedArray()) - }.whenComplete { future, exception -> - if (exception != null) { - onTunnelImportFinished(emptyList(), listOf(exception)) - } else { - future.whenComplete { _, _ -> - val tunnels = mutableListOf<ObservableTunnel>() - for (futureTunnel in futureTunnels) { - val tunnel: ObservableTunnel? = try { - futureTunnel.getNow(null) - } catch (e: Exception) { - throwables.add(e) - null - } + } + } - if (tunnel != null) { - tunnels.add(tunnel) - } - } - onTunnelImportFinished(tunnels, throwables) - } - } + private val qrImportResultLauncher = registerForActivityResult(ScanContract()) { result -> + val qrCode = result.contents + val activity = activity + if (qrCode != null && activity != null) { + activity.lifecycleScope.launch { TunnelImporter.importTunnel(parentFragmentManager, qrCode) { showSnackbar(it) } } } } - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) + private val snackbarUpdateShower = SnackbarUpdateShower(this) + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) if (savedInstanceState != null) { val checkedItems = savedInstanceState.getIntegerArrayList(CHECKED_ITEMS) if (checkedItems != null) { @@ -176,40 +93,46 @@ class TunnelListFragment : BaseFragment() { } } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - when (requestCode) { - REQUEST_IMPORT -> { - if (resultCode == Activity.RESULT_OK && data != null) importTunnel(data.data) - return - } - IntentIntegrator.REQUEST_CODE -> { - val result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data) - if (result != null && result.contents != null) { - importTunnel(result.contents) - } - return - } - else -> super.onActivityResult(requestCode, resultCode, data) - } - } - - @SuppressLint("ClickableViewAccessibility") - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle?): View? { + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { super.onCreateView(inflater, container, savedInstanceState) binding = TunnelListFragmentBinding.inflate(inflater, container, false) + val bottomSheet = AddTunnelsSheet() binding?.apply { createFab.setOnClickListener { - val bottomSheet = AddTunnelsSheet() - bottomSheet.setTargetFragment(fragment, REQUEST_TARGET_FRAGMENT) - bottomSheet.show(parentFragmentManager, "BOTTOM_SHEET") + if (childFragmentManager.findFragmentByTag("BOTTOM_SHEET") != null) + return@setOnClickListener + childFragmentManager.setFragmentResultListener(AddTunnelsSheet.REQUEST_KEY_NEW_TUNNEL, viewLifecycleOwner) { _, bundle -> + when (bundle.getString(AddTunnelsSheet.REQUEST_METHOD)) { + AddTunnelsSheet.REQUEST_CREATE -> { + startActivity(Intent(requireActivity(), TunnelCreatorActivity::class.java)) + } + + AddTunnelsSheet.REQUEST_IMPORT -> { + tunnelFileImportResultLauncher.launch("*/*") + } + + AddTunnelsSheet.REQUEST_SCAN -> { + qrImportResultLauncher.launch( + ScanOptions() + .setOrientationLocked(false) + .setBeepEnabled(false) + .setPrompt(getString(R.string.qr_code_hint)) + ) + } + } + } + bottomSheet.showNow(childFragmentManager, "BOTTOM_SHEET") } executePendingBindings() - setUpRoot(root as ViewGroup) - setUpFAB(createFab) - setUpScrollingContent(tunnelList, createFab) + snackbarUpdateShower.attach(mainContainer, createFab) } - return binding!!.root + backPressedCallback = requireActivity().onBackPressedDispatcher.addCallback(this) { actionMode?.finish() } + backPressedCallback?.isEnabled = false + + return binding?.root } override fun onDestroyView() { @@ -224,41 +147,23 @@ class TunnelListFragment : BaseFragment() { override fun onSelectedTunnelChanged(oldTunnel: ObservableTunnel?, newTunnel: ObservableTunnel?) { binding ?: return - Application.getTunnelManager().tunnels.thenAccept { tunnels -> - if (newTunnel != null) viewForTunnel(newTunnel, tunnels).setSingleSelected(true) - if (oldTunnel != null) viewForTunnel(oldTunnel, tunnels).setSingleSelected(false) + lifecycleScope.launch { + val tunnels = Application.getTunnelManager().getTunnels() + if (newTunnel != null) viewForTunnel(newTunnel, tunnels)?.setSingleSelected(true) + if (oldTunnel != null) viewForTunnel(oldTunnel, tunnels)?.setSingleSelected(false) } } private fun onTunnelDeletionFinished(count: Int, throwable: Throwable?) { val message: String + val ctx = activity ?: Application.get() if (throwable == null) { - message = resources.getQuantityString(R.plurals.delete_success, count, count) + message = ctx.resources.getQuantityString(R.plurals.delete_success, count, count) } else { val error = ErrorMessages[throwable] - message = resources.getQuantityString(R.plurals.delete_error, count, count, error) - Log.e(TAG, message, throwable) - } - showSnackbar(message) - } - - private fun onTunnelImportFinished(tunnels: List<ObservableTunnel>, throwables: Collection<Throwable>) { - var message = "" - for (throwable in throwables) { - val error = ErrorMessages[throwable] - message = getString(R.string.import_error, error) + message = ctx.resources.getQuantityString(R.plurals.delete_error, count, count, error) Log.e(TAG, message, throwable) } - if (tunnels.size == 1 && throwables.isEmpty()) - message = getString(R.string.import_success, tunnels[0].name) - else if (tunnels.isEmpty() && throwables.size == 1) - else if (throwables.isEmpty()) - message = resources.getQuantityString(R.plurals.import_total_success, - tunnels.size, tunnels.size) - else if (!throwables.isEmpty()) - message = resources.getQuantityString(R.plurals.import_partial_success, - tunnels.size + throwables.size, - tunnels.size, tunnels.size + throwables.size) showSnackbar(message) } @@ -266,11 +171,10 @@ class TunnelListFragment : BaseFragment() { super.onViewStateRestored(savedInstanceState) binding ?: return binding!!.fragment = this - Application.getTunnelManager().tunnels.thenAccept { tunnels -> binding!!.tunnels = tunnels } - val parent = this + lifecycleScope.launch { binding!!.tunnels = Application.getTunnelManager().getTunnels() } binding!!.rowConfigurationHandler = object : RowConfigurationHandler<TunnelListItemBinding, ObservableTunnel> { override fun onConfigureRow(binding: TunnelListItemBinding, item: ObservableTunnel, position: Int) { - binding.fragment = parent + binding.fragment = this@TunnelListFragment binding.root.setOnClickListener { if (actionMode == null) { selectedTunnel = item @@ -291,15 +195,17 @@ class TunnelListFragment : BaseFragment() { } private fun showSnackbar(message: CharSequence) { - binding?.let { - Snackbar.make(it.mainContainer, message, Snackbar.LENGTH_LONG) - .setAnchorView(it.createFab) - .show() - } + val binding = binding + if (binding != null) + Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG) + .setAnchorView(binding.createFab) + .show() + else + Toast.makeText(activity ?: Application.get(), message, Toast.LENGTH_SHORT).show() } - private fun viewForTunnel(tunnel: ObservableTunnel, tunnels: List<*>): MultiselectableRelativeLayout { - return binding!!.tunnelList.findViewHolderForAdapterPosition(tunnels.indexOf(tunnel))!!.itemView as MultiselectableRelativeLayout + private fun viewForTunnel(tunnel: ObservableTunnel, tunnels: List<*>): MultiselectableRelativeLayout? { + return binding?.tunnelList?.findViewHolderForAdapterPosition(tunnels.indexOf(tunnel))?.itemView as? MultiselectableRelativeLayout } private inner class ActionModeListener : ActionMode.Callback { @@ -313,36 +219,50 @@ class TunnelListFragment : BaseFragment() { override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean { return when (item.itemId) { R.id.menu_action_delete -> { + val activity = activity ?: return true val copyCheckedItems = HashSet(checkedItems) - Application.getTunnelManager().tunnels.thenAccept { tunnels -> - val tunnelsToDelete = ArrayList<ObservableTunnel>() - for (position in copyCheckedItems) tunnelsToDelete.add(tunnels[position]) - val futures = tunnelsToDelete.map { it.delete().toCompletableFuture() }.toTypedArray() - CompletableFuture.allOf(*futures) - .thenApply { futures.size } - .whenComplete(this@TunnelListFragment::onTunnelDeletionFinished) + binding?.createFab?.apply { + visibility = View.VISIBLE + scaleX = 1f + scaleY = 1f + } + activity.lifecycleScope.launch { + try { + val tunnels = Application.getTunnelManager().getTunnels() + val tunnelsToDelete = ArrayList<ObservableTunnel>() + for (position in copyCheckedItems) tunnelsToDelete.add(tunnels[position]) + val futures = tunnelsToDelete.map { async(SupervisorJob()) { it.deleteAsync() } } + onTunnelDeletionFinished(futures.awaitAll().size, null) + } catch (e: Throwable) { + onTunnelDeletionFinished(0, e) + } } checkedItems.clear() mode.finish() true } + R.id.menu_action_select_all -> { - Application.getTunnelManager().tunnels.thenAccept { tunnels -> + lifecycleScope.launch { + val tunnels = Application.getTunnelManager().getTunnels() for (i in 0 until tunnels.size) { setItemChecked(i, true) } } true } + else -> false } } override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean { actionMode = mode + backPressedCallback?.isEnabled = true if (activity != null) { resources = activity!!.resources } + animateFab(binding?.createFab, false) mode.menuInflater.inflate(R.menu.tunnel_list_action_mode, menu) binding?.tunnelList?.adapter?.notifyDataSetChanged() return true @@ -350,9 +270,11 @@ class TunnelListFragment : BaseFragment() { override fun onDestroyActionMode(mode: ActionMode) { actionMode = null + backPressedCallback?.isEnabled = false resources = null + animateFab(binding?.createFab, true) checkedItems.clear() - binding!!.tunnelList.adapter!!.notifyDataSetChanged() + binding?.tunnelList?.adapter?.notifyDataSetChanged() } override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean { @@ -368,7 +290,7 @@ class TunnelListFragment : BaseFragment() { } val adapter = if (binding == null) null else binding!!.tunnelList.adapter if (actionMode == null && !checkedItems.isEmpty() && activity != null) { - (activity as AppCompatActivity?)!!.startSupportActionMode(this) + (activity as AppCompatActivity).startSupportActionMode(this) } else if (actionMode != null && checkedItems.isEmpty()) { actionMode!!.finish() } @@ -391,11 +313,29 @@ class TunnelListFragment : BaseFragment() { mode.title = resources!!.getQuantityString(R.plurals.delete_title, count, count) } } + + private fun animateFab(view: View?, show: Boolean) { + view ?: return + val animation = AnimationUtils.loadAnimation( + context, if (show) R.anim.scale_up else R.anim.scale_down + ) + animation.setAnimationListener(object : Animation.AnimationListener { + override fun onAnimationRepeat(animation: Animation?) { + } + + override fun onAnimationEnd(animation: Animation?) { + if (!show) view.visibility = View.GONE + } + + override fun onAnimationStart(animation: Animation?) { + if (show) view.visibility = View.VISIBLE + } + }) + view.startAnimation(animation) + } } companion object { - const val REQUEST_IMPORT = 1 - private const val REQUEST_TARGET_FRAGMENT = 2 private const val CHECKED_ITEMS = "CHECKED_ITEMS" private const val TAG = "WireGuard/TunnelListFragment" } diff --git a/ui/src/main/java/com/wireguard/android/model/ApplicationData.kt b/ui/src/main/java/com/wireguard/android/model/ApplicationData.kt index e0961f04..f3892424 100644 --- a/ui/src/main/java/com/wireguard/android/model/ApplicationData.kt +++ b/ui/src/main/java/com/wireguard/android/model/ApplicationData.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.model diff --git a/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt b/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt index e7134c51..aa237aee 100644 --- a/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt +++ b/ui/src/main/java/com/wireguard/android/model/ObservableTunnel.kt @@ -1,28 +1,30 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.model +import android.util.Log import androidx.databinding.BaseObservable import androidx.databinding.Bindable import com.wireguard.android.BR import com.wireguard.android.backend.Statistics import com.wireguard.android.backend.Tunnel import com.wireguard.android.databinding.Keyed -import com.wireguard.android.util.ExceptionLoggers +import com.wireguard.android.util.applicationScope import com.wireguard.config.Config -import java9.util.concurrent.CompletableFuture -import java9.util.concurrent.CompletionStage +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext /** * Encapsulates the volatile and nonvolatile state of a WireGuard tunnel. */ class ObservableTunnel internal constructor( - private val manager: TunnelManager, - private var name: String, - config: Config?, - state: Tunnel.State + private val manager: TunnelManager, + private var name: String, + config: Config?, + state: Tunnel.State ) : BaseObservable(), Keyed<String>, Tunnel { override val key get() = name @@ -30,10 +32,12 @@ class ObservableTunnel internal constructor( @Bindable override fun getName() = name - fun setNameAsync(name: String): CompletionStage<String> = if (name != this.name) - manager.setTunnelName(this, name) - else - CompletableFuture.completedFuture(this.name) + suspend fun setNameAsync(name: String): String = withContext(Dispatchers.Main.immediate) { + if (name != this@ObservableTunnel.name) + manager.setTunnelName(this@ObservableTunnel, name) + else + this@ObservableTunnel.name + } fun onNameChanged(name: String): String { this.name = name @@ -57,31 +61,42 @@ class ObservableTunnel internal constructor( return state } - fun setStateAsync(state: Tunnel.State): CompletionStage<Tunnel.State> = if (state != this.state) - manager.setTunnelState(this, state) - else - CompletableFuture.completedFuture(this.state) + suspend fun setStateAsync(state: Tunnel.State): Tunnel.State = withContext(Dispatchers.Main.immediate) { + if (state != this@ObservableTunnel.state) + manager.setTunnelState(this@ObservableTunnel, state) + else + this@ObservableTunnel.state + } @get:Bindable var config = config get() { if (field == null) - manager.getTunnelConfig(this).whenComplete(ExceptionLoggers.E) + // Opportunistically fetch this if we don't have a cached one, and rely on data bindings to update it eventually + applicationScope.launch { + try { + manager.getTunnelConfig(this@ObservableTunnel) + } catch (e: Throwable) { + Log.e(TAG, Log.getStackTraceString(e)) + } + } return field } private set - val configAsync: CompletionStage<Config> - get() = if (config == null) - manager.getTunnelConfig(this) - else - CompletableFuture.completedFuture(config) + suspend fun getConfigAsync(): Config = withContext(Dispatchers.Main.immediate) { + config ?: manager.getTunnelConfig(this@ObservableTunnel) + } - fun setConfigAsync(config: Config): CompletionStage<Config> = if (config != this.config) - manager.setTunnelConfig(this, config) - else - CompletableFuture.completedFuture(this.config) + suspend fun setConfigAsync(config: Config): Config = withContext(Dispatchers.Main.immediate) { + this@ObservableTunnel.config.let { + if (config != it) + manager.setTunnelConfig(this@ObservableTunnel, config) + else + it + } + } fun onConfigChanged(config: Config?): Config? { this.config = config @@ -93,17 +108,27 @@ class ObservableTunnel internal constructor( @get:Bindable var statistics: Statistics? = null get() { - if (field == null || field!!.isStale) - manager.getTunnelStatistics(this).whenComplete(ExceptionLoggers.E) + if (field == null || field?.isStale != false) + // Opportunistically fetch this if we don't have a cached one, and rely on data bindings to update it eventually + applicationScope.launch { + try { + manager.getTunnelStatistics(this@ObservableTunnel) + } catch (e: Throwable) { + Log.e(TAG, Log.getStackTraceString(e)) + } + } return field } private set - val statisticsAsync: CompletionStage<Statistics> - get() = if (statistics == null || statistics!!.isStale) - manager.getTunnelStatistics(this) - else - CompletableFuture.completedFuture(statistics) + suspend fun getStatisticsAsync(): Statistics = withContext(Dispatchers.Main.immediate) { + statistics.let { + if (it == null || it.isStale) + manager.getTunnelStatistics(this@ObservableTunnel) + else + it + } + } fun onStatisticsChanged(statistics: Statistics?): Statistics? { this.statistics = statistics @@ -112,5 +137,10 @@ class ObservableTunnel internal constructor( } - fun delete(): CompletionStage<Void> = manager.delete(this) + suspend fun deleteAsync() = manager.delete(this) + + + companion object { + private const val TAG = "WireGuard/ObservableTunnel" + } } diff --git a/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt b/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt index 9fb96cab..e6b46a54 100644 --- a/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt +++ b/ui/src/main/java/com/wireguard/android/model/TunnelComparator.kt @@ -1,12 +1,10 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.model -import java.util.Locale - object TunnelComparator : Comparator<String> { private class NaturalSortString(originalString: String) { class NaturalSortToken(val maybeString: String?, val maybeNumber: Int?) : Comparable<NaturalSortToken> { @@ -29,7 +27,7 @@ object TunnelComparator : Comparator<String> { val tokens: MutableList<NaturalSortToken> = ArrayList() init { - for (s in NATURAL_SORT_DIGIT_FINDER.findAll(originalString.split(WHITESPACE_FINDER).joinToString(" ").toLowerCase(Locale.ENGLISH))) { + for (s in NATURAL_SORT_DIGIT_FINDER.findAll(originalString.split(WHITESPACE_FINDER).joinToString(" ").lowercase())) { try { val n = s.value.toInt() tokens.add(NaturalSortToken(null, n)) diff --git a/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt b/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt index 5091ed3b..ba873fa6 100644 --- a/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt +++ b/ui/src/main/java/com/wireguard/android/model/TunnelManager.kt @@ -1,20 +1,19 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.model -import android.annotation.SuppressLint import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.os.Build +import android.util.Log +import android.widget.Toast import androidx.databinding.BaseObservable import androidx.databinding.Bindable import com.wireguard.android.Application.Companion.get -import com.wireguard.android.Application.Companion.getAsyncWorker import com.wireguard.android.Application.Companion.getBackend -import com.wireguard.android.Application.Companion.getSharedPreferences import com.wireguard.android.Application.Companion.getTunnelManager import com.wireguard.android.BR import com.wireguard.android.R @@ -22,145 +21,149 @@ import com.wireguard.android.backend.Statistics import com.wireguard.android.backend.Tunnel import com.wireguard.android.configStore.ConfigStore import com.wireguard.android.databinding.ObservableSortedKeyedArrayList -import com.wireguard.android.util.ExceptionLoggers +import com.wireguard.android.util.ErrorMessages +import com.wireguard.android.util.UserKnobs +import com.wireguard.android.util.applicationScope import com.wireguard.config.Config -import java9.util.concurrent.CompletableFuture -import java9.util.concurrent.CompletionStage -import java.util.ArrayList +import kotlinx.coroutines.CompletableDeferred +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.async +import kotlinx.coroutines.awaitAll +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext /** * Maintains and mediates changes to the set of available WireGuard tunnels, */ class TunnelManager(private val configStore: ConfigStore) : BaseObservable() { - val tunnels = CompletableFuture<ObservableSortedKeyedArrayList<String, ObservableTunnel>>() + private val tunnels = CompletableDeferred<ObservableSortedKeyedArrayList<String, ObservableTunnel>>() private val context: Context = get() - private val delayedLoadRestoreTunnels = ArrayList<CompletableFuture<Void>>() private val tunnelMap: ObservableSortedKeyedArrayList<String, ObservableTunnel> = ObservableSortedKeyedArrayList(TunnelComparator) private var haveLoaded = false - private fun addToList(name: String, config: Config?, state: Tunnel.State): ObservableTunnel? { + private fun addToList(name: String, config: Config?, state: Tunnel.State): ObservableTunnel { val tunnel = ObservableTunnel(this, name, config, state) tunnelMap.add(tunnel) return tunnel } - fun create(name: String, config: Config?): CompletionStage<ObservableTunnel> { + suspend fun getTunnels(): ObservableSortedKeyedArrayList<String, ObservableTunnel> = tunnels.await() + + suspend fun create(name: String, config: Config?): ObservableTunnel = withContext(Dispatchers.Main.immediate) { if (Tunnel.isNameInvalid(name)) - return CompletableFuture.failedFuture(IllegalArgumentException(context.getString(R.string.tunnel_error_invalid_name))) + throw IllegalArgumentException(context.getString(R.string.tunnel_error_invalid_name)) if (tunnelMap.containsKey(name)) - return CompletableFuture.failedFuture(IllegalArgumentException(context.getString(R.string.tunnel_error_already_exists, name))) - return getAsyncWorker().supplyAsync { configStore.create(name, config!!) }.thenApply { addToList(name, it, Tunnel.State.DOWN) } + throw IllegalArgumentException(context.getString(R.string.tunnel_error_already_exists, name)) + addToList(name, withContext(Dispatchers.IO) { configStore.create(name, config!!) }, Tunnel.State.DOWN) } - fun delete(tunnel: ObservableTunnel): CompletionStage<Void> { + suspend fun delete(tunnel: ObservableTunnel) = withContext(Dispatchers.Main.immediate) { val originalState = tunnel.state val wasLastUsed = tunnel == lastUsedTunnel // Make sure nothing touches the tunnel. if (wasLastUsed) lastUsedTunnel = null tunnelMap.remove(tunnel) - return getAsyncWorker().runAsync { + try { if (originalState == Tunnel.State.UP) - getBackend().setState(tunnel, Tunnel.State.DOWN, null) + withContext(Dispatchers.IO) { getBackend().setState(tunnel, Tunnel.State.DOWN, null) } try { - configStore.delete(tunnel.name) - } catch (e: Exception) { + withContext(Dispatchers.IO) { configStore.delete(tunnel.name) } + } catch (e: Throwable) { if (originalState == Tunnel.State.UP) - getBackend().setState(tunnel, Tunnel.State.UP, tunnel.config) + withContext(Dispatchers.IO) { getBackend().setState(tunnel, Tunnel.State.UP, tunnel.config) } throw e } - }.whenComplete { _, e -> - if (e == null) - return@whenComplete + } catch (e: Throwable) { // Failure, put the tunnel back. tunnelMap.add(tunnel) if (wasLastUsed) lastUsedTunnel = tunnel + throw e } } @get:Bindable - @SuppressLint("ApplySharedPref") var lastUsedTunnel: ObservableTunnel? = null private set(value) { if (value == field) return field = value notifyPropertyChanged(BR.lastUsedTunnel) - if (value != null) - getSharedPreferences().edit().putString(KEY_LAST_USED_TUNNEL, value.name).commit() - else - getSharedPreferences().edit().remove(KEY_LAST_USED_TUNNEL).commit() + applicationScope.launch { UserKnobs.setLastUsedTunnel(value?.name) } } - fun getTunnelConfig(tunnel: ObservableTunnel): CompletionStage<Config> = getAsyncWorker() - .supplyAsync { configStore.load(tunnel.name) }.thenApply(tunnel::onConfigChanged) - + suspend fun getTunnelConfig(tunnel: ObservableTunnel): Config = withContext(Dispatchers.Main.immediate) { + tunnel.onConfigChanged(withContext(Dispatchers.IO) { configStore.load(tunnel.name) })!! + } fun onCreate() { - getAsyncWorker().supplyAsync { configStore.enumerate() } - .thenAcceptBoth(getAsyncWorker().supplyAsync { getBackend().runningTunnelNames }, this::onTunnelsLoaded) - .whenComplete(ExceptionLoggers.E) + applicationScope.launch { + try { + onTunnelsLoaded(withContext(Dispatchers.IO) { configStore.enumerate() }, withContext(Dispatchers.IO) { getBackend().runningTunnelNames }) + } catch (e: Throwable) { + Log.e(TAG, Log.getStackTraceString(e)) + } + } } private fun onTunnelsLoaded(present: Iterable<String>, running: Collection<String>) { for (name in present) addToList(name, null, if (running.contains(name)) Tunnel.State.UP else Tunnel.State.DOWN) - val lastUsedName = getSharedPreferences().getString(KEY_LAST_USED_TUNNEL, null) - if (lastUsedName != null) - lastUsedTunnel = tunnelMap[lastUsedName] - var toComplete: Array<CompletableFuture<Void>> - synchronized(delayedLoadRestoreTunnels) { + applicationScope.launch { + val lastUsedName = UserKnobs.lastUsedTunnel.first() + if (lastUsedName != null) + lastUsedTunnel = tunnelMap[lastUsedName] haveLoaded = true - toComplete = delayedLoadRestoreTunnels.toTypedArray() - delayedLoadRestoreTunnels.clear() + restoreState(true) + tunnels.complete(tunnelMap) } - restoreState(true).whenComplete { v: Void?, t: Throwable? -> - for (f in toComplete) { - if (t == null) - f.complete(v) - else - f.completeExceptionally(t) - } - } - tunnels.complete(tunnelMap) } - fun refreshTunnelStates() { - getAsyncWorker().supplyAsync { getBackend().runningTunnelNames } - .thenAccept { running: Set<String> -> for (tunnel in tunnelMap) tunnel.onStateChanged(if (running.contains(tunnel.name)) Tunnel.State.UP else Tunnel.State.DOWN) } - .whenComplete(ExceptionLoggers.E) + private fun refreshTunnelStates() { + applicationScope.launch { + try { + val running = withContext(Dispatchers.IO) { getBackend().runningTunnelNames } + for (tunnel in tunnelMap) + tunnel.onStateChanged(if (running.contains(tunnel.name)) Tunnel.State.UP else Tunnel.State.DOWN) + } catch (e: Throwable) { + Log.e(TAG, Log.getStackTraceString(e)) + } + } } - fun restoreState(force: Boolean): CompletionStage<Void> { - if (!force && !getSharedPreferences().getBoolean(KEY_RESTORE_ON_BOOT, false)) - return CompletableFuture.completedFuture(null) - synchronized(delayedLoadRestoreTunnels) { - if (!haveLoaded) { - val f = CompletableFuture<Void>() - delayedLoadRestoreTunnels.add(f) - return f + suspend fun restoreState(force: Boolean) { + if (!haveLoaded || (!force && !UserKnobs.restoreOnBoot.first())) + return + val previouslyRunning = UserKnobs.runningTunnels.first() + if (previouslyRunning.isEmpty()) return + withContext(Dispatchers.IO) { + try { + tunnelMap.filter { previouslyRunning.contains(it.name) }.map { async(Dispatchers.IO + SupervisorJob()) { setTunnelState(it, Tunnel.State.UP) } } + .awaitAll() + } catch (e: Throwable) { + Log.e(TAG, Log.getStackTraceString(e)) } } - val previouslyRunning = getSharedPreferences().getStringSet(KEY_RUNNING_TUNNELS, null) - ?: return CompletableFuture.completedFuture(null) - return CompletableFuture.allOf(*tunnelMap.filter { previouslyRunning.contains(it.name) }.map { setTunnelState(it, Tunnel.State.UP).toCompletableFuture() }.toTypedArray()) } - @SuppressLint("ApplySharedPref") - fun saveState() { - getSharedPreferences().edit().putStringSet(KEY_RUNNING_TUNNELS, tunnelMap.filter { it.state == Tunnel.State.UP }.map { it.name }.toSet()).commit() + suspend fun saveState() { + UserKnobs.setRunningTunnels(tunnelMap.filter { it.state == Tunnel.State.UP }.map { it.name }.toSet()) } - fun setTunnelConfig(tunnel: ObservableTunnel, config: Config): CompletionStage<Config> = getAsyncWorker().supplyAsync { - getBackend().setState(tunnel, tunnel.state, config) - configStore.save(tunnel.name, config) - }.thenApply { tunnel.onConfigChanged(it) } + suspend fun setTunnelConfig(tunnel: ObservableTunnel, config: Config): Config = withContext(Dispatchers.Main.immediate) { + tunnel.onConfigChanged(withContext(Dispatchers.IO) { + getBackend().setState(tunnel, tunnel.state, config) + configStore.save(tunnel.name, config) + })!! + } - fun setTunnelName(tunnel: ObservableTunnel, name: String): CompletionStage<String> { + suspend fun setTunnelName(tunnel: ObservableTunnel, name: String): String = withContext(Dispatchers.Main.immediate) { if (Tunnel.isNameInvalid(name)) - return CompletableFuture.failedFuture(IllegalArgumentException(context.getString(R.string.tunnel_error_invalid_name))) + throw IllegalArgumentException(context.getString(R.string.tunnel_error_invalid_name)) if (tunnelMap.containsKey(name)) { - return CompletableFuture.failedFuture(IllegalArgumentException(context.getString(R.string.tunnel_error_already_exists, name))) + throw IllegalArgumentException(context.getString(R.string.tunnel_error_already_exists, name)) } val originalState = tunnel.state val wasLastUsed = tunnel == lastUsedTunnel @@ -168,69 +171,85 @@ class TunnelManager(private val configStore: ConfigStore) : BaseObservable() { if (wasLastUsed) lastUsedTunnel = null tunnelMap.remove(tunnel) - return getAsyncWorker().supplyAsync { + var throwable: Throwable? = null + var newName: String? = null + try { if (originalState == Tunnel.State.UP) - getBackend().setState(tunnel, Tunnel.State.DOWN, null) - configStore.rename(tunnel.name, name) - val newName = tunnel.onNameChanged(name) + withContext(Dispatchers.IO) { getBackend().setState(tunnel, Tunnel.State.DOWN, null) } + withContext(Dispatchers.IO) { configStore.rename(tunnel.name, name) } + newName = tunnel.onNameChanged(name) if (originalState == Tunnel.State.UP) - getBackend().setState(tunnel, Tunnel.State.UP, tunnel.config) - newName - }.whenComplete { _, e -> + withContext(Dispatchers.IO) { getBackend().setState(tunnel, Tunnel.State.UP, tunnel.config) } + } catch (e: Throwable) { + throwable = e // On failure, we don't know what state the tunnel might be in. Fix that. - if (e != null) - getTunnelState(tunnel) - // Add the tunnel back to the manager, under whatever name it thinks it has. - tunnelMap.add(tunnel) - if (wasLastUsed) - lastUsedTunnel = tunnel + getTunnelState(tunnel) } + // Add the tunnel back to the manager, under whatever name it thinks it has. + tunnelMap.add(tunnel) + if (wasLastUsed) + lastUsedTunnel = tunnel + if (throwable != null) + throw throwable + newName!! } - fun setTunnelState(tunnel: ObservableTunnel, state: Tunnel.State): CompletionStage<Tunnel.State> = tunnel.configAsync - .thenCompose { getAsyncWorker().supplyAsync { getBackend().setState(tunnel, state, it) } } - .whenComplete { newState, e -> - // Ensure onStateChanged is always called (failure or not), and with the correct state. - tunnel.onStateChanged(if (e == null) newState else tunnel.state) - if (e == null && newState == Tunnel.State.UP) - lastUsedTunnel = tunnel - saveState() - } + suspend fun setTunnelState(tunnel: ObservableTunnel, state: Tunnel.State): Tunnel.State = withContext(Dispatchers.Main.immediate) { + var newState = tunnel.state + var throwable: Throwable? = null + try { + newState = withContext(Dispatchers.IO) { getBackend().setState(tunnel, state, tunnel.getConfigAsync()) } + if (newState == Tunnel.State.UP) + lastUsedTunnel = tunnel + } catch (e: Throwable) { + throwable = e + } + tunnel.onStateChanged(newState) + saveState() + if (throwable != null) + throw throwable + newState + } class IntentReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent?) { - val manager = getTunnelManager() - if (intent == null) return - val action = intent.action ?: return - if ("com.wireguard.android.action.REFRESH_TUNNEL_STATES" == action) { - manager.refreshTunnelStates() - return - } - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || !getSharedPreferences().getBoolean("allow_remote_control_intents", false)) - return - val state: Tunnel.State - state = when (action) { - "com.wireguard.android.action.SET_TUNNEL_UP" -> Tunnel.State.UP - "com.wireguard.android.action.SET_TUNNEL_DOWN" -> Tunnel.State.DOWN - else -> return - } - val tunnelName = intent.getStringExtra("tunnel") ?: return - manager.tunnels.thenAccept { - val tunnel = it[tunnelName] ?: return@thenAccept - manager.setTunnelState(tunnel, state) + applicationScope.launch { + val manager = getTunnelManager() + if (intent == null) return@launch + val action = intent.action ?: return@launch + if ("com.wireguard.android.action.REFRESH_TUNNEL_STATES" == action) { + manager.refreshTunnelStates() + return@launch + } + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || !UserKnobs.allowRemoteControlIntents.first()) + return@launch + val state: Tunnel.State + state = when (action) { + "com.wireguard.android.action.SET_TUNNEL_UP" -> Tunnel.State.UP + "com.wireguard.android.action.SET_TUNNEL_DOWN" -> Tunnel.State.DOWN + else -> return@launch + } + val tunnelName = intent.getStringExtra("tunnel") ?: return@launch + val tunnels = manager.getTunnels() + val tunnel = tunnels[tunnelName] ?: return@launch + try { + manager.setTunnelState(tunnel, state) + } catch (e: Throwable) { + Toast.makeText(context, ErrorMessages[e], Toast.LENGTH_LONG).show() + } } } } - fun getTunnelState(tunnel: ObservableTunnel): CompletionStage<Tunnel.State> = getAsyncWorker() - .supplyAsync { getBackend().getState(tunnel) }.thenApply(tunnel::onStateChanged) + suspend fun getTunnelState(tunnel: ObservableTunnel): Tunnel.State = withContext(Dispatchers.Main.immediate) { + tunnel.onStateChanged(withContext(Dispatchers.IO) { getBackend().getState(tunnel) }) + } - fun getTunnelStatistics(tunnel: ObservableTunnel): CompletionStage<Statistics> = getAsyncWorker() - .supplyAsync { getBackend().getStatistics(tunnel) }.thenApply(tunnel::onStatisticsChanged) + suspend fun getTunnelStatistics(tunnel: ObservableTunnel): Statistics = withContext(Dispatchers.Main.immediate) { + tunnel.onStatisticsChanged(withContext(Dispatchers.IO) { getBackend().getStatistics(tunnel) })!! + } companion object { - private const val KEY_LAST_USED_TUNNEL = "last_used_tunnel" - private const val KEY_RESTORE_ON_BOOT = "restore_on_boot" - private const val KEY_RUNNING_TUNNELS = "enabled_configs" + private const val TAG = "WireGuard/TunnelManager" } } diff --git a/ui/src/main/java/com/wireguard/android/preference/DonatePreference.kt b/ui/src/main/java/com/wireguard/android/preference/DonatePreference.kt new file mode 100644 index 00000000..16920923 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/preference/DonatePreference.kt @@ -0,0 +1,42 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.preference + +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.util.AttributeSet +import android.widget.Toast +import androidx.preference.Preference +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.wireguard.android.R +import com.wireguard.android.updater.Updater +import com.wireguard.android.util.ErrorMessages + +class DonatePreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) { + override fun getSummary() = context.getString(R.string.donate_summary) + + override fun getTitle() = context.getString(R.string.donate_title) + + override fun onClick() { + /* Google Play Store forbids links to our donation page. */ + if (Updater.installerIsGooglePlay(context)) { + MaterialAlertDialogBuilder(context) + .setTitle(R.string.donate_title) + .setMessage(R.string.donate_google_play_disappointment) + .show() + return + } + + val intent = Intent(Intent.ACTION_VIEW) + intent.data = Uri.parse("https://www.wireguard.com/donations/") + try { + context.startActivity(intent) + } catch (e: Throwable) { + Toast.makeText(context, ErrorMessages[e], Toast.LENGTH_SHORT).show() + } + } +} diff --git a/ui/src/main/java/com/wireguard/android/preference/KernelModuleDisablerPreference.kt b/ui/src/main/java/com/wireguard/android/preference/KernelModuleDisablerPreference.kt deleted file mode 100644 index 1479d7b6..00000000 --- a/ui/src/main/java/com/wireguard/android/preference/KernelModuleDisablerPreference.kt +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ -package com.wireguard.android.preference - -import android.annotation.SuppressLint -import android.content.Context -import android.content.Intent -import android.util.AttributeSet -import androidx.preference.Preference -import com.wireguard.android.Application -import com.wireguard.android.R -import com.wireguard.android.activity.SettingsActivity -import com.wireguard.android.backend.Tunnel -import com.wireguard.android.backend.WgQuickBackend -import java9.util.concurrent.CompletableFuture -import kotlin.system.exitProcess - -class KernelModuleDisablerPreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) { - private var state = State.UNKNOWN - - init { - isVisible = false - Application.getBackendAsync().thenAccept { backend -> - setState(if (backend is WgQuickBackend) State.ENABLED else State.DISABLED) - } - } - - override fun getSummary() = if (state == State.UNKNOWN) "" else context.getString(state.summaryResourceId) - - override fun getTitle() = if (state == State.UNKNOWN) "" else context.getString(state.titleResourceId) - - @SuppressLint("ApplySharedPref") - override fun onClick() { - if (state == State.DISABLED) { - setState(State.ENABLING) - Application.getSharedPreferences().edit().putBoolean("disable_kernel_module", false).commit() - } else if (state == State.ENABLED) { - setState(State.DISABLING) - Application.getSharedPreferences().edit().putBoolean("disable_kernel_module", true).commit() - } - Application.getAsyncWorker().runAsync { - Application.getTunnelManager().tunnels.thenApply { observableTunnels -> - val downings = observableTunnels.map { it.setStateAsync(Tunnel.State.DOWN).toCompletableFuture() }.toTypedArray() - CompletableFuture.allOf(*downings).thenRun { - val restartIntent = Intent(context, SettingsActivity::class.java) - restartIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - restartIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - Application.get().startActivity(restartIntent) - exitProcess(0) - } - }.join() - } - } - - private fun setState(state: State) { - if (this.state == state) return - this.state = state - if (isEnabled != state.shouldEnableView) isEnabled = state.shouldEnableView - if (isVisible != state.visible) isVisible = state.visible - notifyChanged() - } - - private enum class State(val titleResourceId: Int, val summaryResourceId: Int, val shouldEnableView: Boolean, val visible: Boolean) { - UNKNOWN(0, 0, false, false), - ENABLED(R.string.module_disabler_enabled_title, R.string.module_disabler_enabled_summary, true, true), - DISABLED(R.string.module_disabler_disabled_title, R.string.module_disabler_disabled_summary, true, true), - ENABLING(R.string.module_disabler_disabled_title, R.string.success_application_will_restart, false, true), - DISABLING(R.string.module_disabler_enabled_title, R.string.success_application_will_restart, false, true); - } -} diff --git a/ui/src/main/java/com/wireguard/android/preference/KernelModuleEnablerPreference.kt b/ui/src/main/java/com/wireguard/android/preference/KernelModuleEnablerPreference.kt new file mode 100644 index 00000000..20de8e93 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/preference/KernelModuleEnablerPreference.kt @@ -0,0 +1,88 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ +package com.wireguard.android.preference + +import android.content.Context +import android.content.Intent +import android.util.AttributeSet +import android.util.Log +import androidx.lifecycle.lifecycleScope +import androidx.preference.Preference +import com.wireguard.android.Application +import com.wireguard.android.R +import com.wireguard.android.activity.SettingsActivity +import com.wireguard.android.backend.Tunnel +import com.wireguard.android.backend.WgQuickBackend +import com.wireguard.android.util.UserKnobs +import com.wireguard.android.util.activity +import com.wireguard.android.util.lifecycleScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.async +import kotlinx.coroutines.awaitAll +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import kotlin.system.exitProcess + +class KernelModuleEnablerPreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) { + private var state = State.UNKNOWN + + init { + isVisible = false + lifecycleScope.launch { + setState(if (Application.getBackend() is WgQuickBackend) State.ENABLED else State.DISABLED) + } + } + + override fun getSummary() = if (state == State.UNKNOWN) "" else context.getString(state.summaryResourceId) + + override fun getTitle() = if (state == State.UNKNOWN) "" else context.getString(state.titleResourceId) + + override fun onClick() { + activity.lifecycleScope.launch { + if (state == State.DISABLED) { + setState(State.ENABLING) + UserKnobs.setEnableKernelModule(true) + } else if (state == State.ENABLED) { + setState(State.DISABLING) + UserKnobs.setEnableKernelModule(false) + } + val observableTunnels = Application.getTunnelManager().getTunnels() + val downings = observableTunnels.map { async(SupervisorJob()) { it.setStateAsync(Tunnel.State.DOWN) } } + try { + downings.awaitAll() + withContext(Dispatchers.IO) { + val restartIntent = Intent(context, SettingsActivity::class.java) + restartIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) + restartIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + Application.get().startActivity(restartIntent) + exitProcess(0) + } + } catch (e: Throwable) { + Log.e(TAG, Log.getStackTraceString(e)) + } + } + } + + private fun setState(state: State) { + if (this.state == state) return + this.state = state + if (isEnabled != state.shouldEnableView) isEnabled = state.shouldEnableView + if (isVisible != state.visible) isVisible = state.visible + notifyChanged() + } + + private enum class State(val titleResourceId: Int, val summaryResourceId: Int, val shouldEnableView: Boolean, val visible: Boolean) { + UNKNOWN(0, 0, false, false), + ENABLED(R.string.module_enabler_enabled_title, R.string.module_enabler_enabled_summary, true, true), + DISABLED(R.string.module_enabler_disabled_title, R.string.module_enabler_disabled_summary, true, true), + ENABLING(R.string.module_enabler_disabled_title, R.string.success_application_will_restart, false, true), + DISABLING(R.string.module_enabler_enabled_title, R.string.success_application_will_restart, false, true); + } + + companion object { + private const val TAG = "WireGuard/KernelModuleEnablerPreference" + } +} diff --git a/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.kt b/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.kt deleted file mode 100644 index 055ed449..00000000 --- a/ui/src/main/java/com/wireguard/android/preference/ModuleDownloaderPreference.kt +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright © 2019 WireGuard LLC. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ -package com.wireguard.android.preference - -import android.annotation.SuppressLint -import android.content.Context -import android.content.Intent -import android.system.OsConstants -import android.util.AttributeSet -import android.widget.Toast -import androidx.preference.Preference -import com.wireguard.android.Application -import com.wireguard.android.R -import com.wireguard.android.activity.SettingsActivity -import com.wireguard.android.util.ErrorMessages -import kotlin.system.exitProcess - -class ModuleDownloaderPreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) { - private var state = State.INITIAL - - override fun getSummary() = context.getString(state.messageResourceId) - - override fun getTitle() = context.getString(R.string.module_installer_title) - - override fun onClick() { - setState(State.WORKING) - Application.getAsyncWorker().supplyAsync(Application.getModuleLoader()::download).whenComplete(this::onDownloadResult) - } - - @SuppressLint("ApplySharedPref") - private fun onDownloadResult(result: Int, throwable: Throwable?) { - when { - throwable != null -> { - setState(State.FAILURE) - Toast.makeText(context, ErrorMessages[throwable], Toast.LENGTH_LONG).show() - } - result == OsConstants.ENOENT -> setState(State.NOTFOUND) - result == OsConstants.EXIT_SUCCESS -> { - setState(State.SUCCESS) - Application.getSharedPreferences().edit().remove("disable_kernel_module").commit() - Application.getAsyncWorker().runAsync { - val restartIntent = Intent(context, SettingsActivity::class.java) - restartIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - restartIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - Application.get().startActivity(restartIntent) - exitProcess(0) - } - } - else -> setState(State.FAILURE) - } - } - - private fun setState(state: State) { - if (this.state == state) return - this.state = state - if (isEnabled != state.shouldEnableView) isEnabled = state.shouldEnableView - notifyChanged() - } - - private enum class State(val messageResourceId: Int, val shouldEnableView: Boolean) { - INITIAL(R.string.module_installer_initial, true), - FAILURE(R.string.module_installer_error, true), - WORKING(R.string.module_installer_working, false), - SUCCESS(R.string.success_application_will_restart, false), - NOTFOUND(R.string.module_installer_not_found, false); - } -} diff --git a/ui/src/main/java/com/wireguard/android/preference/PreferencesPreferenceDataStore.kt b/ui/src/main/java/com/wireguard/android/preference/PreferencesPreferenceDataStore.kt new file mode 100644 index 00000000..1a491684 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/preference/PreferencesPreferenceDataStore.kt @@ -0,0 +1,135 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.preference + +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.booleanPreferencesKey +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.floatPreferencesKey +import androidx.datastore.preferences.core.intPreferencesKey +import androidx.datastore.preferences.core.longPreferencesKey +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.core.stringSetPreferencesKey +import androidx.preference.PreferenceDataStore +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking + +class PreferencesPreferenceDataStore(private val coroutineScope: CoroutineScope, private val dataStore: DataStore<Preferences>) : PreferenceDataStore() { + override fun putString(key: String?, value: String?) { + if (key == null) return + val pk = stringPreferencesKey(key) + coroutineScope.launch { + dataStore.edit { + if (value == null) it.remove(pk) + else it[pk] = value + } + } + } + + override fun putStringSet(key: String?, values: Set<String?>?) { + if (key == null) return + val pk = stringSetPreferencesKey(key) + val filteredValues = values?.filterNotNull()?.toSet() + coroutineScope.launch { + dataStore.edit { + if (filteredValues == null || filteredValues.isEmpty()) it.remove(pk) + else it[pk] = filteredValues + } + } + } + + override fun putInt(key: String?, value: Int) { + if (key == null) return + val pk = intPreferencesKey(key) + coroutineScope.launch { + dataStore.edit { + it[pk] = value + } + } + } + + override fun putLong(key: String?, value: Long) { + if (key == null) return + val pk = longPreferencesKey(key) + coroutineScope.launch { + dataStore.edit { + it[pk] = value + } + } + } + + override fun putFloat(key: String?, value: Float) { + if (key == null) return + val pk = floatPreferencesKey(key) + coroutineScope.launch { + dataStore.edit { + it[pk] = value + } + } + } + + override fun putBoolean(key: String?, value: Boolean) { + if (key == null) return + val pk = booleanPreferencesKey(key) + coroutineScope.launch { + dataStore.edit { + it[pk] = value + } + } + } + + override fun getString(key: String?, defValue: String?): String? { + if (key == null) return defValue + val pk = stringPreferencesKey(key) + return runBlocking { + dataStore.data.map { it[pk] ?: defValue }.first() + } + } + + override fun getStringSet(key: String?, defValues: Set<String?>?): Set<String?>? { + if (key == null) return defValues + val pk = stringSetPreferencesKey(key) + return runBlocking { + dataStore.data.map { it[pk] ?: defValues }.first() + } + } + + override fun getInt(key: String?, defValue: Int): Int { + if (key == null) return defValue + val pk = intPreferencesKey(key) + return runBlocking { + dataStore.data.map { it[pk] ?: defValue }.first() + } + } + + override fun getLong(key: String?, defValue: Long): Long { + if (key == null) return defValue + val pk = longPreferencesKey(key) + return runBlocking { + dataStore.data.map { it[pk] ?: defValue }.first() + } + } + + override fun getFloat(key: String?, defValue: Float): Float { + if (key == null) return defValue + val pk = floatPreferencesKey(key) + return runBlocking { + dataStore.data.map { it[pk] ?: defValue }.first() + } + } + + override fun getBoolean(key: String?, defValue: Boolean): Boolean { + if (key == null) return defValue + val pk = booleanPreferencesKey(key) + return runBlocking { + dataStore.data.map { it[pk] ?: defValue }.first() + } + } +} diff --git a/ui/src/main/java/com/wireguard/android/preference/QuickTilePreference.kt b/ui/src/main/java/com/wireguard/android/preference/QuickTilePreference.kt new file mode 100644 index 00000000..9081818b --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/preference/QuickTilePreference.kt @@ -0,0 +1,50 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.preference + +import android.app.StatusBarManager +import android.content.ComponentName +import android.content.Context +import android.graphics.drawable.Icon +import android.os.Build +import android.util.AttributeSet +import android.widget.Toast +import androidx.annotation.RequiresApi +import androidx.preference.Preference +import com.wireguard.android.QuickTileService +import com.wireguard.android.R + +@RequiresApi(Build.VERSION_CODES.TIRAMISU) +class QuickTilePreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) { + override fun getSummary() = context.getString(R.string.quick_settings_tile_add_summary) + + override fun getTitle() = context.getString(R.string.quick_settings_tile_add_title) + + override fun onClick() { + val statusBarManager = context.getSystemService(StatusBarManager::class.java) + statusBarManager.requestAddTileService( + ComponentName(context, QuickTileService::class.java), + context.getString(R.string.quick_settings_tile_action), + Icon.createWithResource(context, R.drawable.ic_tile), + context.mainExecutor + ) { + when (it) { + StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ALREADY_ADDED, + StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ADDED -> { + parent?.removePreference(this) + --preferenceManager.preferenceScreen.initialExpandedChildrenCount + } + StatusBarManager.TILE_ADD_REQUEST_ERROR_MISMATCHED_PACKAGE, + StatusBarManager.TILE_ADD_REQUEST_ERROR_REQUEST_IN_PROGRESS, + StatusBarManager.TILE_ADD_REQUEST_ERROR_BAD_COMPONENT, + StatusBarManager.TILE_ADD_REQUEST_ERROR_NOT_CURRENT_USER, + StatusBarManager.TILE_ADD_REQUEST_ERROR_APP_NOT_IN_FOREGROUND, + StatusBarManager.TILE_ADD_REQUEST_ERROR_NO_STATUS_BAR_SERVICE -> + Toast.makeText(context, context.getString(R.string.quick_settings_tile_add_failure, it), Toast.LENGTH_SHORT).show() + } + } + } +} diff --git a/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.kt b/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.kt index f7dd932d..dac80e88 100644 --- a/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.kt +++ b/ui/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.preference @@ -10,6 +10,10 @@ import androidx.preference.Preference import com.wireguard.android.Application import com.wireguard.android.R import com.wireguard.android.util.ToolsInstaller +import com.wireguard.android.util.lifecycleScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext /** * Preference implementing a button that asynchronously runs `ToolsInstaller` and displays the @@ -17,37 +21,41 @@ import com.wireguard.android.util.ToolsInstaller */ class ToolsInstallerPreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) { private var state = State.INITIAL - override fun getSummary() = context.getString(state.messageResourceId) override fun getTitle() = context.getString(R.string.tools_installer_title) override fun onAttached() { super.onAttached() - Application.getAsyncWorker().supplyAsync(Application.getToolsInstaller()::areInstalled).whenComplete(this::onCheckResult) - } - - private fun onCheckResult(state: Int, throwable: Throwable?) { - when { - throwable != null || state == ToolsInstaller.ERROR -> setState(State.INITIAL) - state and ToolsInstaller.YES == ToolsInstaller.YES -> setState(State.ALREADY) - state and (ToolsInstaller.MAGISK or ToolsInstaller.NO) == ToolsInstaller.MAGISK or ToolsInstaller.NO -> setState(State.INITIAL_MAGISK) - state and (ToolsInstaller.SYSTEM or ToolsInstaller.NO) == ToolsInstaller.SYSTEM or ToolsInstaller.NO -> setState(State.INITIAL_SYSTEM) - else -> setState(State.INITIAL) + lifecycleScope.launch { + try { + val state = withContext(Dispatchers.IO) { Application.getToolsInstaller().areInstalled() } + when { + state == ToolsInstaller.ERROR -> setState(State.INITIAL) + state and ToolsInstaller.YES == ToolsInstaller.YES -> setState(State.ALREADY) + state and (ToolsInstaller.MAGISK or ToolsInstaller.NO) == ToolsInstaller.MAGISK or ToolsInstaller.NO -> setState(State.INITIAL_MAGISK) + state and (ToolsInstaller.SYSTEM or ToolsInstaller.NO) == ToolsInstaller.SYSTEM or ToolsInstaller.NO -> setState(State.INITIAL_SYSTEM) + else -> setState(State.INITIAL) + } + } catch (_: Throwable) { + setState(State.INITIAL) + } } } override fun onClick() { setState(State.WORKING) - Application.getAsyncWorker().supplyAsync { Application.getToolsInstaller().install() }.whenComplete { result: Int, throwable: Throwable? -> onInstallResult(result, throwable) } - } - - private fun onInstallResult(result: Int, throwable: Throwable?) { - when { - throwable != null -> setState(State.FAILURE) - result and (ToolsInstaller.YES or ToolsInstaller.MAGISK) == ToolsInstaller.YES or ToolsInstaller.MAGISK -> setState(State.SUCCESS_MAGISK) - result and (ToolsInstaller.YES or ToolsInstaller.SYSTEM) == ToolsInstaller.YES or ToolsInstaller.SYSTEM -> setState(State.SUCCESS_SYSTEM) - else -> setState(State.FAILURE) + lifecycleScope.launch { + try { + val result = withContext(Dispatchers.IO) { Application.getToolsInstaller().install() } + when { + result and (ToolsInstaller.YES or ToolsInstaller.MAGISK) == ToolsInstaller.YES or ToolsInstaller.MAGISK -> setState(State.SUCCESS_MAGISK) + result and (ToolsInstaller.YES or ToolsInstaller.SYSTEM) == ToolsInstaller.YES or ToolsInstaller.SYSTEM -> setState(State.SUCCESS_SYSTEM) + else -> setState(State.FAILURE) + } + } catch (_: Throwable) { + setState(State.FAILURE) + } } } diff --git a/ui/src/main/java/com/wireguard/android/preference/VersionPreference.kt b/ui/src/main/java/com/wireguard/android/preference/VersionPreference.kt index 0734df45..7d997e8a 100644 --- a/ui/src/main/java/com/wireguard/android/preference/VersionPreference.kt +++ b/ui/src/main/java/com/wireguard/android/preference/VersionPreference.kt @@ -1,14 +1,14 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.preference -import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent import android.net.Uri import android.util.AttributeSet +import android.widget.Toast import androidx.preference.Preference import com.wireguard.android.Application import com.wireguard.android.BuildConfig @@ -16,7 +16,11 @@ import com.wireguard.android.R import com.wireguard.android.backend.Backend import com.wireguard.android.backend.GoBackend import com.wireguard.android.backend.WgQuickBackend -import java.util.Locale +import com.wireguard.android.util.ErrorMessages +import com.wireguard.android.util.lifecycleScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext class VersionPreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) { private var versionSummary: String? = null @@ -30,7 +34,8 @@ class VersionPreference(context: Context, attrs: AttributeSet?) : Preference(con intent.data = Uri.parse("https://www.wireguard.com/") try { context.startActivity(intent) - } catch (_: ActivityNotFoundException) { + } catch (e: Throwable) { + Toast.makeText(context, ErrorMessages[e], Toast.LENGTH_SHORT).show() } } @@ -43,15 +48,16 @@ class VersionPreference(context: Context, attrs: AttributeSet?) : Preference(con } init { - Application.getBackendAsync().thenAccept { backend -> - versionSummary = getContext().getString(R.string.version_summary_checking, getBackendPrettyName(context, backend).toLowerCase(Locale.ENGLISH)) - Application.getAsyncWorker().supplyAsync(backend::getVersion).whenComplete { version, exception -> - versionSummary = if (exception == null) - getContext().getString(R.string.version_summary, getBackendPrettyName(context, backend), version) - else - getContext().getString(R.string.version_summary_unknown, getBackendPrettyName(context, backend).toLowerCase(Locale.ENGLISH)) - notifyChanged() + lifecycleScope.launch { + val backend = Application.getBackend() + versionSummary = getContext().getString(R.string.version_summary_checking, getBackendPrettyName(context, backend).lowercase()) + notifyChanged() + versionSummary = try { + getContext().getString(R.string.version_summary, getBackendPrettyName(context, backend), withContext(Dispatchers.IO) { backend.version }) + } catch (_: Throwable) { + getContext().getString(R.string.version_summary_unknown, getBackendPrettyName(context, backend).lowercase()) } + notifyChanged() } } } diff --git a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt index cdd25134..220796e0 100644 --- a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt +++ b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt @@ -1,24 +1,28 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.preference -import android.Manifest import android.content.Context -import android.content.pm.PackageManager import android.util.AttributeSet import android.util.Log import androidx.preference.Preference import com.google.android.material.snackbar.Snackbar import com.wireguard.android.Application import com.wireguard.android.R -import com.wireguard.android.model.ObservableTunnel +import com.wireguard.android.util.AdminKnobs import com.wireguard.android.util.BiometricAuthenticator import com.wireguard.android.util.DownloadsFileSaver import com.wireguard.android.util.ErrorMessages -import com.wireguard.android.util.FragmentUtils -import java9.util.concurrent.CompletableFuture +import com.wireguard.android.util.activity +import com.wireguard.android.util.lifecycleScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.async +import kotlinx.coroutines.awaitAll +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import java.nio.charset.StandardCharsets import java.util.zip.ZipEntry import java.util.zip.ZipOutputStream @@ -28,80 +32,77 @@ import java.util.zip.ZipOutputStream */ class ZipExporterPreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) { private var exportedFilePath: String? = null + private val downloadsFileSaver = DownloadsFileSaver(activity) private fun exportZip() { - Application.getTunnelManager().tunnels.thenAccept(this::exportZip) - } - - private fun exportZip(tunnels: List<ObservableTunnel>) { - val futureConfigs = tunnels.map { it.configAsync.toCompletableFuture() }.toTypedArray() - if (futureConfigs.isEmpty()) { - exportZipComplete(null, IllegalArgumentException( - context.getString(R.string.no_tunnels_error))) - return - } - CompletableFuture.allOf(*futureConfigs) - .whenComplete { _, exception -> - Application.getAsyncWorker().supplyAsync { - if (exception != null) throw exception - val outputFile = DownloadsFileSaver.save(context, "wireguard-export.zip", "application/zip", true) - try { - ZipOutputStream(outputFile.outputStream).use { zip -> - for (i in futureConfigs.indices) { - zip.putNextEntry(ZipEntry(tunnels[i].name + ".conf")) - zip.write(futureConfigs[i].getNow(null)!!.toWgQuickString().toByteArray(StandardCharsets.UTF_8)) - } - zip.closeEntry() + lifecycleScope.launch { + val tunnels = Application.getTunnelManager().getTunnels() + try { + exportedFilePath = withContext(Dispatchers.IO) { + val configs = tunnels.map { async(SupervisorJob()) { it.getConfigAsync() } }.awaitAll() + if (configs.isEmpty()) { + throw IllegalArgumentException(context.getString(R.string.no_tunnels_error)) + } + val outputFile = downloadsFileSaver.save("wireguard-export.zip", "application/zip", true) + if (outputFile == null) { + withContext(Dispatchers.Main.immediate) { + isEnabled = true + } + return@withContext null + } + try { + ZipOutputStream(outputFile.outputStream).use { zip -> + for (i in configs.indices) { + zip.putNextEntry(ZipEntry(tunnels[i].name + ".conf")) + zip.write(configs[i].toWgQuickString().toByteArray(StandardCharsets.UTF_8)) } - } catch (e: Exception) { - outputFile.delete() - throw e + zip.closeEntry() } - outputFile.fileName - }.whenComplete(this::exportZipComplete) + } catch (e: Throwable) { + outputFile.delete() + throw e + } + outputFile.fileName } - } - - private fun exportZipComplete(filePath: String?, throwable: Throwable?) { - if (throwable != null) { - val error = ErrorMessages[throwable] - val message = context.getString(R.string.zip_export_error, error) - Log.e(TAG, message, throwable) - Snackbar.make( - FragmentUtils.getPrefActivity(this).findViewById(android.R.id.content), - message, Snackbar.LENGTH_LONG).show() - isEnabled = true - } else { - exportedFilePath = filePath - notifyChanged() + notifyChanged() + } catch (e: Throwable) { + val error = ErrorMessages[e] + val message = context.getString(R.string.zip_export_error, error) + Log.e(TAG, message, e) + Snackbar.make( + activity.findViewById(android.R.id.content), + message, Snackbar.LENGTH_LONG + ).show() + isEnabled = true + } } } - override fun getSummary() = if (exportedFilePath == null) context.getString(R.string.zip_export_summary) else context.getString(R.string.zip_export_success, exportedFilePath) + override fun getSummary() = + if (exportedFilePath == null) context.getString(R.string.zip_export_summary) else context.getString(R.string.zip_export_success, exportedFilePath) override fun getTitle() = context.getString(R.string.zip_export_title) override fun onClick() { - val prefActivity = FragmentUtils.getPrefActivity(this) - val fragment = prefActivity.supportFragmentManager.fragments.first() + if (AdminKnobs.disableConfigExport) return + val fragment = activity.supportFragmentManager.fragments.first() BiometricAuthenticator.authenticate(R.string.biometric_prompt_zip_exporter_title, fragment) { when (it) { // When we have successful authentication, or when there is no biometric hardware available. is BiometricAuthenticator.Result.Success, is BiometricAuthenticator.Result.HardwareUnavailableOrDisabled -> { - prefActivity.ensurePermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { _, grantResults -> - if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - isEnabled = false - exportZip() - } - } + isEnabled = false + exportZip() } + is BiometricAuthenticator.Result.Failure -> { Snackbar.make( - prefActivity.findViewById(android.R.id.content), - it.message, - Snackbar.LENGTH_SHORT + activity.findViewById(android.R.id.content), + it.message, + Snackbar.LENGTH_SHORT ).show() } + + is BiometricAuthenticator.Result.Cancelled -> {} } } } diff --git a/ui/src/main/java/com/wireguard/android/updater/Ed25519.java b/ui/src/main/java/com/wireguard/android/updater/Ed25519.java new file mode 100644 index 00000000..d27caf1c --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/updater/Ed25519.java @@ -0,0 +1,2507 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * Copyright 2017 Google Inc. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.updater; + +import java.math.BigInteger; +import java.security.GeneralSecurityException; +import java.security.MessageDigest; +import java.util.Arrays; + +/** + * Implementation of Ed25519 signature verification. + * + * <p>This implementation is based on the ed25519/ref10 implementation in NaCl.</p> + * + * <p>It implements this twisted Edwards curve: + * + * <pre> + * -x^2 + y^2 = 1 + (-121665 / 121666 mod 2^255-19)*x^2*y^2 + * </pre> + * + * @see <a href="https://eprint.iacr.org/2008/013.pdf">Bernstein D.J., Birkner P., Joye M., Lange + * T., Peters C. (2008) Twisted Edwards Curves</a> + * @see <a href="https://eprint.iacr.org/2008/522.pdf">Hisil H., Wong K.KH., Carter G., Dawson E. + * (2008) Twisted Edwards Curves Revisited</a> + */ +final class Ed25519 { + + // d = -121665 / 121666 mod 2^255-19 + private static final long[] D; + // 2d + private static final long[] D2; + // 2^((p-1)/4) mod p where p = 2^255-19 + private static final long[] SQRTM1; + + /** + * Base point for the Edwards twisted curve = (x, 4/5) and its exponentiations. B_TABLE[i][j] = + * (j+1)*256^i*B for i in [0, 32) and j in [0, 8). Base point B = B_TABLE[0][0] + */ + private static final CachedXYT[][] B_TABLE; + private static final CachedXYT[] B2; + + private static final BigInteger P_BI = + BigInteger.valueOf(2).pow(255).subtract(BigInteger.valueOf(19)); + private static final BigInteger D_BI = + BigInteger.valueOf(-121665).multiply(BigInteger.valueOf(121666).modInverse(P_BI)).mod(P_BI); + private static final BigInteger D2_BI = BigInteger.valueOf(2).multiply(D_BI).mod(P_BI); + private static final BigInteger SQRTM1_BI = + BigInteger.valueOf(2).modPow(P_BI.subtract(BigInteger.ONE).divide(BigInteger.valueOf(4)), P_BI); + + private Ed25519() { + } + + private static class Point { + private BigInteger x; + private BigInteger y; + } + + private static BigInteger recoverX(BigInteger y) { + // x^2 = (y^2 - 1) / (d * y^2 + 1) mod 2^255-19 + BigInteger xx = + y.pow(2) + .subtract(BigInteger.ONE) + .multiply(D_BI.multiply(y.pow(2)).add(BigInteger.ONE).modInverse(P_BI)); + BigInteger x = xx.modPow(P_BI.add(BigInteger.valueOf(3)).divide(BigInteger.valueOf(8)), P_BI); + if (!x.pow(2).subtract(xx).mod(P_BI).equals(BigInteger.ZERO)) { + x = x.multiply(SQRTM1_BI).mod(P_BI); + } + if (x.testBit(0)) { + x = P_BI.subtract(x); + } + return x; + } + + private static Point edwards(Point a, Point b) { + Point o = new Point(); + BigInteger xxyy = D_BI.multiply(a.x.multiply(b.x).multiply(a.y).multiply(b.y)).mod(P_BI); + o.x = + (a.x.multiply(b.y).add(b.x.multiply(a.y))) + .multiply(BigInteger.ONE.add(xxyy).modInverse(P_BI)) + .mod(P_BI); + o.y = + (a.y.multiply(b.y).add(a.x.multiply(b.x))) + .multiply(BigInteger.ONE.subtract(xxyy).modInverse(P_BI)) + .mod(P_BI); + return o; + } + + private static byte[] toLittleEndian(BigInteger n) { + byte[] b = new byte[32]; + byte[] nBytes = n.toByteArray(); + System.arraycopy(nBytes, 0, b, 32 - nBytes.length, nBytes.length); + for (int i = 0; i < b.length / 2; i++) { + byte t = b[i]; + b[i] = b[b.length - i - 1]; + b[b.length - i - 1] = t; + } + return b; + } + + private static CachedXYT getCachedXYT(Point p) { + return new CachedXYT( + Field25519.expand(toLittleEndian(p.y.add(p.x).mod(P_BI))), + Field25519.expand(toLittleEndian(p.y.subtract(p.x).mod(P_BI))), + Field25519.expand(toLittleEndian(D2_BI.multiply(p.x).multiply(p.y).mod(P_BI)))); + } + + static { + Point b = new Point(); + b.y = BigInteger.valueOf(4).multiply(BigInteger.valueOf(5).modInverse(P_BI)).mod(P_BI); + b.x = recoverX(b.y); + + D = Field25519.expand(toLittleEndian(D_BI)); + D2 = Field25519.expand(toLittleEndian(D2_BI)); + SQRTM1 = Field25519.expand(toLittleEndian(SQRTM1_BI)); + + Point bi = b; + B_TABLE = new CachedXYT[32][8]; + for (int i = 0; i < 32; i++) { + Point bij = bi; + for (int j = 0; j < 8; j++) { + B_TABLE[i][j] = getCachedXYT(bij); + bij = edwards(bij, bi); + } + for (int j = 0; j < 8; j++) { + bi = edwards(bi, bi); + } + } + bi = b; + Point b2 = edwards(b, b); + B2 = new CachedXYT[8]; + for (int i = 0; i < 8; i++) { + B2[i] = getCachedXYT(bi); + bi = edwards(bi, b2); + } + } + + private static final int PUBLIC_KEY_LEN = Field25519.FIELD_LEN; + private static final int SIGNATURE_LEN = Field25519.FIELD_LEN * 2; + + /** + * Defines field 25519 function based on <a + * href="https://github.com/agl/curve25519-donna/blob/master/curve25519-donna.c">curve25519-donna C + * implementation</a> (mostly identical). + * + * <p>Field elements are written as an array of signed, 64-bit limbs (an array of longs), least + * significant first. The value of the field element is: + * + * <pre> + * x[0] + 2^26·x[1] + 2^51·x[2] + 2^77·x[3] + 2^102·x[4] + 2^128·x[5] + 2^153·x[6] + 2^179·x[7] + + * 2^204·x[8] + 2^230·x[9], + * </pre> + * + * <p>i.e. the limbs are 26, 25, 26, 25, ... bits wide. + */ + private static final class Field25519 { + /** + * During Field25519 computation, the mixed radix representation may be in different forms: + * <ul> + * <li> Reduced-size form: the array has size at most 10. + * <li> Non-reduced-size form: the array is not reduced modulo 2^255 - 19 and has size at most + * 19. + * </ul> + * <p> + * TODO(quannguyen): + * <ul> + * <li> Clarify ill-defined terminologies. + * <li> The reduction procedure is different from DJB's paper + * (http://cr.yp.to/ecdh/curve25519-20060209.pdf). The coefficients after reducing degree and + * reducing coefficients aren't guaranteed to be in range {-2^25, ..., 2^25}. We should check to + * see what's going on. + * <li> Consider using method mult() everywhere and making product() private. + * </ul> + */ + + static final int FIELD_LEN = 32; + static final int LIMB_CNT = 10; + private static final long TWO_TO_25 = 1 << 25; + private static final long TWO_TO_26 = TWO_TO_25 << 1; + + private static final int[] EXPAND_START = {0, 3, 6, 9, 12, 16, 19, 22, 25, 28}; + private static final int[] EXPAND_SHIFT = {0, 2, 3, 5, 6, 0, 1, 3, 4, 6}; + private static final int[] MASK = {0x3ffffff, 0x1ffffff}; + private static final int[] SHIFT = {26, 25}; + + /** + * Sums two numbers: output = in1 + in2 + * <p> + * On entry: in1, in2 are in reduced-size form. + */ + static void sum(long[] output, long[] in1, long[] in2) { + for (int i = 0; i < LIMB_CNT; i++) { + output[i] = in1[i] + in2[i]; + } + } + + /** + * Sums two numbers: output += in + * <p> + * On entry: in is in reduced-size form. + */ + static void sum(long[] output, long[] in) { + sum(output, output, in); + } + + /** + * Find the difference of two numbers: output = in1 - in2 + * (note the order of the arguments!). + * <p> + * On entry: in1, in2 are in reduced-size form. + */ + static void sub(long[] output, long[] in1, long[] in2) { + for (int i = 0; i < LIMB_CNT; i++) { + output[i] = in1[i] - in2[i]; + } + } + + /** + * Find the difference of two numbers: output = in - output + * (note the order of the arguments!). + * <p> + * On entry: in, output are in reduced-size form. + */ + static void sub(long[] output, long[] in) { + sub(output, in, output); + } + + /** + * Multiply a number by a scalar: output = in * scalar + */ + static void scalarProduct(long[] output, long[] in, long scalar) { + for (int i = 0; i < LIMB_CNT; i++) { + output[i] = in[i] * scalar; + } + } + + /** + * Multiply two numbers: out = in2 * in + * <p> + * output must be distinct to both inputs. The inputs are reduced coefficient form, + * the output is not. + * <p> + * out[x] <= 14 * the largest product of the input limbs. + */ + static void product(long[] out, long[] in2, long[] in) { + out[0] = in2[0] * in[0]; + out[1] = in2[0] * in[1] + + in2[1] * in[0]; + out[2] = 2 * in2[1] * in[1] + + in2[0] * in[2] + + in2[2] * in[0]; + out[3] = in2[1] * in[2] + + in2[2] * in[1] + + in2[0] * in[3] + + in2[3] * in[0]; + out[4] = in2[2] * in[2] + + 2 * (in2[1] * in[3] + in2[3] * in[1]) + + in2[0] * in[4] + + in2[4] * in[0]; + out[5] = in2[2] * in[3] + + in2[3] * in[2] + + in2[1] * in[4] + + in2[4] * in[1] + + in2[0] * in[5] + + in2[5] * in[0]; + out[6] = 2 * (in2[3] * in[3] + in2[1] * in[5] + in2[5] * in[1]) + + in2[2] * in[4] + + in2[4] * in[2] + + in2[0] * in[6] + + in2[6] * in[0]; + out[7] = in2[3] * in[4] + + in2[4] * in[3] + + in2[2] * in[5] + + in2[5] * in[2] + + in2[1] * in[6] + + in2[6] * in[1] + + in2[0] * in[7] + + in2[7] * in[0]; + out[8] = in2[4] * in[4] + + 2 * (in2[3] * in[5] + in2[5] * in[3] + in2[1] * in[7] + in2[7] * in[1]) + + in2[2] * in[6] + + in2[6] * in[2] + + in2[0] * in[8] + + in2[8] * in[0]; + out[9] = in2[4] * in[5] + + in2[5] * in[4] + + in2[3] * in[6] + + in2[6] * in[3] + + in2[2] * in[7] + + in2[7] * in[2] + + in2[1] * in[8] + + in2[8] * in[1] + + in2[0] * in[9] + + in2[9] * in[0]; + out[10] = + 2 * (in2[5] * in[5] + in2[3] * in[7] + in2[7] * in[3] + in2[1] * in[9] + in2[9] * in[1]) + + in2[4] * in[6] + + in2[6] * in[4] + + in2[2] * in[8] + + in2[8] * in[2]; + out[11] = in2[5] * in[6] + + in2[6] * in[5] + + in2[4] * in[7] + + in2[7] * in[4] + + in2[3] * in[8] + + in2[8] * in[3] + + in2[2] * in[9] + + in2[9] * in[2]; + out[12] = in2[6] * in[6] + + 2 * (in2[5] * in[7] + in2[7] * in[5] + in2[3] * in[9] + in2[9] * in[3]) + + in2[4] * in[8] + + in2[8] * in[4]; + out[13] = in2[6] * in[7] + + in2[7] * in[6] + + in2[5] * in[8] + + in2[8] * in[5] + + in2[4] * in[9] + + in2[9] * in[4]; + out[14] = 2 * (in2[7] * in[7] + in2[5] * in[9] + in2[9] * in[5]) + + in2[6] * in[8] + + in2[8] * in[6]; + out[15] = in2[7] * in[8] + + in2[8] * in[7] + + in2[6] * in[9] + + in2[9] * in[6]; + out[16] = in2[8] * in[8] + + 2 * (in2[7] * in[9] + in2[9] * in[7]); + out[17] = in2[8] * in[9] + + in2[9] * in[8]; + out[18] = 2 * in2[9] * in[9]; + } + + /** + * Reduce a field element by calling reduceSizeByModularReduction and reduceCoefficients. + * + * @param input An input array of any length. If the array has 19 elements, it will be used as + * temporary buffer and its contents changed. + * @param output An output array of size LIMB_CNT. After the call |output[i]| < 2^26 will hold. + */ + static void reduce(long[] input, long[] output) { + long[] tmp; + if (input.length == 19) { + tmp = input; + } else { + tmp = new long[19]; + System.arraycopy(input, 0, tmp, 0, input.length); + } + reduceSizeByModularReduction(tmp); + reduceCoefficients(tmp); + System.arraycopy(tmp, 0, output, 0, LIMB_CNT); + } + + /** + * Reduce a long form to a reduced-size form by taking the input mod 2^255 - 19. + * <p> + * On entry: |output[i]| < 14*2^54 + * On exit: |output[0..8]| < 280*2^54 + */ + static void reduceSizeByModularReduction(long[] output) { + // The coefficients x[10], x[11],..., x[18] are eliminated by reduction modulo 2^255 - 19. + // For example, the coefficient x[18] is multiplied by 19 and added to the coefficient x[8]. + // + // Each of these shifts and adds ends up multiplying the value by 19. + // + // For output[0..8], the absolute entry value is < 14*2^54 and we add, at most, 19*14*2^54 thus, + // on exit, |output[0..8]| < 280*2^54. + output[8] += output[18] << 4; + output[8] += output[18] << 1; + output[8] += output[18]; + output[7] += output[17] << 4; + output[7] += output[17] << 1; + output[7] += output[17]; + output[6] += output[16] << 4; + output[6] += output[16] << 1; + output[6] += output[16]; + output[5] += output[15] << 4; + output[5] += output[15] << 1; + output[5] += output[15]; + output[4] += output[14] << 4; + output[4] += output[14] << 1; + output[4] += output[14]; + output[3] += output[13] << 4; + output[3] += output[13] << 1; + output[3] += output[13]; + output[2] += output[12] << 4; + output[2] += output[12] << 1; + output[2] += output[12]; + output[1] += output[11] << 4; + output[1] += output[11] << 1; + output[1] += output[11]; + output[0] += output[10] << 4; + output[0] += output[10] << 1; + output[0] += output[10]; + } + + /** + * Reduce all coefficients of the short form input so that |x| < 2^26. + * <p> + * On entry: |output[i]| < 280*2^54 + */ + static void reduceCoefficients(long[] output) { + output[10] = 0; + + for (int i = 0; i < LIMB_CNT; i += 2) { + long over = output[i] / TWO_TO_26; + // The entry condition (that |output[i]| < 280*2^54) means that over is, at most, 280*2^28 in + // the first iteration of this loop. This is added to the next limb and we can approximate the + // resulting bound of that limb by 281*2^54. + output[i] -= over << 26; + output[i + 1] += over; + + // For the first iteration, |output[i+1]| < 281*2^54, thus |over| < 281*2^29. When this is + // added to the next limb, the resulting bound can be approximated as 281*2^54. + // + // For subsequent iterations of the loop, 281*2^54 remains a conservative bound and no + // overflow occurs. + over = output[i + 1] / TWO_TO_25; + output[i + 1] -= over << 25; + output[i + 2] += over; + } + // Now |output[10]| < 281*2^29 and all other coefficients are reduced. + output[0] += output[10] << 4; + output[0] += output[10] << 1; + output[0] += output[10]; + + output[10] = 0; + // Now output[1..9] are reduced, and |output[0]| < 2^26 + 19*281*2^29 so |over| will be no more + // than 2^16. + long over = output[0] / TWO_TO_26; + output[0] -= over << 26; + output[1] += over; + // Now output[0,2..9] are reduced, and |output[1]| < 2^25 + 2^16 < 2^26. The bound on + // |output[1]| is sufficient to meet our needs. + } + + /** + * A helpful wrapper around {@ref Field25519#product}: output = in * in2. + * <p> + * On entry: |in[i]| < 2^27 and |in2[i]| < 2^27. + * <p> + * The output is reduced degree (indeed, one need only provide storage for 10 limbs) and + * |output[i]| < 2^26. + */ + static void mult(long[] output, long[] in, long[] in2) { + long[] t = new long[19]; + product(t, in, in2); + // |t[i]| < 2^26 + reduce(t, output); + } + + /** + * Square a number: out = in**2 + * <p> + * output must be distinct from the input. The inputs are reduced coefficient form, the output is + * not. + * <p> + * out[x] <= 14 * the largest product of the input limbs. + */ + private static void squareInner(long[] out, long[] in) { + out[0] = in[0] * in[0]; + out[1] = 2 * in[0] * in[1]; + out[2] = 2 * (in[1] * in[1] + in[0] * in[2]); + out[3] = 2 * (in[1] * in[2] + in[0] * in[3]); + out[4] = in[2] * in[2] + + 4 * in[1] * in[3] + + 2 * in[0] * in[4]; + out[5] = 2 * (in[2] * in[3] + in[1] * in[4] + in[0] * in[5]); + out[6] = 2 * (in[3] * in[3] + in[2] * in[4] + in[0] * in[6] + 2 * in[1] * in[5]); + out[7] = 2 * (in[3] * in[4] + in[2] * in[5] + in[1] * in[6] + in[0] * in[7]); + out[8] = in[4] * in[4] + + 2 * (in[2] * in[6] + in[0] * in[8] + 2 * (in[1] * in[7] + in[3] * in[5])); + out[9] = 2 * (in[4] * in[5] + in[3] * in[6] + in[2] * in[7] + in[1] * in[8] + in[0] * in[9]); + out[10] = 2 * (in[5] * in[5] + + in[4] * in[6] + + in[2] * in[8] + + 2 * (in[3] * in[7] + in[1] * in[9])); + out[11] = 2 * (in[5] * in[6] + in[4] * in[7] + in[3] * in[8] + in[2] * in[9]); + out[12] = in[6] * in[6] + + 2 * (in[4] * in[8] + 2 * (in[5] * in[7] + in[3] * in[9])); + out[13] = 2 * (in[6] * in[7] + in[5] * in[8] + in[4] * in[9]); + out[14] = 2 * (in[7] * in[7] + in[6] * in[8] + 2 * in[5] * in[9]); + out[15] = 2 * (in[7] * in[8] + in[6] * in[9]); + out[16] = in[8] * in[8] + 4 * in[7] * in[9]; + out[17] = 2 * in[8] * in[9]; + out[18] = 2 * in[9] * in[9]; + } + + /** + * Returns in^2. + * <p> + * On entry: The |in| argument is in reduced coefficients form and |in[i]| < 2^27. + * <p> + * On exit: The |output| argument is in reduced coefficients form (indeed, one need only provide + * storage for 10 limbs) and |out[i]| < 2^26. + */ + static void square(long[] output, long[] in) { + long[] t = new long[19]; + squareInner(t, in); + // |t[i]| < 14*2^54 because the largest product of two limbs will be < 2^(27+27) and SquareInner + // adds together, at most, 14 of those products. + reduce(t, output); + } + + /** + * Takes a little-endian, 32-byte number and expands it into mixed radix form. + */ + static long[] expand(byte[] input) { + long[] output = new long[LIMB_CNT]; + for (int i = 0; i < LIMB_CNT; i++) { + output[i] = ((((long) (input[EXPAND_START[i]] & 0xff)) + | ((long) (input[EXPAND_START[i] + 1] & 0xff)) << 8 + | ((long) (input[EXPAND_START[i] + 2] & 0xff)) << 16 + | ((long) (input[EXPAND_START[i] + 3] & 0xff)) << 24) >> EXPAND_SHIFT[i]) & MASK[i & 1]; + } + return output; + } + + /** + * Takes a fully reduced mixed radix form number and contract it into a little-endian, 32-byte + * array. + * <p> + * On entry: |input_limbs[i]| < 2^26 + */ + @SuppressWarnings("NarrowingCompoundAssignment") + static byte[] contract(long[] inputLimbs) { + long[] input = Arrays.copyOf(inputLimbs, LIMB_CNT); + for (int j = 0; j < 2; j++) { + for (int i = 0; i < 9; i++) { + // This calculation is a time-invariant way to make input[i] non-negative by borrowing + // from the next-larger limb. + int carry = -(int) ((input[i] & (input[i] >> 31)) >> SHIFT[i & 1]); + input[i] = input[i] + (carry << SHIFT[i & 1]); + input[i + 1] -= carry; + } + + // There's no greater limb for input[9] to borrow from, but we can multiply by 19 and borrow + // from input[0], which is valid mod 2^255-19. + { + int carry = -(int) ((input[9] & (input[9] >> 31)) >> 25); + input[9] += (carry << 25); + input[0] -= (carry * 19); + } + + // After the first iteration, input[1..9] are non-negative and fit within 25 or 26 bits, + // depending on position. However, input[0] may be negative. + } + + // The first borrow-propagation pass above ended with every limb except (possibly) input[0] + // non-negative. + // + // If input[0] was negative after the first pass, then it was because of a carry from input[9]. + // On entry, input[9] < 2^26 so the carry was, at most, one, since (2**26-1) >> 25 = 1. Thus + // input[0] >= -19. + // + // In the second pass, each limb is decreased by at most one. Thus the second borrow-propagation + // pass could only have wrapped around to decrease input[0] again if the first pass left + // input[0] negative *and* input[1] through input[9] were all zero. In that case, input[1] is + // now 2^25 - 1, and this last borrow-propagation step will leave input[1] non-negative. + { + int carry = -(int) ((input[0] & (input[0] >> 31)) >> 26); + input[0] += (carry << 26); + input[1] -= carry; + } + + // All input[i] are now non-negative. However, there might be values between 2^25 and 2^26 in a + // limb which is, nominally, 25 bits wide. + for (int j = 0; j < 2; j++) { + for (int i = 0; i < 9; i++) { + int carry = (int) (input[i] >> SHIFT[i & 1]); + input[i] &= MASK[i & 1]; + input[i + 1] += carry; + } + } + + { + int carry = (int) (input[9] >> 25); + input[9] &= 0x1ffffff; + input[0] += 19 * carry; + } + + // If the first carry-chain pass, just above, ended up with a carry from input[9], and that + // caused input[0] to be out-of-bounds, then input[0] was < 2^26 + 2*19, because the carry was, + // at most, two. + // + // If the second pass carried from input[9] again then input[0] is < 2*19 and the input[9] -> + // input[0] carry didn't push input[0] out of bounds. + + // It still remains the case that input might be between 2^255-19 and 2^255. In this case, + // input[1..9] must take their maximum value and input[0] must be >= (2^255-19) & 0x3ffffff, + // which is 0x3ffffed. + int mask = gte((int) input[0], 0x3ffffed); + for (int i = 1; i < LIMB_CNT; i++) { + mask &= eq((int) input[i], MASK[i & 1]); + } + + // mask is either 0xffffffff (if input >= 2^255-19) and zero otherwise. Thus this conditionally + // subtracts 2^255-19. + input[0] -= mask & 0x3ffffed; + input[1] -= mask & 0x1ffffff; + for (int i = 2; i < LIMB_CNT; i += 2) { + input[i] -= mask & 0x3ffffff; + input[i + 1] -= mask & 0x1ffffff; + } + + for (int i = 0; i < LIMB_CNT; i++) { + input[i] <<= EXPAND_SHIFT[i]; + } + byte[] output = new byte[FIELD_LEN]; + for (int i = 0; i < LIMB_CNT; i++) { + output[EXPAND_START[i]] |= input[i] & 0xff; + output[EXPAND_START[i] + 1] |= (input[i] >> 8) & 0xff; + output[EXPAND_START[i] + 2] |= (input[i] >> 16) & 0xff; + output[EXPAND_START[i] + 3] |= (input[i] >> 24) & 0xff; + } + return output; + } + + /** + * Computes inverse of z = z(2^255 - 21) + * <p> + * Shamelessly copied from agl's code which was shamelessly copied from djb's code. Only the + * comment format and the variable namings are different from those. + */ + static void inverse(long[] out, long[] z) { + long[] z2 = new long[Field25519.LIMB_CNT]; + long[] z9 = new long[Field25519.LIMB_CNT]; + long[] z11 = new long[Field25519.LIMB_CNT]; + long[] z2To5Minus1 = new long[Field25519.LIMB_CNT]; + long[] z2To10Minus1 = new long[Field25519.LIMB_CNT]; + long[] z2To20Minus1 = new long[Field25519.LIMB_CNT]; + long[] z2To50Minus1 = new long[Field25519.LIMB_CNT]; + long[] z2To100Minus1 = new long[Field25519.LIMB_CNT]; + long[] t0 = new long[Field25519.LIMB_CNT]; + long[] t1 = new long[Field25519.LIMB_CNT]; + + square(z2, z); // 2 + square(t1, z2); // 4 + square(t0, t1); // 8 + mult(z9, t0, z); // 9 + mult(z11, z9, z2); // 11 + square(t0, z11); // 22 + mult(z2To5Minus1, t0, z9); // 2^5 - 2^0 = 31 + + square(t0, z2To5Minus1); // 2^6 - 2^1 + square(t1, t0); // 2^7 - 2^2 + square(t0, t1); // 2^8 - 2^3 + square(t1, t0); // 2^9 - 2^4 + square(t0, t1); // 2^10 - 2^5 + mult(z2To10Minus1, t0, z2To5Minus1); // 2^10 - 2^0 + + square(t0, z2To10Minus1); // 2^11 - 2^1 + square(t1, t0); // 2^12 - 2^2 + for (int i = 2; i < 10; i += 2) { // 2^20 - 2^10 + square(t0, t1); + square(t1, t0); + } + mult(z2To20Minus1, t1, z2To10Minus1); // 2^20 - 2^0 + + square(t0, z2To20Minus1); // 2^21 - 2^1 + square(t1, t0); // 2^22 - 2^2 + for (int i = 2; i < 20; i += 2) { // 2^40 - 2^20 + square(t0, t1); + square(t1, t0); + } + mult(t0, t1, z2To20Minus1); // 2^40 - 2^0 + + square(t1, t0); // 2^41 - 2^1 + square(t0, t1); // 2^42 - 2^2 + for (int i = 2; i < 10; i += 2) { // 2^50 - 2^10 + square(t1, t0); + square(t0, t1); + } + mult(z2To50Minus1, t0, z2To10Minus1); // 2^50 - 2^0 + + square(t0, z2To50Minus1); // 2^51 - 2^1 + square(t1, t0); // 2^52 - 2^2 + for (int i = 2; i < 50; i += 2) { // 2^100 - 2^50 + square(t0, t1); + square(t1, t0); + } + mult(z2To100Minus1, t1, z2To50Minus1); // 2^100 - 2^0 + + square(t1, z2To100Minus1); // 2^101 - 2^1 + square(t0, t1); // 2^102 - 2^2 + for (int i = 2; i < 100; i += 2) { // 2^200 - 2^100 + square(t1, t0); + square(t0, t1); + } + mult(t1, t0, z2To100Minus1); // 2^200 - 2^0 + + square(t0, t1); // 2^201 - 2^1 + square(t1, t0); // 2^202 - 2^2 + for (int i = 2; i < 50; i += 2) { // 2^250 - 2^50 + square(t0, t1); + square(t1, t0); + } + mult(t0, t1, z2To50Minus1); // 2^250 - 2^0 + + square(t1, t0); // 2^251 - 2^1 + square(t0, t1); // 2^252 - 2^2 + square(t1, t0); // 2^253 - 2^3 + square(t0, t1); // 2^254 - 2^4 + square(t1, t0); // 2^255 - 2^5 + mult(out, t1, z11); // 2^255 - 21 + } + + + /** + * Returns 0xffffffff iff a == b and zero otherwise. + */ + private static int eq(int a, int b) { + a = ~(a ^ b); + a &= a << 16; + a &= a << 8; + a &= a << 4; + a &= a << 2; + a &= a << 1; + return a >> 31; + } + + /** + * returns 0xffffffff if a >= b and zero otherwise, where a and b are both non-negative. + */ + private static int gte(int a, int b) { + a -= b; + // a >= 0 iff a >= b. + return ~(a >> 31); + } + } + + // (x = 0, y = 1) point + private static final CachedXYT CACHED_NEUTRAL = new CachedXYT( + new long[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + new long[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + new long[]{0, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + private static final PartialXYZT NEUTRAL = new PartialXYZT( + new XYZ(new long[]{0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + new long[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + new long[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0}), + new long[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0}); + + /** + * Projective point representation (X:Y:Z) satisfying x = X/Z, y = Y/Z + * <p> + * Note that this is referred as ge_p2 in ref10 impl. + * Also note that x = X, y = Y and z = Z below following Java coding style. + * <p> + * See + * Koyama K., Tsuruoka Y. (1993) Speeding up Elliptic Cryptosystems by Using a Signed Binary + * Window Method. + * <p> + * https://hyperelliptic.org/EFD/g1p/auto-twisted-projective.html + */ + private static class XYZ { + + final long[] x; + final long[] y; + final long[] z; + + XYZ() { + this(new long[Field25519.LIMB_CNT], new long[Field25519.LIMB_CNT], new long[Field25519.LIMB_CNT]); + } + + XYZ(long[] x, long[] y, long[] z) { + this.x = x; + this.y = y; + this.z = z; + } + + XYZ(XYZ xyz) { + x = Arrays.copyOf(xyz.x, Field25519.LIMB_CNT); + y = Arrays.copyOf(xyz.y, Field25519.LIMB_CNT); + z = Arrays.copyOf(xyz.z, Field25519.LIMB_CNT); + } + + XYZ(PartialXYZT partialXYZT) { + this(); + fromPartialXYZT(this, partialXYZT); + } + + /** + * ge_p1p1_to_p2.c + */ + static XYZ fromPartialXYZT(XYZ out, PartialXYZT in) { + Field25519.mult(out.x, in.xyz.x, in.t); + Field25519.mult(out.y, in.xyz.y, in.xyz.z); + Field25519.mult(out.z, in.xyz.z, in.t); + return out; + } + + /** + * Encodes this point to bytes. + */ + byte[] toBytes() { + long[] recip = new long[Field25519.LIMB_CNT]; + long[] x = new long[Field25519.LIMB_CNT]; + long[] y = new long[Field25519.LIMB_CNT]; + Field25519.inverse(recip, z); + Field25519.mult(x, this.x, recip); + Field25519.mult(y, this.y, recip); + byte[] s = Field25519.contract(y); + s[31] = (byte) (s[31] ^ (getLsb(x) << 7)); + return s; + } + + + /** + * Best effort fix-timing array comparison. + * + * @return true if two arrays are equal. + */ + private static boolean bytesEqual(final byte[] x, final byte[] y) { + if (x == null || y == null) { + return false; + } + if (x.length != y.length) { + return false; + } + int res = 0; + for (int i = 0; i < x.length; i++) { + res |= x[i] ^ y[i]; + } + return res == 0; + } + + /** + * Checks that the point is on curve + */ + boolean isOnCurve() { + long[] x2 = new long[Field25519.LIMB_CNT]; + Field25519.square(x2, x); + long[] y2 = new long[Field25519.LIMB_CNT]; + Field25519.square(y2, y); + long[] z2 = new long[Field25519.LIMB_CNT]; + Field25519.square(z2, z); + long[] z4 = new long[Field25519.LIMB_CNT]; + Field25519.square(z4, z2); + long[] lhs = new long[Field25519.LIMB_CNT]; + // lhs = y^2 - x^2 + Field25519.sub(lhs, y2, x2); + // lhs = z^2 * (y2 - x2) + Field25519.mult(lhs, lhs, z2); + long[] rhs = new long[Field25519.LIMB_CNT]; + // rhs = x^2 * y^2 + Field25519.mult(rhs, x2, y2); + // rhs = D * x^2 * y^2 + Field25519.mult(rhs, rhs, D); + // rhs = z^4 + D * x^2 * y^2 + Field25519.sum(rhs, z4); + // Field25519.mult reduces its output, but Field25519.sum does not, so we have to manually + // reduce it here. + Field25519.reduce(rhs, rhs); + // z^2 (y^2 - x^2) == z^4 + D * x^2 * y^2 + return bytesEqual(Field25519.contract(lhs), Field25519.contract(rhs)); + } + } + + /** + * Represents extended projective point representation (X:Y:Z:T) satisfying x = X/Z, y = Y/Z, + * XY = ZT + * <p> + * Note that this is referred as ge_p3 in ref10 impl. + * Also note that t = T below following Java coding style. + * <p> + * See + * Hisil H., Wong K.KH., Carter G., Dawson E. (2008) Twisted Edwards Curves Revisited. + * <p> + * https://hyperelliptic.org/EFD/g1p/auto-twisted-extended.html + */ + private static class XYZT { + + final XYZ xyz; + final long[] t; + + XYZT() { + this(new XYZ(), new long[Field25519.LIMB_CNT]); + } + + XYZT(XYZ xyz, long[] t) { + this.xyz = xyz; + this.t = t; + } + + XYZT(PartialXYZT partialXYZT) { + this(); + fromPartialXYZT(this, partialXYZT); + } + + /** + * ge_p1p1_to_p2.c + */ + private static XYZT fromPartialXYZT(XYZT out, PartialXYZT in) { + Field25519.mult(out.xyz.x, in.xyz.x, in.t); + Field25519.mult(out.xyz.y, in.xyz.y, in.xyz.z); + Field25519.mult(out.xyz.z, in.xyz.z, in.t); + Field25519.mult(out.t, in.xyz.x, in.xyz.y); + return out; + } + + /** + * Decodes {@code s} into an extented projective point. + * See Section 5.1.3 Decoding in https://tools.ietf.org/html/rfc8032#section-5.1.3 + */ + private static XYZT fromBytesNegateVarTime(byte[] s) throws GeneralSecurityException { + long[] x = new long[Field25519.LIMB_CNT]; + long[] y = Field25519.expand(s); + long[] z = new long[Field25519.LIMB_CNT]; + z[0] = 1; + long[] t = new long[Field25519.LIMB_CNT]; + long[] u = new long[Field25519.LIMB_CNT]; + long[] v = new long[Field25519.LIMB_CNT]; + long[] vxx = new long[Field25519.LIMB_CNT]; + long[] check = new long[Field25519.LIMB_CNT]; + Field25519.square(u, y); + Field25519.mult(v, u, D); + Field25519.sub(u, u, z); // u = y^2 - 1 + Field25519.sum(v, v, z); // v = dy^2 + 1 + + long[] v3 = new long[Field25519.LIMB_CNT]; + Field25519.square(v3, v); + Field25519.mult(v3, v3, v); // v3 = v^3 + Field25519.square(x, v3); + Field25519.mult(x, x, v); + Field25519.mult(x, x, u); // x = uv^7 + + pow2252m3(x, x); // x = (uv^7)^((q-5)/8) + Field25519.mult(x, x, v3); + Field25519.mult(x, x, u); // x = uv^3(uv^7)^((q-5)/8) + + Field25519.square(vxx, x); + Field25519.mult(vxx, vxx, v); + Field25519.sub(check, vxx, u); // vx^2-u + if (isNonZeroVarTime(check)) { + Field25519.sum(check, vxx, u); // vx^2+u + if (isNonZeroVarTime(check)) { + throw new GeneralSecurityException("Cannot convert given bytes to extended projective " + + "coordinates. No square root exists for modulo 2^255-19"); + } + Field25519.mult(x, x, SQRTM1); + } + + if (!isNonZeroVarTime(x) && (s[31] & 0xff) >> 7 != 0) { + throw new GeneralSecurityException("Cannot convert given bytes to extended projective " + + "coordinates. Computed x is zero and encoded x's least significant bit is not zero"); + } + if (getLsb(x) == ((s[31] & 0xff) >> 7)) { + neg(x, x); + } + + Field25519.mult(t, x, y); + return new XYZT(new XYZ(x, y, z), t); + } + } + + /** + * Partial projective point representation ((X:Z),(Y:T)) satisfying x=X/Z, y=Y/T + * <p> + * Note that this is referred as complete form in the original ref10 impl (ge_p1p1). + * Also note that t = T below following Java coding style. + * <p> + * Although this has the same types as XYZT, it is redefined to have its own type so that it is + * readable and 1:1 corresponds to ref10 impl. + * <p> + * Can be converted to XYZT as follows: + * X1 = X * T = x * Z * T = x * Z1 + * Y1 = Y * Z = y * T * Z = y * Z1 + * Z1 = Z * T = Z * T + * T1 = X * Y = x * Z * y * T = x * y * Z1 = X1Y1 / Z1 + */ + private static class PartialXYZT { + + final XYZ xyz; + final long[] t; + + PartialXYZT() { + this(new XYZ(), new long[Field25519.LIMB_CNT]); + } + + PartialXYZT(XYZ xyz, long[] t) { + this.xyz = xyz; + this.t = t; + } + + PartialXYZT(PartialXYZT other) { + xyz = new XYZ(other.xyz); + t = Arrays.copyOf(other.t, Field25519.LIMB_CNT); + } + } + + /** + * Corresponds to the caching mentioned in the last paragraph of Section 3.1 of + * Hisil H., Wong K.KH., Carter G., Dawson E. (2008) Twisted Edwards Curves Revisited. + * with Z = 1. + */ + private static class CachedXYT { + + final long[] yPlusX; + final long[] yMinusX; + final long[] t2d; + + /** + * Creates a cached XYZT with Z = 1 + * + * @param yPlusX y + x + * @param yMinusX y - x + * @param t2d 2d * xy + */ + CachedXYT(long[] yPlusX, long[] yMinusX, long[] t2d) { + this.yPlusX = yPlusX; + this.yMinusX = yMinusX; + this.t2d = t2d; + } + + CachedXYT(CachedXYT other) { + yPlusX = Arrays.copyOf(other.yPlusX, Field25519.LIMB_CNT); + yMinusX = Arrays.copyOf(other.yMinusX, Field25519.LIMB_CNT); + t2d = Arrays.copyOf(other.t2d, Field25519.LIMB_CNT); + } + + // z is one implicitly, so this just copies {@code in} to {@code output}. + void multByZ(long[] output, long[] in) { + System.arraycopy(in, 0, output, 0, Field25519.LIMB_CNT); + } + + /** + * If icopy is 1, copies {@code other} into this point. Time invariant wrt to icopy value. + */ + void copyConditional(CachedXYT other, int icopy) { + copyConditional(yPlusX, other.yPlusX, icopy); + copyConditional(yMinusX, other.yMinusX, icopy); + copyConditional(t2d, other.t2d, icopy); + } + + /** + * Conditionally copies a reduced-form limb arrays {@code b} into {@code a} if {@code icopy} is 1, + * but leave {@code a} unchanged if 'iswap' is 0. Runs in data-invariant time to avoid + * side-channel attacks. + * + * <p>NOTE that this function requires that {@code icopy} be 1 or 0; other values give wrong + * results. Also, the two limb arrays must be in reduced-coefficient, reduced-degree form: the + * values in a[10..19] or b[10..19] aren't swapped, and all all values in a[0..9],b[0..9] must + * have magnitude less than Integer.MAX_VALUE. + */ + static void copyConditional(long[] a, long[] b, int icopy) { + int copy = -icopy; + for (int i = 0; i < Field25519.LIMB_CNT; i++) { + int x = copy & (((int) a[i]) ^ ((int) b[i])); + a[i] = ((int) a[i]) ^ x; + } + } + } + + private static class CachedXYZT extends CachedXYT { + + private final long[] z; + + CachedXYZT() { + this(new long[Field25519.LIMB_CNT], new long[Field25519.LIMB_CNT], new long[Field25519.LIMB_CNT], new long[Field25519.LIMB_CNT]); + } + + /** + * ge_p3_to_cached.c + */ + CachedXYZT(XYZT xyzt) { + this(); + Field25519.sum(yPlusX, xyzt.xyz.y, xyzt.xyz.x); + Field25519.sub(yMinusX, xyzt.xyz.y, xyzt.xyz.x); + System.arraycopy(xyzt.xyz.z, 0, z, 0, Field25519.LIMB_CNT); + Field25519.mult(t2d, xyzt.t, D2); + } + + /** + * Creates a cached XYZT + * + * @param yPlusX Y + X + * @param yMinusX Y - X + * @param z Z + * @param t2d 2d * (XY/Z) + */ + CachedXYZT(long[] yPlusX, long[] yMinusX, long[] z, long[] t2d) { + super(yPlusX, yMinusX, t2d); + this.z = z; + } + + @Override + public void multByZ(long[] output, long[] in) { + Field25519.mult(output, in, z); + } + } + + /** + * Addition defined in Section 3.1 of + * Hisil H., Wong K.KH., Carter G., Dawson E. (2008) Twisted Edwards Curves Revisited. + * <p> + * Please note that this is a partial of the operation listed there leaving out the final + * conversion from PartialXYZT to XYZT. + * + * @param extended extended projective point input + * @param cached cached projective point input + */ + private static void add(PartialXYZT partialXYZT, XYZT extended, CachedXYT cached) { + long[] t = new long[Field25519.LIMB_CNT]; + + // Y1 + X1 + Field25519.sum(partialXYZT.xyz.x, extended.xyz.y, extended.xyz.x); + + // Y1 - X1 + Field25519.sub(partialXYZT.xyz.y, extended.xyz.y, extended.xyz.x); + + // A = (Y1 - X1) * (Y2 - X2) + Field25519.mult(partialXYZT.xyz.y, partialXYZT.xyz.y, cached.yMinusX); + + // B = (Y1 + X1) * (Y2 + X2) + Field25519.mult(partialXYZT.xyz.z, partialXYZT.xyz.x, cached.yPlusX); + + // C = T1 * 2d * T2 = 2d * T1 * T2 (2d is written as k in the paper) + Field25519.mult(partialXYZT.t, extended.t, cached.t2d); + + // Z1 * Z2 + cached.multByZ(partialXYZT.xyz.x, extended.xyz.z); + + // D = 2 * Z1 * Z2 + Field25519.sum(t, partialXYZT.xyz.x, partialXYZT.xyz.x); + + // X3 = B - A + Field25519.sub(partialXYZT.xyz.x, partialXYZT.xyz.z, partialXYZT.xyz.y); + + // Y3 = B + A + Field25519.sum(partialXYZT.xyz.y, partialXYZT.xyz.z, partialXYZT.xyz.y); + + // Z3 = D + C + Field25519.sum(partialXYZT.xyz.z, t, partialXYZT.t); + + // T3 = D - C + Field25519.sub(partialXYZT.t, t, partialXYZT.t); + } + + /** + * Based on the addition defined in Section 3.1 of + * Hisil H., Wong K.KH., Carter G., Dawson E. (2008) Twisted Edwards Curves Revisited. + * <p> + * Please note that this is a partial of the operation listed there leaving out the final + * conversion from PartialXYZT to XYZT. + * + * @param extended extended projective point input + * @param cached cached projective point input + */ + private static void sub(PartialXYZT partialXYZT, XYZT extended, CachedXYT cached) { + long[] t = new long[Field25519.LIMB_CNT]; + + // Y1 + X1 + Field25519.sum(partialXYZT.xyz.x, extended.xyz.y, extended.xyz.x); + + // Y1 - X1 + Field25519.sub(partialXYZT.xyz.y, extended.xyz.y, extended.xyz.x); + + // A = (Y1 - X1) * (Y2 + X2) + Field25519.mult(partialXYZT.xyz.y, partialXYZT.xyz.y, cached.yPlusX); + + // B = (Y1 + X1) * (Y2 - X2) + Field25519.mult(partialXYZT.xyz.z, partialXYZT.xyz.x, cached.yMinusX); + + // C = T1 * 2d * T2 = 2d * T1 * T2 (2d is written as k in the paper) + Field25519.mult(partialXYZT.t, extended.t, cached.t2d); + + // Z1 * Z2 + cached.multByZ(partialXYZT.xyz.x, extended.xyz.z); + + // D = 2 * Z1 * Z2 + Field25519.sum(t, partialXYZT.xyz.x, partialXYZT.xyz.x); + + // X3 = B - A + Field25519.sub(partialXYZT.xyz.x, partialXYZT.xyz.z, partialXYZT.xyz.y); + + // Y3 = B + A + Field25519.sum(partialXYZT.xyz.y, partialXYZT.xyz.z, partialXYZT.xyz.y); + + // Z3 = D - C + Field25519.sub(partialXYZT.xyz.z, t, partialXYZT.t); + + // T3 = D + C + Field25519.sum(partialXYZT.t, t, partialXYZT.t); + } + + /** + * Doubles {@code p} and puts the result into this PartialXYZT. + * <p> + * This is based on the addition defined in formula 7 in Section 3.3 of + * Hisil H., Wong K.KH., Carter G., Dawson E. (2008) Twisted Edwards Curves Revisited. + * <p> + * Please note that this is a partial of the operation listed there leaving out the final + * conversion from PartialXYZT to XYZT and also this fixes a typo in calculation of Y3 and T3 in + * the paper, H should be replaced with A+B. + */ + private static void doubleXYZ(PartialXYZT partialXYZT, XYZ p) { + long[] t0 = new long[Field25519.LIMB_CNT]; + + // XX = X1^2 + Field25519.square(partialXYZT.xyz.x, p.x); + + // YY = Y1^2 + Field25519.square(partialXYZT.xyz.z, p.y); + + // B' = Z1^2 + Field25519.square(partialXYZT.t, p.z); + + // B = 2 * B' + Field25519.sum(partialXYZT.t, partialXYZT.t, partialXYZT.t); + + // A = X1 + Y1 + Field25519.sum(partialXYZT.xyz.y, p.x, p.y); + + // AA = A^2 + Field25519.square(t0, partialXYZT.xyz.y); + + // Y3 = YY + XX + Field25519.sum(partialXYZT.xyz.y, partialXYZT.xyz.z, partialXYZT.xyz.x); + + // Z3 = YY - XX + Field25519.sub(partialXYZT.xyz.z, partialXYZT.xyz.z, partialXYZT.xyz.x); + + // X3 = AA - Y3 + Field25519.sub(partialXYZT.xyz.x, t0, partialXYZT.xyz.y); + + // T3 = B - Z3 + Field25519.sub(partialXYZT.t, partialXYZT.t, partialXYZT.xyz.z); + } + + /** + * Doubles {@code p} and puts the result into this PartialXYZT. + */ + private static void doubleXYZT(PartialXYZT partialXYZT, XYZT p) { + doubleXYZ(partialXYZT, p.xyz); + } + + /** + * Compares two byte values in constant time. + */ + private static int eq(int a, int b) { + int r = ~(a ^ b) & 0xff; + r &= r << 4; + r &= r << 2; + r &= r << 1; + return (r >> 7) & 1; + } + + /** + * This is a constant time operation where point b*B*256^pos is stored in {@code t}. + * When b is 0, t remains the same (i.e., neutral point). + * <p> + * Although B_TABLE[32][8] (B_TABLE[i][j] = (j+1)*B*256^i) has j values in [0, 7], the select + * method negates the corresponding point if b is negative (which is straight forward in elliptic + * curves by just negating y coordinate). Therefore we can get multiples of B with the half of + * memory requirements. + * + * @param t neutral element (i.e., point 0), also serves as output. + * @param pos in B[pos][j] = (j+1)*B*256^pos + * @param b value in [-8, 8] range. + */ + private static void select(CachedXYT t, int pos, byte b) { + int bnegative = (b & 0xff) >> 7; + int babs = b - (((-bnegative) & b) << 1); + + t.copyConditional(B_TABLE[pos][0], eq(babs, 1)); + t.copyConditional(B_TABLE[pos][1], eq(babs, 2)); + t.copyConditional(B_TABLE[pos][2], eq(babs, 3)); + t.copyConditional(B_TABLE[pos][3], eq(babs, 4)); + t.copyConditional(B_TABLE[pos][4], eq(babs, 5)); + t.copyConditional(B_TABLE[pos][5], eq(babs, 6)); + t.copyConditional(B_TABLE[pos][6], eq(babs, 7)); + t.copyConditional(B_TABLE[pos][7], eq(babs, 8)); + + long[] yPlusX = Arrays.copyOf(t.yMinusX, Field25519.LIMB_CNT); + long[] yMinusX = Arrays.copyOf(t.yPlusX, Field25519.LIMB_CNT); + long[] t2d = Arrays.copyOf(t.t2d, Field25519.LIMB_CNT); + neg(t2d, t2d); + CachedXYT minust = new CachedXYT(yPlusX, yMinusX, t2d); + t.copyConditional(minust, bnegative); + } + + /** + * Computes {@code a}*B + * where a = a[0]+256*a[1]+...+256^31 a[31] and + * B is the Ed25519 base point (x,4/5) with x positive. + * <p> + * Preconditions: + * a[31] <= 127 + * + * @throws IllegalStateException iff there is arithmetic error. + */ + @SuppressWarnings("NarrowingCompoundAssignment") + private static XYZ scalarMultWithBase(byte[] a) { + byte[] e = new byte[2 * Field25519.FIELD_LEN]; + for (int i = 0; i < Field25519.FIELD_LEN; i++) { + e[2 * i + 0] = (byte) (((a[i] & 0xff) >> 0) & 0xf); + e[2 * i + 1] = (byte) (((a[i] & 0xff) >> 4) & 0xf); + } + // each e[i] is between 0 and 15 + // e[63] is between 0 and 7 + + // Rewrite e in a way that each e[i] is in [-8, 8]. + // This can be done since a[63] is in [0, 7], the carry-over onto the most significant byte + // a[63] can be at most 1. + int carry = 0; + for (int i = 0; i < e.length - 1; i++) { + e[i] += carry; + carry = e[i] + 8; + carry >>= 4; + e[i] -= carry << 4; + } + e[e.length - 1] += carry; + + PartialXYZT ret = new PartialXYZT(NEUTRAL); + XYZT xyzt = new XYZT(); + // Although B_TABLE's i can be at most 31 (stores only 32 4bit multiples of B) and we have 64 + // 4bit values in e array, the below for loop adds cached values by iterating e by two in odd + // indices. After the result, we can double the result point 4 times to shift the multiplication + // scalar by 4 bits. + for (int i = 1; i < e.length; i += 2) { + CachedXYT t = new CachedXYT(CACHED_NEUTRAL); + select(t, i / 2, e[i]); + add(ret, XYZT.fromPartialXYZT(xyzt, ret), t); + } + + // Doubles the result 4 times to shift the multiplication scalar 4 bits to get the actual result + // for the odd indices in e. + XYZ xyz = new XYZ(); + doubleXYZ(ret, XYZ.fromPartialXYZT(xyz, ret)); + doubleXYZ(ret, XYZ.fromPartialXYZT(xyz, ret)); + doubleXYZ(ret, XYZ.fromPartialXYZT(xyz, ret)); + doubleXYZ(ret, XYZ.fromPartialXYZT(xyz, ret)); + + // Add multiples of B for even indices of e. + for (int i = 0; i < e.length; i += 2) { + CachedXYT t = new CachedXYT(CACHED_NEUTRAL); + select(t, i / 2, e[i]); + add(ret, XYZT.fromPartialXYZT(xyzt, ret), t); + } + + // This check is to protect against flaws, i.e. if there is a computation error through a + // faulty CPU or if the implementation contains a bug. + XYZ result = new XYZ(ret); + if (!result.isOnCurve()) { + throw new IllegalStateException("arithmetic error in scalar multiplication"); + } + return result; + } + + @SuppressWarnings("NarrowingCompoundAssignment") + private static byte[] slide(byte[] a) { + byte[] r = new byte[256]; + // Writes each bit in a[0..31] into r[0..255]: + // a = a[0]+256*a[1]+...+256^31*a[31] is equal to + // r = r[0]+2*r[1]+...+2^255*r[255] + for (int i = 0; i < 256; i++) { + r[i] = (byte) (1 & ((a[i >> 3] & 0xff) >> (i & 7))); + } + + // Transforms r[i] as odd values in [-15, 15] + for (int i = 0; i < 256; i++) { + if (r[i] != 0) { + for (int b = 1; b <= 6 && i + b < 256; b++) { + if (r[i + b] != 0) { + if (r[i] + (r[i + b] << b) <= 15) { + r[i] += r[i + b] << b; + r[i + b] = 0; + } else if (r[i] - (r[i + b] << b) >= -15) { + r[i] -= r[i + b] << b; + for (int k = i + b; k < 256; k++) { + if (r[k] == 0) { + r[k] = 1; + break; + } + r[k] = 0; + } + } else { + break; + } + } + } + } + } + return r; + } + + /** + * Computes {@code a}*{@code pointA}+{@code b}*B + * where a = a[0]+256*a[1]+...+256^31*a[31]. + * and b = b[0]+256*b[1]+...+256^31*b[31]. + * B is the Ed25519 base point (x,4/5) with x positive. + * <p> + * Note that execution time varies based on the input since this will only be used in verification + * of signatures. + */ + private static XYZ doubleScalarMultVarTime(byte[] a, XYZT pointA, byte[] b) { + // pointA, 3*pointA, 5*pointA, 7*pointA, 9*pointA, 11*pointA, 13*pointA, 15*pointA + CachedXYZT[] pointAArray = new CachedXYZT[8]; + pointAArray[0] = new CachedXYZT(pointA); + PartialXYZT t = new PartialXYZT(); + doubleXYZT(t, pointA); + XYZT doubleA = new XYZT(t); + for (int i = 1; i < pointAArray.length; i++) { + add(t, doubleA, pointAArray[i - 1]); + pointAArray[i] = new CachedXYZT(new XYZT(t)); + } + + byte[] aSlide = slide(a); + byte[] bSlide = slide(b); + t = new PartialXYZT(NEUTRAL); + XYZT u = new XYZT(); + int i = 255; + for (; i >= 0; i--) { + if (aSlide[i] != 0 || bSlide[i] != 0) { + break; + } + } + for (; i >= 0; i--) { + doubleXYZ(t, new XYZ(t)); + if (aSlide[i] > 0) { + add(t, XYZT.fromPartialXYZT(u, t), pointAArray[aSlide[i] / 2]); + } else if (aSlide[i] < 0) { + sub(t, XYZT.fromPartialXYZT(u, t), pointAArray[-aSlide[i] / 2]); + } + if (bSlide[i] > 0) { + add(t, XYZT.fromPartialXYZT(u, t), B2[bSlide[i] / 2]); + } else if (bSlide[i] < 0) { + sub(t, XYZT.fromPartialXYZT(u, t), B2[-bSlide[i] / 2]); + } + } + + return new XYZ(t); + } + + /** + * Returns true if {@code in} is nonzero. + * <p> + * Note that execution time might depend on the input {@code in}. + */ + private static boolean isNonZeroVarTime(long[] in) { + long[] inCopy = new long[in.length + 1]; + System.arraycopy(in, 0, inCopy, 0, in.length); + Field25519.reduceCoefficients(inCopy); + byte[] bytes = Field25519.contract(inCopy); + for (byte b : bytes) { + if (b != 0) { + return true; + } + } + return false; + } + + /** + * Returns the least significant bit of {@code in}. + */ + private static int getLsb(long[] in) { + return Field25519.contract(in)[0] & 1; + } + + /** + * Negates all values in {@code in} and store it in {@code out}. + */ + private static void neg(long[] out, long[] in) { + for (int i = 0; i < in.length; i++) { + out[i] = -in[i]; + } + } + + /** + * Computes {@code in}^(2^252-3) mod 2^255-19 and puts the result in {@code out}. + */ + private static void pow2252m3(long[] out, long[] in) { + long[] t0 = new long[Field25519.LIMB_CNT]; + long[] t1 = new long[Field25519.LIMB_CNT]; + long[] t2 = new long[Field25519.LIMB_CNT]; + + // z2 = z1^2^1 + Field25519.square(t0, in); + + // z8 = z2^2^2 + Field25519.square(t1, t0); + for (int i = 1; i < 2; i++) { + Field25519.square(t1, t1); + } + + // z9 = z1*z8 + Field25519.mult(t1, in, t1); + + // z11 = z2*z9 + Field25519.mult(t0, t0, t1); + + // z22 = z11^2^1 + Field25519.square(t0, t0); + + // z_5_0 = z9*z22 + Field25519.mult(t0, t1, t0); + + // z_10_5 = z_5_0^2^5 + Field25519.square(t1, t0); + for (int i = 1; i < 5; i++) { + Field25519.square(t1, t1); + } + + // z_10_0 = z_10_5*z_5_0 + Field25519.mult(t0, t1, t0); + + // z_20_10 = z_10_0^2^10 + Field25519.square(t1, t0); + for (int i = 1; i < 10; i++) { + Field25519.square(t1, t1); + } + + // z_20_0 = z_20_10*z_10_0 + Field25519.mult(t1, t1, t0); + + // z_40_20 = z_20_0^2^20 + Field25519.square(t2, t1); + for (int i = 1; i < 20; i++) { + Field25519.square(t2, t2); + } + + // z_40_0 = z_40_20*z_20_0 + Field25519.mult(t1, t2, t1); + + // z_50_10 = z_40_0^2^10 + Field25519.square(t1, t1); + for (int i = 1; i < 10; i++) { + Field25519.square(t1, t1); + } + + // z_50_0 = z_50_10*z_10_0 + Field25519.mult(t0, t1, t0); + + // z_100_50 = z_50_0^2^50 + Field25519.square(t1, t0); + for (int i = 1; i < 50; i++) { + Field25519.square(t1, t1); + } + + // z_100_0 = z_100_50*z_50_0 + Field25519.mult(t1, t1, t0); + + // z_200_100 = z_100_0^2^100 + Field25519.square(t2, t1); + for (int i = 1; i < 100; i++) { + Field25519.square(t2, t2); + } + + // z_200_0 = z_200_100*z_100_0 + Field25519.mult(t1, t2, t1); + + // z_250_50 = z_200_0^2^50 + Field25519.square(t1, t1); + for (int i = 1; i < 50; i++) { + Field25519.square(t1, t1); + } + + // z_250_0 = z_250_50*z_50_0 + Field25519.mult(t0, t1, t0); + + // z_252_2 = z_250_0^2^2 + Field25519.square(t0, t0); + for (int i = 1; i < 2; i++) { + Field25519.square(t0, t0); + } + + // z_252_3 = z_252_2*z1 + Field25519.mult(out, t0, in); + } + + /** + * Returns 3 bytes of {@code in} starting from {@code idx} in Little-Endian format. + */ + private static long load3(byte[] in, int idx) { + long result; + result = (long) in[idx] & 0xff; + result |= (long) (in[idx + 1] & 0xff) << 8; + result |= (long) (in[idx + 2] & 0xff) << 16; + return result; + } + + /** + * Returns 4 bytes of {@code in} starting from {@code idx} in Little-Endian format. + */ + private static long load4(byte[] in, int idx) { + long result = load3(in, idx); + result |= (long) (in[idx + 3] & 0xff) << 24; + return result; + } + + /** + * Input: + * s[0]+256*s[1]+...+256^63*s[63] = s + * <p> + * Output: + * s[0]+256*s[1]+...+256^31*s[31] = s mod l + * where l = 2^252 + 27742317777372353535851937790883648493. + * Overwrites s in place. + */ + private static void reduce(byte[] s) { + // Observation: + // 2^252 mod l is equivalent to -27742317777372353535851937790883648493 mod l + // Let m = -27742317777372353535851937790883648493 + // Thus a*2^252+b mod l is equivalent to a*m+b mod l + // + // First s is divided into chunks of 21 bits as follows: + // s0+2^21*s1+2^42*s3+...+2^462*s23 = s[0]+256*s[1]+...+256^63*s[63] + long s0 = 2097151 & load3(s, 0); + long s1 = 2097151 & (load4(s, 2) >> 5); + long s2 = 2097151 & (load3(s, 5) >> 2); + long s3 = 2097151 & (load4(s, 7) >> 7); + long s4 = 2097151 & (load4(s, 10) >> 4); + long s5 = 2097151 & (load3(s, 13) >> 1); + long s6 = 2097151 & (load4(s, 15) >> 6); + long s7 = 2097151 & (load3(s, 18) >> 3); + long s8 = 2097151 & load3(s, 21); + long s9 = 2097151 & (load4(s, 23) >> 5); + long s10 = 2097151 & (load3(s, 26) >> 2); + long s11 = 2097151 & (load4(s, 28) >> 7); + long s12 = 2097151 & (load4(s, 31) >> 4); + long s13 = 2097151 & (load3(s, 34) >> 1); + long s14 = 2097151 & (load4(s, 36) >> 6); + long s15 = 2097151 & (load3(s, 39) >> 3); + long s16 = 2097151 & load3(s, 42); + long s17 = 2097151 & (load4(s, 44) >> 5); + long s18 = 2097151 & (load3(s, 47) >> 2); + long s19 = 2097151 & (load4(s, 49) >> 7); + long s20 = 2097151 & (load4(s, 52) >> 4); + long s21 = 2097151 & (load3(s, 55) >> 1); + long s22 = 2097151 & (load4(s, 57) >> 6); + long s23 = (load4(s, 60) >> 3); + long carry0; + long carry1; + long carry2; + long carry3; + long carry4; + long carry5; + long carry6; + long carry7; + long carry8; + long carry9; + long carry10; + long carry11; + long carry12; + long carry13; + long carry14; + long carry15; + long carry16; + + // s23*2^462 = s23*2^210*2^252 is equivalent to s23*2^210*m in mod l + // As m is a 125 bit number, the result needs to scattered to 6 limbs (125/21 ceil is 6) + // starting from s11 (s11*2^210) + // m = [666643, 470296, 654183, -997805, 136657, -683901] in 21-bit limbs + s11 += s23 * 666643; + s12 += s23 * 470296; + s13 += s23 * 654183; + s14 -= s23 * 997805; + s15 += s23 * 136657; + s16 -= s23 * 683901; + // s23 = 0; + + s10 += s22 * 666643; + s11 += s22 * 470296; + s12 += s22 * 654183; + s13 -= s22 * 997805; + s14 += s22 * 136657; + s15 -= s22 * 683901; + // s22 = 0; + + s9 += s21 * 666643; + s10 += s21 * 470296; + s11 += s21 * 654183; + s12 -= s21 * 997805; + s13 += s21 * 136657; + s14 -= s21 * 683901; + // s21 = 0; + + s8 += s20 * 666643; + s9 += s20 * 470296; + s10 += s20 * 654183; + s11 -= s20 * 997805; + s12 += s20 * 136657; + s13 -= s20 * 683901; + // s20 = 0; + + s7 += s19 * 666643; + s8 += s19 * 470296; + s9 += s19 * 654183; + s10 -= s19 * 997805; + s11 += s19 * 136657; + s12 -= s19 * 683901; + // s19 = 0; + + s6 += s18 * 666643; + s7 += s18 * 470296; + s8 += s18 * 654183; + s9 -= s18 * 997805; + s10 += s18 * 136657; + s11 -= s18 * 683901; + // s18 = 0; + + // Reduce the bit length of limbs from s6 to s15 to 21-bits. + carry6 = (s6 + (1 << 20)) >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry8 = (s8 + (1 << 20)) >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry10 = (s10 + (1 << 20)) >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry12 = (s12 + (1 << 20)) >> 21; + s13 += carry12; + s12 -= carry12 << 21; + carry14 = (s14 + (1 << 20)) >> 21; + s15 += carry14; + s14 -= carry14 << 21; + carry16 = (s16 + (1 << 20)) >> 21; + s17 += carry16; + s16 -= carry16 << 21; + + carry7 = (s7 + (1 << 20)) >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry9 = (s9 + (1 << 20)) >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry11 = (s11 + (1 << 20)) >> 21; + s12 += carry11; + s11 -= carry11 << 21; + carry13 = (s13 + (1 << 20)) >> 21; + s14 += carry13; + s13 -= carry13 << 21; + carry15 = (s15 + (1 << 20)) >> 21; + s16 += carry15; + s15 -= carry15 << 21; + + // Resume reduction where we left off. + s5 += s17 * 666643; + s6 += s17 * 470296; + s7 += s17 * 654183; + s8 -= s17 * 997805; + s9 += s17 * 136657; + s10 -= s17 * 683901; + // s17 = 0; + + s4 += s16 * 666643; + s5 += s16 * 470296; + s6 += s16 * 654183; + s7 -= s16 * 997805; + s8 += s16 * 136657; + s9 -= s16 * 683901; + // s16 = 0; + + s3 += s15 * 666643; + s4 += s15 * 470296; + s5 += s15 * 654183; + s6 -= s15 * 997805; + s7 += s15 * 136657; + s8 -= s15 * 683901; + // s15 = 0; + + s2 += s14 * 666643; + s3 += s14 * 470296; + s4 += s14 * 654183; + s5 -= s14 * 997805; + s6 += s14 * 136657; + s7 -= s14 * 683901; + // s14 = 0; + + s1 += s13 * 666643; + s2 += s13 * 470296; + s3 += s13 * 654183; + s4 -= s13 * 997805; + s5 += s13 * 136657; + s6 -= s13 * 683901; + // s13 = 0; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + + // Reduce the range of limbs from s0 to s11 to 21-bits. + carry0 = (s0 + (1 << 20)) >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry2 = (s2 + (1 << 20)) >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry4 = (s4 + (1 << 20)) >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry6 = (s6 + (1 << 20)) >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry8 = (s8 + (1 << 20)) >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry10 = (s10 + (1 << 20)) >> 21; + s11 += carry10; + s10 -= carry10 << 21; + + carry1 = (s1 + (1 << 20)) >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry3 = (s3 + (1 << 20)) >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry5 = (s5 + (1 << 20)) >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry7 = (s7 + (1 << 20)) >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry9 = (s9 + (1 << 20)) >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry11 = (s11 + (1 << 20)) >> 21; + s12 += carry11; + s11 -= carry11 << 21; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + + // Carry chain reduction to propagate excess bits from s0 to s5 to the most significant limbs. + carry0 = s0 >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry1 = s1 >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry2 = s2 >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry3 = s3 >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry4 = s4 >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry5 = s5 >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry6 = s6 >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry7 = s7 >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry8 = s8 >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry9 = s9 >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry10 = s10 >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry11 = s11 >> 21; + s12 += carry11; + s11 -= carry11 << 21; + + // Do one last reduction as s12 might be 1. + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + // s12 = 0; + + carry0 = s0 >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry1 = s1 >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry2 = s2 >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry3 = s3 >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry4 = s4 >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry5 = s5 >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry6 = s6 >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry7 = s7 >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry8 = s8 >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry9 = s9 >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry10 = s10 >> 21; + s11 += carry10; + s10 -= carry10 << 21; + + // Serialize the result into the s. + s[0] = (byte) s0; + s[1] = (byte) (s0 >> 8); + s[2] = (byte) ((s0 >> 16) | (s1 << 5)); + s[3] = (byte) (s1 >> 3); + s[4] = (byte) (s1 >> 11); + s[5] = (byte) ((s1 >> 19) | (s2 << 2)); + s[6] = (byte) (s2 >> 6); + s[7] = (byte) ((s2 >> 14) | (s3 << 7)); + s[8] = (byte) (s3 >> 1); + s[9] = (byte) (s3 >> 9); + s[10] = (byte) ((s3 >> 17) | (s4 << 4)); + s[11] = (byte) (s4 >> 4); + s[12] = (byte) (s4 >> 12); + s[13] = (byte) ((s4 >> 20) | (s5 << 1)); + s[14] = (byte) (s5 >> 7); + s[15] = (byte) ((s5 >> 15) | (s6 << 6)); + s[16] = (byte) (s6 >> 2); + s[17] = (byte) (s6 >> 10); + s[18] = (byte) ((s6 >> 18) | (s7 << 3)); + s[19] = (byte) (s7 >> 5); + s[20] = (byte) (s7 >> 13); + s[21] = (byte) s8; + s[22] = (byte) (s8 >> 8); + s[23] = (byte) ((s8 >> 16) | (s9 << 5)); + s[24] = (byte) (s9 >> 3); + s[25] = (byte) (s9 >> 11); + s[26] = (byte) ((s9 >> 19) | (s10 << 2)); + s[27] = (byte) (s10 >> 6); + s[28] = (byte) ((s10 >> 14) | (s11 << 7)); + s[29] = (byte) (s11 >> 1); + s[30] = (byte) (s11 >> 9); + s[31] = (byte) (s11 >> 17); + } + + /** + * Input: + * a[0]+256*a[1]+...+256^31*a[31] = a + * b[0]+256*b[1]+...+256^31*b[31] = b + * c[0]+256*c[1]+...+256^31*c[31] = c + * <p> + * Output: + * s[0]+256*s[1]+...+256^31*s[31] = (ab+c) mod l + * where l = 2^252 + 27742317777372353535851937790883648493. + */ + private static void mulAdd(byte[] s, byte[] a, byte[] b, byte[] c) { + // This is very similar to Ed25519.reduce, the difference in here is that it computes ab+c + // See Ed25519.reduce for related comments. + long a0 = 2097151 & load3(a, 0); + long a1 = 2097151 & (load4(a, 2) >> 5); + long a2 = 2097151 & (load3(a, 5) >> 2); + long a3 = 2097151 & (load4(a, 7) >> 7); + long a4 = 2097151 & (load4(a, 10) >> 4); + long a5 = 2097151 & (load3(a, 13) >> 1); + long a6 = 2097151 & (load4(a, 15) >> 6); + long a7 = 2097151 & (load3(a, 18) >> 3); + long a8 = 2097151 & load3(a, 21); + long a9 = 2097151 & (load4(a, 23) >> 5); + long a10 = 2097151 & (load3(a, 26) >> 2); + long a11 = (load4(a, 28) >> 7); + long b0 = 2097151 & load3(b, 0); + long b1 = 2097151 & (load4(b, 2) >> 5); + long b2 = 2097151 & (load3(b, 5) >> 2); + long b3 = 2097151 & (load4(b, 7) >> 7); + long b4 = 2097151 & (load4(b, 10) >> 4); + long b5 = 2097151 & (load3(b, 13) >> 1); + long b6 = 2097151 & (load4(b, 15) >> 6); + long b7 = 2097151 & (load3(b, 18) >> 3); + long b8 = 2097151 & load3(b, 21); + long b9 = 2097151 & (load4(b, 23) >> 5); + long b10 = 2097151 & (load3(b, 26) >> 2); + long b11 = (load4(b, 28) >> 7); + long c0 = 2097151 & load3(c, 0); + long c1 = 2097151 & (load4(c, 2) >> 5); + long c2 = 2097151 & (load3(c, 5) >> 2); + long c3 = 2097151 & (load4(c, 7) >> 7); + long c4 = 2097151 & (load4(c, 10) >> 4); + long c5 = 2097151 & (load3(c, 13) >> 1); + long c6 = 2097151 & (load4(c, 15) >> 6); + long c7 = 2097151 & (load3(c, 18) >> 3); + long c8 = 2097151 & load3(c, 21); + long c9 = 2097151 & (load4(c, 23) >> 5); + long c10 = 2097151 & (load3(c, 26) >> 2); + long c11 = (load4(c, 28) >> 7); + long s0; + long s1; + long s2; + long s3; + long s4; + long s5; + long s6; + long s7; + long s8; + long s9; + long s10; + long s11; + long s12; + long s13; + long s14; + long s15; + long s16; + long s17; + long s18; + long s19; + long s20; + long s21; + long s22; + long s23; + long carry0; + long carry1; + long carry2; + long carry3; + long carry4; + long carry5; + long carry6; + long carry7; + long carry8; + long carry9; + long carry10; + long carry11; + long carry12; + long carry13; + long carry14; + long carry15; + long carry16; + long carry17; + long carry18; + long carry19; + long carry20; + long carry21; + long carry22; + + s0 = c0 + a0 * b0; + s1 = c1 + a0 * b1 + a1 * b0; + s2 = c2 + a0 * b2 + a1 * b1 + a2 * b0; + s3 = c3 + a0 * b3 + a1 * b2 + a2 * b1 + a3 * b0; + s4 = c4 + a0 * b4 + a1 * b3 + a2 * b2 + a3 * b1 + a4 * b0; + s5 = c5 + a0 * b5 + a1 * b4 + a2 * b3 + a3 * b2 + a4 * b1 + a5 * b0; + s6 = c6 + a0 * b6 + a1 * b5 + a2 * b4 + a3 * b3 + a4 * b2 + a5 * b1 + a6 * b0; + s7 = c7 + a0 * b7 + a1 * b6 + a2 * b5 + a3 * b4 + a4 * b3 + a5 * b2 + a6 * b1 + a7 * b0; + s8 = c8 + a0 * b8 + a1 * b7 + a2 * b6 + a3 * b5 + a4 * b4 + a5 * b3 + a6 * b2 + a7 * b1 + + a8 * b0; + s9 = c9 + a0 * b9 + a1 * b8 + a2 * b7 + a3 * b6 + a4 * b5 + a5 * b4 + a6 * b3 + a7 * b2 + + a8 * b1 + a9 * b0; + s10 = c10 + a0 * b10 + a1 * b9 + a2 * b8 + a3 * b7 + a4 * b6 + a5 * b5 + a6 * b4 + a7 * b3 + + a8 * b2 + a9 * b1 + a10 * b0; + s11 = c11 + a0 * b11 + a1 * b10 + a2 * b9 + a3 * b8 + a4 * b7 + a5 * b6 + a6 * b5 + a7 * b4 + + a8 * b3 + a9 * b2 + a10 * b1 + a11 * b0; + s12 = a1 * b11 + a2 * b10 + a3 * b9 + a4 * b8 + a5 * b7 + a6 * b6 + a7 * b5 + a8 * b4 + a9 * b3 + + a10 * b2 + a11 * b1; + s13 = a2 * b11 + a3 * b10 + a4 * b9 + a5 * b8 + a6 * b7 + a7 * b6 + a8 * b5 + a9 * b4 + a10 * b3 + + a11 * b2; + s14 = a3 * b11 + a4 * b10 + a5 * b9 + a6 * b8 + a7 * b7 + a8 * b6 + a9 * b5 + a10 * b4 + + a11 * b3; + s15 = a4 * b11 + a5 * b10 + a6 * b9 + a7 * b8 + a8 * b7 + a9 * b6 + a10 * b5 + a11 * b4; + s16 = a5 * b11 + a6 * b10 + a7 * b9 + a8 * b8 + a9 * b7 + a10 * b6 + a11 * b5; + s17 = a6 * b11 + a7 * b10 + a8 * b9 + a9 * b8 + a10 * b7 + a11 * b6; + s18 = a7 * b11 + a8 * b10 + a9 * b9 + a10 * b8 + a11 * b7; + s19 = a8 * b11 + a9 * b10 + a10 * b9 + a11 * b8; + s20 = a9 * b11 + a10 * b10 + a11 * b9; + s21 = a10 * b11 + a11 * b10; + s22 = a11 * b11; + s23 = 0; + + carry0 = (s0 + (1 << 20)) >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry2 = (s2 + (1 << 20)) >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry4 = (s4 + (1 << 20)) >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry6 = (s6 + (1 << 20)) >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry8 = (s8 + (1 << 20)) >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry10 = (s10 + (1 << 20)) >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry12 = (s12 + (1 << 20)) >> 21; + s13 += carry12; + s12 -= carry12 << 21; + carry14 = (s14 + (1 << 20)) >> 21; + s15 += carry14; + s14 -= carry14 << 21; + carry16 = (s16 + (1 << 20)) >> 21; + s17 += carry16; + s16 -= carry16 << 21; + carry18 = (s18 + (1 << 20)) >> 21; + s19 += carry18; + s18 -= carry18 << 21; + carry20 = (s20 + (1 << 20)) >> 21; + s21 += carry20; + s20 -= carry20 << 21; + carry22 = (s22 + (1 << 20)) >> 21; + s23 += carry22; + s22 -= carry22 << 21; + + carry1 = (s1 + (1 << 20)) >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry3 = (s3 + (1 << 20)) >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry5 = (s5 + (1 << 20)) >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry7 = (s7 + (1 << 20)) >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry9 = (s9 + (1 << 20)) >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry11 = (s11 + (1 << 20)) >> 21; + s12 += carry11; + s11 -= carry11 << 21; + carry13 = (s13 + (1 << 20)) >> 21; + s14 += carry13; + s13 -= carry13 << 21; + carry15 = (s15 + (1 << 20)) >> 21; + s16 += carry15; + s15 -= carry15 << 21; + carry17 = (s17 + (1 << 20)) >> 21; + s18 += carry17; + s17 -= carry17 << 21; + carry19 = (s19 + (1 << 20)) >> 21; + s20 += carry19; + s19 -= carry19 << 21; + carry21 = (s21 + (1 << 20)) >> 21; + s22 += carry21; + s21 -= carry21 << 21; + + s11 += s23 * 666643; + s12 += s23 * 470296; + s13 += s23 * 654183; + s14 -= s23 * 997805; + s15 += s23 * 136657; + s16 -= s23 * 683901; + // s23 = 0; + + s10 += s22 * 666643; + s11 += s22 * 470296; + s12 += s22 * 654183; + s13 -= s22 * 997805; + s14 += s22 * 136657; + s15 -= s22 * 683901; + // s22 = 0; + + s9 += s21 * 666643; + s10 += s21 * 470296; + s11 += s21 * 654183; + s12 -= s21 * 997805; + s13 += s21 * 136657; + s14 -= s21 * 683901; + // s21 = 0; + + s8 += s20 * 666643; + s9 += s20 * 470296; + s10 += s20 * 654183; + s11 -= s20 * 997805; + s12 += s20 * 136657; + s13 -= s20 * 683901; + // s20 = 0; + + s7 += s19 * 666643; + s8 += s19 * 470296; + s9 += s19 * 654183; + s10 -= s19 * 997805; + s11 += s19 * 136657; + s12 -= s19 * 683901; + // s19 = 0; + + s6 += s18 * 666643; + s7 += s18 * 470296; + s8 += s18 * 654183; + s9 -= s18 * 997805; + s10 += s18 * 136657; + s11 -= s18 * 683901; + // s18 = 0; + + carry6 = (s6 + (1 << 20)) >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry8 = (s8 + (1 << 20)) >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry10 = (s10 + (1 << 20)) >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry12 = (s12 + (1 << 20)) >> 21; + s13 += carry12; + s12 -= carry12 << 21; + carry14 = (s14 + (1 << 20)) >> 21; + s15 += carry14; + s14 -= carry14 << 21; + carry16 = (s16 + (1 << 20)) >> 21; + s17 += carry16; + s16 -= carry16 << 21; + + carry7 = (s7 + (1 << 20)) >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry9 = (s9 + (1 << 20)) >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry11 = (s11 + (1 << 20)) >> 21; + s12 += carry11; + s11 -= carry11 << 21; + carry13 = (s13 + (1 << 20)) >> 21; + s14 += carry13; + s13 -= carry13 << 21; + carry15 = (s15 + (1 << 20)) >> 21; + s16 += carry15; + s15 -= carry15 << 21; + + s5 += s17 * 666643; + s6 += s17 * 470296; + s7 += s17 * 654183; + s8 -= s17 * 997805; + s9 += s17 * 136657; + s10 -= s17 * 683901; + // s17 = 0; + + s4 += s16 * 666643; + s5 += s16 * 470296; + s6 += s16 * 654183; + s7 -= s16 * 997805; + s8 += s16 * 136657; + s9 -= s16 * 683901; + // s16 = 0; + + s3 += s15 * 666643; + s4 += s15 * 470296; + s5 += s15 * 654183; + s6 -= s15 * 997805; + s7 += s15 * 136657; + s8 -= s15 * 683901; + // s15 = 0; + + s2 += s14 * 666643; + s3 += s14 * 470296; + s4 += s14 * 654183; + s5 -= s14 * 997805; + s6 += s14 * 136657; + s7 -= s14 * 683901; + // s14 = 0; + + s1 += s13 * 666643; + s2 += s13 * 470296; + s3 += s13 * 654183; + s4 -= s13 * 997805; + s5 += s13 * 136657; + s6 -= s13 * 683901; + // s13 = 0; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + + carry0 = (s0 + (1 << 20)) >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry2 = (s2 + (1 << 20)) >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry4 = (s4 + (1 << 20)) >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry6 = (s6 + (1 << 20)) >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry8 = (s8 + (1 << 20)) >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry10 = (s10 + (1 << 20)) >> 21; + s11 += carry10; + s10 -= carry10 << 21; + + carry1 = (s1 + (1 << 20)) >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry3 = (s3 + (1 << 20)) >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry5 = (s5 + (1 << 20)) >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry7 = (s7 + (1 << 20)) >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry9 = (s9 + (1 << 20)) >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry11 = (s11 + (1 << 20)) >> 21; + s12 += carry11; + s11 -= carry11 << 21; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + s12 = 0; + + carry0 = s0 >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry1 = s1 >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry2 = s2 >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry3 = s3 >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry4 = s4 >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry5 = s5 >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry6 = s6 >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry7 = s7 >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry8 = s8 >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry9 = s9 >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry10 = s10 >> 21; + s11 += carry10; + s10 -= carry10 << 21; + carry11 = s11 >> 21; + s12 += carry11; + s11 -= carry11 << 21; + + s0 += s12 * 666643; + s1 += s12 * 470296; + s2 += s12 * 654183; + s3 -= s12 * 997805; + s4 += s12 * 136657; + s5 -= s12 * 683901; + // s12 = 0; + + carry0 = s0 >> 21; + s1 += carry0; + s0 -= carry0 << 21; + carry1 = s1 >> 21; + s2 += carry1; + s1 -= carry1 << 21; + carry2 = s2 >> 21; + s3 += carry2; + s2 -= carry2 << 21; + carry3 = s3 >> 21; + s4 += carry3; + s3 -= carry3 << 21; + carry4 = s4 >> 21; + s5 += carry4; + s4 -= carry4 << 21; + carry5 = s5 >> 21; + s6 += carry5; + s5 -= carry5 << 21; + carry6 = s6 >> 21; + s7 += carry6; + s6 -= carry6 << 21; + carry7 = s7 >> 21; + s8 += carry7; + s7 -= carry7 << 21; + carry8 = s8 >> 21; + s9 += carry8; + s8 -= carry8 << 21; + carry9 = s9 >> 21; + s10 += carry9; + s9 -= carry9 << 21; + carry10 = s10 >> 21; + s11 += carry10; + s10 -= carry10 << 21; + + s[0] = (byte) s0; + s[1] = (byte) (s0 >> 8); + s[2] = (byte) ((s0 >> 16) | (s1 << 5)); + s[3] = (byte) (s1 >> 3); + s[4] = (byte) (s1 >> 11); + s[5] = (byte) ((s1 >> 19) | (s2 << 2)); + s[6] = (byte) (s2 >> 6); + s[7] = (byte) ((s2 >> 14) | (s3 << 7)); + s[8] = (byte) (s3 >> 1); + s[9] = (byte) (s3 >> 9); + s[10] = (byte) ((s3 >> 17) | (s4 << 4)); + s[11] = (byte) (s4 >> 4); + s[12] = (byte) (s4 >> 12); + s[13] = (byte) ((s4 >> 20) | (s5 << 1)); + s[14] = (byte) (s5 >> 7); + s[15] = (byte) ((s5 >> 15) | (s6 << 6)); + s[16] = (byte) (s6 >> 2); + s[17] = (byte) (s6 >> 10); + s[18] = (byte) ((s6 >> 18) | (s7 << 3)); + s[19] = (byte) (s7 >> 5); + s[20] = (byte) (s7 >> 13); + s[21] = (byte) s8; + s[22] = (byte) (s8 >> 8); + s[23] = (byte) ((s8 >> 16) | (s9 << 5)); + s[24] = (byte) (s9 >> 3); + s[25] = (byte) (s9 >> 11); + s[26] = (byte) ((s9 >> 19) | (s10 << 2)); + s[27] = (byte) (s10 >> 6); + s[28] = (byte) ((s10 >> 14) | (s11 << 7)); + s[29] = (byte) (s11 >> 1); + s[30] = (byte) (s11 >> 9); + s[31] = (byte) (s11 >> 17); + } + + // The order of the generator as unsigned bytes in little endian order. + // (2^252 + 0x14def9dea2f79cd65812631a5cf5d3ed, cf. RFC 7748) + private static final byte[] GROUP_ORDER = { + (byte) 0xed, (byte) 0xd3, (byte) 0xf5, (byte) 0x5c, + (byte) 0x1a, (byte) 0x63, (byte) 0x12, (byte) 0x58, + (byte) 0xd6, (byte) 0x9c, (byte) 0xf7, (byte) 0xa2, + (byte) 0xde, (byte) 0xf9, (byte) 0xde, (byte) 0x14, + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x10}; + + // Checks whether s represents an integer smaller than the order of the group. + // This is needed to ensure that EdDSA signatures are non-malleable, as failing to check + // the range of S allows to modify signatures (cf. RFC 8032, Section 5.2.7 and Section 8.4.) + // @param s an integer in little-endian order. + private static boolean isSmallerThanGroupOrder(byte[] s) { + for (int j = Field25519.FIELD_LEN - 1; j >= 0; j--) { + // compare unsigned bytes + int a = s[j] & 0xff; + int b = GROUP_ORDER[j] & 0xff; + if (a != b) { + return a < b; + } + } + return false; + } + + /** + * Returns true if the EdDSA {@code signature} with {@code message}, can be verified with + * {@code publicKey}. + */ + public static boolean verify(final byte[] message, final byte[] signature, + final byte[] publicKey) { + try { + if (signature.length != SIGNATURE_LEN) { + return false; + } + if (publicKey.length != PUBLIC_KEY_LEN) { + return false; + } + byte[] s = Arrays.copyOfRange(signature, Field25519.FIELD_LEN, SIGNATURE_LEN); + if (!isSmallerThanGroupOrder(s)) { + return false; + } + MessageDigest digest = MessageDigest.getInstance("SHA-512"); + digest.update(signature, 0, Field25519.FIELD_LEN); + digest.update(publicKey); + digest.update(message); + byte[] h = digest.digest(); + reduce(h); + + XYZT negPublicKey = XYZT.fromBytesNegateVarTime(publicKey); + XYZ xyz = doubleScalarMultVarTime(h, negPublicKey, s); + byte[] expectedR = xyz.toBytes(); + for (int i = 0; i < Field25519.FIELD_LEN; i++) { + if (expectedR[i] != signature[i]) { + return false; + } + } + return true; + } catch (final GeneralSecurityException ignored) { + return false; + } + } +} diff --git a/ui/src/main/java/com/wireguard/android/updater/SnackbarUpdateShower.kt b/ui/src/main/java/com/wireguard/android/updater/SnackbarUpdateShower.kt new file mode 100644 index 00000000..30da3b07 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/updater/SnackbarUpdateShower.kt @@ -0,0 +1,173 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.updater + +import android.content.Intent +import android.net.Uri +import android.view.View +import android.widget.Toast +import androidx.activity.result.contract.ActivityResultContracts +import androidx.fragment.app.Fragment +import androidx.lifecycle.lifecycleScope +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.google.android.material.snackbar.BaseTransientBottomBar +import com.google.android.material.snackbar.Snackbar +import com.wireguard.android.R +import com.wireguard.android.util.ErrorMessages +import com.wireguard.android.util.QuantityFormatter +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.launch +import kotlin.time.Duration.Companion.seconds + +class SnackbarUpdateShower(private val fragment: Fragment) { + private var lastUserIntervention: Updater.Progress.NeedsUserIntervention? = null + private val intentLauncher = fragment.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { + lastUserIntervention?.markAsDone() + } + + private class SwapableSnackbar(fragment: Fragment, view: View, anchor: View?) { + private val actionSnackbar = makeSnackbar(fragment, view, anchor) + private val statusSnackbar = makeSnackbar(fragment, view, anchor) + private var showingAction: Boolean = false + private var showingStatus: Boolean = false + + private fun makeSnackbar(fragment: Fragment, view: View, anchor: View?): Snackbar { + val snackbar = Snackbar.make(fragment.requireContext(), view, "", Snackbar.LENGTH_INDEFINITE) + if (anchor != null) + snackbar.anchorView = anchor + snackbar.setTextMaxLines(6) + snackbar.behavior = object : BaseTransientBottomBar.Behavior() { + override fun canSwipeDismissView(child: View): Boolean { + return false + } + } + snackbar.addCallback(object : BaseTransientBottomBar.BaseCallback<Snackbar>() { + override fun onDismissed(snackbar: Snackbar?, @DismissEvent event: Int) { + super.onDismissed(snackbar, event) + if (event == DISMISS_EVENT_MANUAL || event == DISMISS_EVENT_ACTION || + (snackbar == actionSnackbar && !showingAction) || (snackbar == statusSnackbar && !showingStatus) + ) + return + fragment.lifecycleScope.launch { + delay(5.seconds) + snackbar?.show() + } + } + }) + return snackbar + } + + fun showAction(text: String, action: String, listener: View.OnClickListener) { + if (showingStatus) { + showingStatus = false + statusSnackbar.dismiss() + } + actionSnackbar.setText(text) + actionSnackbar.setAction(action, listener) + if (!showingAction) { + actionSnackbar.show() + showingAction = true + } + } + + fun showText(text: String) { + if (showingAction) { + showingAction = false + actionSnackbar.dismiss() + } + statusSnackbar.setText(text) + if (!showingStatus) { + statusSnackbar.show() + showingStatus = true + } + } + + fun dismiss() { + actionSnackbar.dismiss() + statusSnackbar.dismiss() + showingAction = false + showingStatus = false + } + } + + fun attach(view: View, anchor: View?) { + val snackbar = SwapableSnackbar(fragment, view, anchor) + val context = fragment.requireContext() + + Updater.state.onEach { progress -> + when (progress) { + is Updater.Progress.Complete -> + snackbar.dismiss() + + is Updater.Progress.Available -> + snackbar.showAction(context.getString(R.string.updater_avalable), context.getString(R.string.updater_action)) { + progress.update() + } + + is Updater.Progress.NeedsUserIntervention -> { + lastUserIntervention = progress + intentLauncher.launch(progress.intent) + } + + is Updater.Progress.Installing -> + snackbar.showText(context.getString(R.string.updater_installing)) + + is Updater.Progress.Rechecking -> + snackbar.showText(context.getString(R.string.updater_rechecking)) + + is Updater.Progress.Downloading -> { + if (progress.bytesTotal != 0UL) { + snackbar.showText( + context.getString( + R.string.updater_download_progress, + QuantityFormatter.formatBytes(progress.bytesDownloaded.toLong()), + QuantityFormatter.formatBytes(progress.bytesTotal.toLong()), + progress.bytesDownloaded.toFloat() * 100.0 / progress.bytesTotal.toFloat() + ) + ) + } else { + snackbar.showText( + context.getString( + R.string.updater_download_progress_nototal, + QuantityFormatter.formatBytes(progress.bytesDownloaded.toLong()) + ) + ) + } + } + + is Updater.Progress.Failure -> { + snackbar.showText(context.getString(R.string.updater_failure, ErrorMessages[progress.error])) + delay(5.seconds) + progress.retry() + } + + is Updater.Progress.Corrupt -> { + MaterialAlertDialogBuilder(context) + .setTitle(R.string.updater_corrupt_title) + .setMessage(R.string.updater_corrupt_message) + .setPositiveButton(R.string.updater_corrupt_navigate) { _, _ -> + val intent = Intent(Intent.ACTION_VIEW) + intent.data = Uri.parse(progress.downloadUrl) + try { + context.startActivity(intent) + } catch (e: Throwable) { + Toast.makeText(context, ErrorMessages[e], Toast.LENGTH_SHORT).show() + } + }.setCancelable(false).setOnDismissListener { + val intent = Intent(Intent.ACTION_MAIN) + intent.addCategory(Intent.CATEGORY_HOME) + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK) + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(intent) + System.exit(0) + }.show() + } + } + }.launchIn(fragment.lifecycleScope) + } +}
\ No newline at end of file diff --git a/ui/src/main/java/com/wireguard/android/updater/Updater.kt b/ui/src/main/java/com/wireguard/android/updater/Updater.kt new file mode 100644 index 00000000..651e3cd7 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/updater/Updater.kt @@ -0,0 +1,451 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ +package com.wireguard.android.updater + +import android.Manifest +import android.app.PendingIntent +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.content.pm.PackageInstaller +import android.content.pm.PackageManager +import android.os.Build +import android.util.Base64 +import android.util.Log +import androidx.core.content.ContextCompat +import androidx.core.content.IntentCompat +import com.wireguard.android.Application +import com.wireguard.android.BuildConfig +import com.wireguard.android.activity.MainActivity +import com.wireguard.android.util.UserKnobs +import com.wireguard.android.util.applicationScope +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.firstOrNull +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.IOException +import java.net.HttpURLConnection +import java.net.URL +import java.nio.charset.StandardCharsets +import java.security.InvalidKeyException +import java.security.InvalidParameterException +import java.security.MessageDigest +import java.util.UUID +import kotlin.math.max +import kotlin.time.Duration.Companion.minutes +import kotlin.time.Duration.Companion.seconds + +object Updater { + private const val TAG = "WireGuard/Updater" + private const val UPDATE_URL_FMT = "https://download.wireguard.com/android-client/%s" + private const val APK_NAME_PREFIX = BuildConfig.APPLICATION_ID + "-" + private const val APK_NAME_SUFFIX = ".apk" + private const val LATEST_FILE = "latest.sig" + private const val RELEASE_PUBLIC_KEY_BASE64 = "RWTAzwGRYr3EC9px0Ia3fbttz8WcVN6wrOwWp2delz4el6SI8XmkKSMp" + private val CURRENT_VERSION by lazy { Version(BuildConfig.VERSION_NAME) } + + private val updaterScope = CoroutineScope(Job() + Dispatchers.IO) + + private fun installer(context: Context): String = try { + val packageName = context.packageName + val pm = context.packageManager + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + pm.getInstallSourceInfo(packageName).installingPackageName ?: "" + } else { + @Suppress("DEPRECATION") + pm.getInstallerPackageName(packageName) ?: "" + } + } catch (_: Throwable) { + "" + } + + fun installerIsGooglePlay(context: Context): Boolean = installer(context) == "com.android.vending" + + sealed class Progress { + object Complete : Progress() + class Available(val version: String) : Progress() { + fun update() { + applicationScope.launch { + UserKnobs.setUpdaterNewerVersionConsented(version) + } + } + } + + object Rechecking : Progress() + class Downloading(val bytesDownloaded: ULong, val bytesTotal: ULong) : Progress() + object Installing : Progress() + class NeedsUserIntervention(val intent: Intent, private val id: Int) : Progress() { + + private suspend fun installerActive(): Boolean { + if (mutableState.firstOrNull() != this@NeedsUserIntervention) + return true + try { + if (Application.get().packageManager.packageInstaller.getSessionInfo(id)?.isActive == true) + return true + } catch (_: SecurityException) { + return true + } + return false + } + + fun markAsDone() { + applicationScope.launch { + if (installerActive()) + return@launch + delay(7.seconds) + if (installerActive()) + return@launch + emitProgress(Failure(Exception("Ignored by user"))) + } + } + } + + class Failure(val error: Throwable) : Progress() { + fun retry() { + updaterScope.launch { + downloadAndUpdateWrapErrors() + } + } + } + + class Corrupt(private val betterFile: String?) : Progress() { + val downloadUrl: String + get() = UPDATE_URL_FMT.format(betterFile ?: "") + } + } + + private val mutableState = MutableStateFlow<Progress>(Progress.Complete) + val state = mutableState.asStateFlow() + + private suspend fun emitProgress(progress: Progress, force: Boolean = false) { + if (force || mutableState.firstOrNull()?.javaClass != progress.javaClass) + mutableState.emit(progress) + } + + private class Sha256Digest(hex: String) { + val bytes: ByteArray + + init { + if (hex.length != 64) + throw InvalidParameterException("SHA256 hashes must be 32 bytes long") + bytes = hex.chunked(2).map { it.toInt(16).toByte() }.toByteArray() + } + } + + @OptIn(ExperimentalUnsignedTypes::class) + private class Version(version: String) : Comparable<Version> { + val parts: ULongArray + + init { + val strParts = version.split(".") + if (strParts.isEmpty()) + throw InvalidParameterException("Version has no parts") + parts = ULongArray(strParts.size) + for (i in parts.indices) { + parts[i] = strParts[i].toULong() + } + } + + override fun toString(): String { + return parts.joinToString(".") + } + + override fun compareTo(other: Version): Int { + for (i in 0 until max(parts.size, other.parts.size)) { + val lhsPart = if (i < parts.size) parts[i] else 0UL + val rhsPart = if (i < other.parts.size) other.parts[i] else 0UL + if (lhsPart > rhsPart) + return 1 + else if (lhsPart < rhsPart) + return -1 + } + return 0 + } + } + + private class Update(val fileName: String, val version: Version, val hash: Sha256Digest) + + private fun versionOfFile(name: String): Version? { + if (!name.startsWith(APK_NAME_PREFIX) || !name.endsWith(APK_NAME_SUFFIX)) + return null + return try { + Version(name.substring(APK_NAME_PREFIX.length, name.length - APK_NAME_SUFFIX.length)) + } catch (_: Throwable) { + null + } + } + + private fun verifySignedFileList(signifyDigest: String): List<Update> { + val updates = ArrayList<Update>(1) + val publicKeyBytes = Base64.decode(RELEASE_PUBLIC_KEY_BASE64, Base64.DEFAULT) + if (publicKeyBytes == null || publicKeyBytes.size != 32 + 10 || publicKeyBytes[0] != 'E'.code.toByte() || publicKeyBytes[1] != 'd'.code.toByte()) + throw InvalidKeyException("Invalid public key") + val lines = signifyDigest.split("\n", limit = 3) + if (lines.size != 3) + throw InvalidParameterException("Invalid signature format: too few lines") + if (!lines[0].startsWith("untrusted comment: ")) + throw InvalidParameterException("Invalid signature format: missing comment") + val signatureBytes = Base64.decode(lines[1], Base64.DEFAULT) + if (signatureBytes == null || signatureBytes.size != 64 + 10) + throw InvalidParameterException("Invalid signature format: wrong sized or missing signature") + for (i in 0..9) { + if (signatureBytes[i] != publicKeyBytes[i]) + throw InvalidParameterException("Invalid signature format: wrong signer") + } + if (!Ed25519.verify( + lines[2].toByteArray(StandardCharsets.UTF_8), + signatureBytes.sliceArray(10 until 10 + 64), + publicKeyBytes.sliceArray(10 until 10 + 32) + ) + ) + throw SecurityException("Invalid signature") + for (line in lines[2].split("\n").dropLastWhile { it.isEmpty() }) { + val components = line.split(" ", limit = 2) + if (components.size != 2) + throw InvalidParameterException("Invalid file list format: too few components") + /* If version is null, it's not a file we understand, but still a legitimate entry, so don't throw. */ + val version = versionOfFile(components[1]) ?: continue + updates.add(Update(components[1], version, Sha256Digest(components[0]))) + } + return updates + } + + private fun checkForUpdates(): Update? { + val connection = URL(UPDATE_URL_FMT.format(LATEST_FILE)).openConnection() as HttpURLConnection + connection.setRequestProperty("User-Agent", Application.USER_AGENT) + connection.connect() + if (connection.responseCode != HttpURLConnection.HTTP_OK) + throw IOException(connection.responseMessage) + var fileListBytes = ByteArray(1024 * 512 /* 512 KiB */) + connection.inputStream.use { + val len = it.read(fileListBytes) + if (len <= 0) + throw IOException("File list is empty") + fileListBytes = fileListBytes.sliceArray(0 until len) + } + return verifySignedFileList(fileListBytes.decodeToString()).maxByOrNull { it.version } + } + + private suspend fun downloadAndUpdate() = withContext(Dispatchers.IO) { + val receiver = InstallReceiver() + val context = Application.get().applicationContext + val pendingIntent = withContext(Dispatchers.Main) { + ContextCompat.registerReceiver(context, receiver, IntentFilter(receiver.sessionId), ContextCompat.RECEIVER_NOT_EXPORTED) + PendingIntent.getBroadcast( + context, + 0, + Intent(receiver.sessionId).setPackage(context.packageName), + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE + ) + } + + emitProgress(Progress.Rechecking) + val update = checkForUpdates() + if (update == null || update.version <= CURRENT_VERSION) { + emitProgress(Progress.Complete) + return@withContext + } + + emitProgress(Progress.Downloading(0UL, 0UL), true) + val connection = URL(UPDATE_URL_FMT.format(update.fileName)).openConnection() as HttpURLConnection + connection.setRequestProperty("User-Agent", Application.USER_AGENT) + connection.connect() + if (connection.responseCode != HttpURLConnection.HTTP_OK) + throw IOException("Update could not be fetched: ${connection.responseCode}") + + var downloadedByteLen: ULong = 0UL + val totalByteLen = (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) connection.contentLengthLong else connection.contentLength).toLong().toULong() + val fileBytes = ByteArray(1024 * 32 /* 32 KiB */) + val digest = MessageDigest.getInstance("SHA-256") + emitProgress(Progress.Downloading(downloadedByteLen, totalByteLen), true) + + val installer = context.packageManager.packageInstaller + val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) + params.setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED) + params.setAppPackageName(context.packageName) /* Enforces updates; disallows new apps. */ + val session = installer.openSession(installer.createSession(params)) + var sessionFailure = true + try { + val installDest = session.openWrite(receiver.sessionId, 0, -1) + + installDest.use { dest -> + connection.inputStream.use { src -> + while (true) { + val readLen = src.read(fileBytes) + if (readLen <= 0) + break + + digest.update(fileBytes, 0, readLen) + dest.write(fileBytes, 0, readLen) + + downloadedByteLen += readLen.toUInt() + emitProgress(Progress.Downloading(downloadedByteLen, totalByteLen), true) + + if (downloadedByteLen >= 1024UL * 1024UL * 100UL /* 100 MiB */) + throw IOException("File too large") + } + } + } + + emitProgress(Progress.Installing) + if (!digest.digest().contentEquals(update.hash.bytes)) + throw SecurityException("Update has invalid hash") + sessionFailure = false + } finally { + if (sessionFailure) { + session.abandon() + session.close() + } + } + session.commit(pendingIntent.intentSender) + session.close() + } + + private var updating = false + private suspend fun downloadAndUpdateWrapErrors() { + if (updating) + return + updating = true + try { + downloadAndUpdate() + } catch (e: Throwable) { + Log.e(TAG, "Update failure", e) + emitProgress(Progress.Failure(e)) + } + updating = false + } + + private class InstallReceiver : BroadcastReceiver() { + val sessionId = UUID.randomUUID().toString() + + override fun onReceive(context: Context, intent: Intent) { + if (sessionId != intent.action) + return + + when (val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE_INVALID)) { + PackageInstaller.STATUS_PENDING_USER_ACTION -> { + val id = intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, 0) + val userIntervention = IntentCompat.getParcelableExtra(intent, Intent.EXTRA_INTENT, Intent::class.java)!! + applicationScope.launch { + emitProgress(Progress.NeedsUserIntervention(userIntervention, id)) + } + } + + PackageInstaller.STATUS_SUCCESS -> { + applicationScope.launch { + emitProgress(Progress.Complete) + } + context.applicationContext.unregisterReceiver(this) + } + + else -> { + val id = intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, 0) + try { + context.applicationContext.packageManager.packageInstaller.abandonSession(id) + } catch (_: SecurityException) { + } + val message = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE) ?: "Installation error $status" + applicationScope.launch { + val e = Exception(message) + Log.e(TAG, "Update failure", e) + emitProgress(Progress.Failure(e)) + } + context.applicationContext.unregisterReceiver(this) + } + } + } + } + + fun monitorForUpdates() { + if (BuildConfig.DEBUG) + return + + val context = Application.get() + + if (installerIsGooglePlay(context)) + return + + if (!if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { + @Suppress("DEPRECATION") + context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS) + } else { + context.packageManager.getPackageInfo(context.packageName, PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS.toLong())) + }.requestedPermissions.contains(Manifest.permission.REQUEST_INSTALL_PACKAGES) + ) { + if (installer(context).isNotEmpty()) { + updaterScope.launch { + val update = try { + checkForUpdates() + } catch (_: Throwable) { + null + } + emitProgress(Progress.Corrupt(update?.fileName)) + } + } + return + } + + updaterScope.launch { + if (UserKnobs.updaterNewerVersionSeen.firstOrNull()?.let { Version(it) > CURRENT_VERSION } == true) + return@launch + + var waitTime = 15 + while (true) { + try { + val update = checkForUpdates() ?: continue + if (update.version > CURRENT_VERSION) { + Log.i(TAG, "Update available: ${update.version}") + UserKnobs.setUpdaterNewerVersionSeen(update.version.toString()) + return@launch + } + } catch (_: Throwable) { + } + delay(waitTime.minutes) + waitTime = 45 + } + } + + UserKnobs.updaterNewerVersionSeen.onEach { ver -> + if ( + ver != null && + Version(ver) > CURRENT_VERSION && + UserKnobs.updaterNewerVersionConsented.firstOrNull()?.let { Version(it) > CURRENT_VERSION } != true + ) + emitProgress(Progress.Available(ver)) + }.launchIn(applicationScope) + + UserKnobs.updaterNewerVersionConsented.onEach { ver -> + if (ver != null && Version(ver) > CURRENT_VERSION) + updaterScope.launch { + downloadAndUpdateWrapErrors() + } + }.launchIn(applicationScope) + } + + class AppUpdatedReceiver : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + if (intent.action != Intent.ACTION_MY_PACKAGE_REPLACED) + return + + if (installer(context) != context.packageName) + return + + /* TODO: does not work because of restrictions placed on broadcast receivers. */ + val start = Intent(context, MainActivity::class.java) + start.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) + start.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(start) + } + } +} diff --git a/ui/src/main/java/com/wireguard/android/util/AdminKnobs.kt b/ui/src/main/java/com/wireguard/android/util/AdminKnobs.kt new file mode 100644 index 00000000..2f90b2bb --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/util/AdminKnobs.kt @@ -0,0 +1,17 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.util + +import android.content.RestrictionsManager +import androidx.core.content.getSystemService +import com.wireguard.android.Application + +object AdminKnobs { + private val restrictions: RestrictionsManager? = Application.get().getSystemService() + val disableConfigExport: Boolean + get() = restrictions?.applicationRestrictions?.getBoolean("disable_config_export", false) + ?: false +} diff --git a/ui/src/main/java/com/wireguard/android/util/AsyncWorker.kt b/ui/src/main/java/com/wireguard/android/util/AsyncWorker.kt deleted file mode 100644 index a6e5d4be..00000000 --- a/ui/src/main/java/com/wireguard/android/util/AsyncWorker.kt +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright © 2017-2020 WireGuard LLC. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ -package com.wireguard.android.util - -import android.os.Handler -import java9.util.concurrent.CompletableFuture -import java9.util.concurrent.CompletionStage -import java.util.concurrent.Executor - -/** - * Helper class for running asynchronous tasks and ensuring they are completed on the main thread. - */ - -class AsyncWorker(private val executor: Executor, private val handler: Handler) { - - fun runAsync(run: () -> Unit): CompletionStage<Void> { - val future = CompletableFuture<Void>() - executor.execute { - try { - run() - handler.post { future.complete(null) } - } catch (t: Throwable) { - handler.post { future.completeExceptionally(t) } - } - } - return future - } - - fun <T> supplyAsync(get: () -> T?): CompletionStage<T> { - val future = CompletableFuture<T>() - executor.execute { - try { - val result = get() - handler.post { future.complete(result) } - } catch (t: Throwable) { - handler.post { future.completeExceptionally(t) } - } - } - return future - } -} diff --git a/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt b/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt index aed8a4f2..54d4da87 100644 --- a/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt +++ b/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt @@ -1,28 +1,27 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.util -import android.annotation.SuppressLint -import android.app.KeyguardManager -import android.content.Context -import android.os.Build import android.os.Handler +import android.os.Looper import android.util.Log import androidx.annotation.StringRes -import androidx.biometric.BiometricConstants import androidx.biometric.BiometricManager +import androidx.biometric.BiometricManager.Authenticators import androidx.biometric.BiometricPrompt -import androidx.core.content.getSystemService import androidx.fragment.app.Fragment import com.wireguard.android.R object BiometricAuthenticator { private const val TAG = "WireGuard/BiometricAuthenticator" - private val handler = Handler() + + // Not all devices support strong biometric auth so we're allowing both device credentials as + // well as weak biometrics. + private const val allowedAuthenticators = Authenticators.DEVICE_CREDENTIAL or Authenticators.BIOMETRIC_WEAK sealed class Result { data class Success(val cryptoObject: BiometricPrompt.CryptoObject?) : Result() @@ -31,40 +30,30 @@ object BiometricAuthenticator { object Cancelled : Result() } - @SuppressLint("PrivateApi") - private fun isPinEnabled(context: Context): Boolean { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) - return context.getSystemService<KeyguardManager>()!!.isDeviceSecure - return try { - val lockUtilsClass = Class.forName("com.android.internal.widget.LockPatternUtils") - val lockUtils = lockUtilsClass.getConstructor(Context::class.java).newInstance(context) - val method = lockUtilsClass.getMethod("isLockScreenDisabled") - !(method.invoke(lockUtils) as Boolean) - } catch (e: Exception) { - false - } - } - fun authenticate( - @StringRes dialogTitleRes: Int, - fragment: Fragment, - callback: (Result) -> Unit + @StringRes dialogTitleRes: Int, + fragment: Fragment, + callback: (Result) -> Unit ) { val authCallback = object : BiometricPrompt.AuthenticationCallback() { override fun onAuthenticationError(errorCode: Int, errString: CharSequence) { super.onAuthenticationError(errorCode, errString) Log.d(TAG, "BiometricAuthentication error: errorCode=$errorCode, msg=$errString") - callback(when (errorCode) { - BiometricConstants.ERROR_CANCELED, BiometricConstants.ERROR_USER_CANCELED, - BiometricConstants.ERROR_NEGATIVE_BUTTON -> { - Result.Cancelled - } - BiometricConstants.ERROR_HW_NOT_PRESENT, BiometricConstants.ERROR_HW_UNAVAILABLE, - BiometricConstants.ERROR_NO_BIOMETRICS, BiometricConstants.ERROR_NO_DEVICE_CREDENTIAL -> { - Result.HardwareUnavailableOrDisabled + callback( + when (errorCode) { + BiometricPrompt.ERROR_CANCELED, BiometricPrompt.ERROR_USER_CANCELED, + BiometricPrompt.ERROR_NEGATIVE_BUTTON -> { + Result.Cancelled + } + + BiometricPrompt.ERROR_HW_NOT_PRESENT, BiometricPrompt.ERROR_HW_UNAVAILABLE, + BiometricPrompt.ERROR_NO_BIOMETRICS, BiometricPrompt.ERROR_NO_DEVICE_CREDENTIAL -> { + Result.HardwareUnavailableOrDisabled + } + + else -> Result.Failure(errorCode, fragment.getString(R.string.biometric_auth_error_reason, errString)) } - else -> Result.Failure(errorCode, fragment.getString(R.string.biometric_auth_error_reason, errString)) - }) + ) } override fun onAuthenticationFailed() { @@ -77,12 +66,12 @@ object BiometricAuthenticator { callback(Result.Success(result.cryptoObject)) } } - val biometricPrompt = BiometricPrompt(fragment, { handler.post(it) }, authCallback) + val biometricPrompt = BiometricPrompt(fragment, { Handler(Looper.getMainLooper()).post(it) }, authCallback) val promptInfo = BiometricPrompt.PromptInfo.Builder() - .setTitle(fragment.getString(dialogTitleRes)) - .setDeviceCredentialAllowed(true) - .build() - if (BiometricManager.from(fragment.requireContext()).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS || isPinEnabled(fragment.requireContext())) { + .setTitle(fragment.getString(dialogTitleRes)) + .setAllowedAuthenticators(allowedAuthenticators) + .build() + if (BiometricManager.from(fragment.requireContext()).canAuthenticate(allowedAuthenticators) == BiometricManager.BIOMETRIC_SUCCESS) { biometricPrompt.authenticate(promptInfo) } else { callback(Result.HardwareUnavailableOrDisabled) diff --git a/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.kt b/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.kt index 51f6486f..c9a7f59d 100644 --- a/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.kt +++ b/ui/src/main/java/com/wireguard/android/util/ClipboardUtils.kt @@ -1,16 +1,18 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.util import android.content.ClipData import android.content.ClipboardManager +import android.os.Build import android.view.View import android.widget.TextView import androidx.core.content.getSystemService import com.google.android.material.snackbar.Snackbar import com.google.android.material.textfield.TextInputEditText +import com.wireguard.android.R /** * Standalone utilities for interacting with the system clipboard. @@ -28,6 +30,8 @@ object ClipboardUtils { } val service = view.context.getSystemService<ClipboardManager>() ?: return service.setPrimaryClip(ClipData.newPlainText(data.second, data.first)) - Snackbar.make(view, "${data.second} copied to clipboard", Snackbar.LENGTH_LONG).show() + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { + Snackbar.make(view, view.context.getString(R.string.copied_to_clipboard, data.second), Snackbar.LENGTH_LONG).show() + } } } diff --git a/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt b/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt index a0f0e1fb..ace1dc05 100644 --- a/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt +++ b/ui/src/main/java/com/wireguard/android/util/DownloadsFileSaver.kt @@ -1,68 +1,100 @@ /* - * Copyright © 2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.util +import android.Manifest import android.content.ContentValues import android.content.Context +import android.content.pm.PackageManager import android.net.Uri import android.os.Build import android.os.Environment import android.provider.MediaStore import android.provider.MediaStore.MediaColumns +import androidx.activity.ComponentActivity +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts +import androidx.core.content.ContextCompat import com.wireguard.android.R +import kotlinx.coroutines.CompletableDeferred +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext import java.io.File import java.io.FileOutputStream import java.io.IOException import java.io.OutputStream -object DownloadsFileSaver { - @Throws(Exception::class) - fun save(context: Context, name: String, mimeType: String?, overwriteExisting: Boolean) = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - val contentResolver = context.contentResolver - if (overwriteExisting) - contentResolver.delete(MediaStore.Downloads.EXTERNAL_CONTENT_URI, String.format("%s = ?", MediaColumns.DISPLAY_NAME), arrayOf(name)) - val contentValues = ContentValues() - contentValues.put(MediaColumns.DISPLAY_NAME, name) - contentValues.put(MediaColumns.MIME_TYPE, mimeType) - val contentUri = contentResolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues) +class DownloadsFileSaver(private val context: ComponentActivity) { + private lateinit var activityResult: ActivityResultLauncher<String> + private lateinit var futureGrant: CompletableDeferred<Boolean> + + init { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + futureGrant = CompletableDeferred() + activityResult = context.registerForActivityResult(ActivityResultContracts.RequestPermission()) { ret -> futureGrant.complete(ret) } + } + } + + suspend fun save(name: String, mimeType: String?, overwriteExisting: Boolean) = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + withContext(Dispatchers.IO) { + val contentResolver = context.contentResolver + if (overwriteExisting) + contentResolver.delete(MediaStore.Downloads.EXTERNAL_CONTENT_URI, String.format("%s = ?", MediaColumns.DISPLAY_NAME), arrayOf(name)) + val contentValues = ContentValues() + contentValues.put(MediaColumns.DISPLAY_NAME, name) + contentValues.put(MediaColumns.MIME_TYPE, mimeType) + val contentUri = contentResolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues) ?: throw IOException(context.getString(R.string.create_downloads_file_error)) - val contentStream = contentResolver.openOutputStream(contentUri) + val contentStream = contentResolver.openOutputStream(contentUri) ?: throw IOException(context.getString(R.string.create_downloads_file_error)) - @Suppress("DEPRECATION") var cursor = contentResolver.query(contentUri, arrayOf(MediaColumns.DATA), null, null, null) - var path: String? = null - if (cursor != null) { - try { - if (cursor.moveToFirst()) - path = cursor.getString(0) - } finally { - cursor.close() - } - } - if (path == null) { - path = "Download/" - cursor = contentResolver.query(contentUri, arrayOf(MediaColumns.DISPLAY_NAME), null, null, null) + @Suppress("DEPRECATION") var cursor = contentResolver.query(contentUri, arrayOf(MediaColumns.DATA), null, null, null) + var path: String? = null if (cursor != null) { try { if (cursor.moveToFirst()) - path += cursor.getString(0) + path = cursor.getString(0) } finally { cursor.close() } } + if (path == null) { + path = "Download/" + cursor = contentResolver.query(contentUri, arrayOf(MediaColumns.DISPLAY_NAME), null, null, null) + if (cursor != null) { + try { + if (cursor.moveToFirst()) + path += cursor.getString(0) + } finally { + cursor.close() + } + } + } + DownloadsFile(context, contentStream, path, contentUri) } - DownloadsFile(context, contentStream, path, contentUri) } else { - @Suppress("DEPRECATION") val path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) - val file = File(path, name) - if (!path.isDirectory && !path.mkdirs()) - throw IOException(context.getString(R.string.create_output_dir_error)) - DownloadsFile(context, FileOutputStream(file), file.absolutePath, null) + withContext(Dispatchers.Main.immediate) { + if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { + activityResult.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE) + val granted = futureGrant.await() + if (!granted) { + futureGrant = CompletableDeferred() + return@withContext null + } + } + @Suppress("DEPRECATION") val path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + withContext(Dispatchers.IO) { + val file = File(path, name) + if (!path.isDirectory && !path.mkdirs()) + throw IOException(context.getString(R.string.create_output_dir_error)) + DownloadsFile(context, FileOutputStream(file), file.absolutePath, null) + } + } } class DownloadsFile(private val context: Context, val outputStream: OutputStream, val fileName: String, private val uri: Uri?) { - fun delete() { + suspend fun delete() = withContext(Dispatchers.IO) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) context.contentResolver.delete(uri!!, null, null) else diff --git a/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt b/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt index d8ac94d9..d617adec 100644 --- a/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt +++ b/ui/src/main/java/com/wireguard/android/util/ErrorMessages.kt @@ -1,12 +1,14 @@ /* - * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.util import android.content.res.Resources import android.os.RemoteException -import com.wireguard.android.Application.Companion.get +import com.google.zxing.ChecksumException +import com.google.zxing.NotFoundException +import com.wireguard.android.Application import com.wireguard.android.R import com.wireguard.android.backend.BackendException import com.wireguard.android.util.RootShell.RootShellException @@ -20,50 +22,51 @@ import java.net.InetAddress object ErrorMessages { private val BCE_REASON_MAP = mapOf( - BadConfigException.Reason.INVALID_KEY to R.string.bad_config_reason_invalid_key, - BadConfigException.Reason.INVALID_NUMBER to R.string.bad_config_reason_invalid_number, - BadConfigException.Reason.INVALID_VALUE to R.string.bad_config_reason_invalid_value, - BadConfigException.Reason.MISSING_ATTRIBUTE to R.string.bad_config_reason_missing_attribute, - BadConfigException.Reason.MISSING_SECTION to R.string.bad_config_reason_missing_section, - BadConfigException.Reason.SYNTAX_ERROR to R.string.bad_config_reason_syntax_error, - BadConfigException.Reason.UNKNOWN_ATTRIBUTE to R.string.bad_config_reason_unknown_attribute, - BadConfigException.Reason.UNKNOWN_SECTION to R.string.bad_config_reason_unknown_section + BadConfigException.Reason.INVALID_KEY to R.string.bad_config_reason_invalid_key, + BadConfigException.Reason.INVALID_NUMBER to R.string.bad_config_reason_invalid_number, + BadConfigException.Reason.INVALID_VALUE to R.string.bad_config_reason_invalid_value, + BadConfigException.Reason.MISSING_ATTRIBUTE to R.string.bad_config_reason_missing_attribute, + BadConfigException.Reason.MISSING_SECTION to R.string.bad_config_reason_missing_section, + BadConfigException.Reason.SYNTAX_ERROR to R.string.bad_config_reason_syntax_error, + BadConfigException.Reason.UNKNOWN_ATTRIBUTE to R.string.bad_config_reason_unknown_attribute, + BadConfigException.Reason.UNKNOWN_SECTION to R.string.bad_config_reason_unknown_section ) private val BE_REASON_MAP = mapOf( - BackendException.Reason.UNKNOWN_KERNEL_MODULE_NAME to R.string.module_version_error, - BackendException.Reason.WG_QUICK_CONFIG_ERROR_CODE to R.string.tunnel_config_error, - BackendException.Reason.TUNNEL_MISSING_CONFIG to R.string.no_config_error, - BackendException.Reason.VPN_NOT_AUTHORIZED to R.string.vpn_not_authorized_error, - BackendException.Reason.UNABLE_TO_START_VPN to R.string.vpn_start_error, - BackendException.Reason.TUN_CREATION_ERROR to R.string.tun_create_error, - BackendException.Reason.GO_ACTIVATION_ERROR_CODE to R.string.tunnel_on_error + BackendException.Reason.UNKNOWN_KERNEL_MODULE_NAME to R.string.module_version_error, + BackendException.Reason.WG_QUICK_CONFIG_ERROR_CODE to R.string.tunnel_config_error, + BackendException.Reason.TUNNEL_MISSING_CONFIG to R.string.no_config_error, + BackendException.Reason.VPN_NOT_AUTHORIZED to R.string.vpn_not_authorized_error, + BackendException.Reason.UNABLE_TO_START_VPN to R.string.vpn_start_error, + BackendException.Reason.TUN_CREATION_ERROR to R.string.tun_create_error, + BackendException.Reason.GO_ACTIVATION_ERROR_CODE to R.string.tunnel_on_error, + BackendException.Reason.DNS_RESOLUTION_FAILURE to R.string.tunnel_dns_failure ) private val KFE_FORMAT_MAP = mapOf( - Key.Format.BASE64 to R.string.key_length_explanation_base64, - Key.Format.BINARY to R.string.key_length_explanation_binary, - Key.Format.HEX to R.string.key_length_explanation_hex + Key.Format.BASE64 to R.string.key_length_explanation_base64, + Key.Format.BINARY to R.string.key_length_explanation_binary, + Key.Format.HEX to R.string.key_length_explanation_hex ) private val KFE_TYPE_MAP = mapOf( - KeyFormatException.Type.CONTENTS to R.string.key_contents_error, - KeyFormatException.Type.LENGTH to R.string.key_length_error + KeyFormatException.Type.CONTENTS to R.string.key_contents_error, + KeyFormatException.Type.LENGTH to R.string.key_length_error ) private val PE_CLASS_MAP = mapOf( - InetAddress::class.java to R.string.parse_error_inet_address, - InetEndpoint::class.java to R.string.parse_error_inet_endpoint, - InetNetwork::class.java to R.string.parse_error_inet_network, - Int::class.java to R.string.parse_error_integer + InetAddress::class.java to R.string.parse_error_inet_address, + InetEndpoint::class.java to R.string.parse_error_inet_endpoint, + InetNetwork::class.java to R.string.parse_error_inet_network, + Int::class.java to R.string.parse_error_integer ) private val RSE_REASON_MAP = mapOf( - RootShellException.Reason.NO_ROOT_ACCESS to R.string.error_root, - RootShellException.Reason.SHELL_MARKER_COUNT_ERROR to R.string.shell_marker_count_error, - RootShellException.Reason.SHELL_EXIT_STATUS_READ_ERROR to R.string.shell_exit_status_read_error, - RootShellException.Reason.SHELL_START_ERROR to R.string.shell_start_error, - RootShellException.Reason.CREATE_BIN_DIR_ERROR to R.string.create_bin_dir_error, - RootShellException.Reason.CREATE_TEMP_DIR_ERROR to R.string.create_temp_dir_error + RootShellException.Reason.NO_ROOT_ACCESS to R.string.error_root, + RootShellException.Reason.SHELL_MARKER_COUNT_ERROR to R.string.shell_marker_count_error, + RootShellException.Reason.SHELL_EXIT_STATUS_READ_ERROR to R.string.shell_exit_status_read_error, + RootShellException.Reason.SHELL_START_ERROR to R.string.shell_start_error, + RootShellException.Reason.CREATE_BIN_DIR_ERROR to R.string.create_bin_dir_error, + RootShellException.Reason.CREATE_TEMP_DIR_ERROR to R.string.create_temp_dir_error ) operator fun get(throwable: Throwable?): String { - val resources = get().resources + val resources = Application.get().resources if (throwable == null) return resources.getString(R.string.unknown_error) val rootCause = rootCause(throwable) return when { @@ -77,15 +80,27 @@ object ErrorMessages { val explanation = getBadConfigExceptionExplanation(resources, rootCause) resources.getString(R.string.bad_config_error, reason, context) + explanation } + rootCause is BackendException -> { resources.getString(BE_REASON_MAP.getValue(rootCause.reason), *rootCause.format) } + rootCause is RootShellException -> { resources.getString(RSE_REASON_MAP.getValue(rootCause.reason), *rootCause.format) } - rootCause.message != null -> { - rootCause.message!! + + rootCause is NotFoundException -> { + resources.getString(R.string.error_no_qr_found) + } + + rootCause is ChecksumException -> { + resources.getString(R.string.error_qr_checksum) + } + + rootCause.localizedMessage != null -> { + rootCause.localizedMessage!! } + else -> { val errorType = rootCause.javaClass.simpleName resources.getString(R.string.generic_error, errorType) @@ -93,14 +108,16 @@ object ErrorMessages { } } - private fun getBadConfigExceptionExplanation(resources: Resources, - bce: BadConfigException): String { + private fun getBadConfigExceptionExplanation( + resources: Resources, + bce: BadConfigException + ): String { if (bce.cause is KeyFormatException) { val kfe = bce.cause as KeyFormatException? if (kfe!!.type == KeyFormatException.Type.LENGTH) return resources.getString(KFE_FORMAT_MAP.getValue(kfe.format)) } else if (bce.cause is ParseException) { val pe = bce.cause as ParseException? - if (pe!!.message != null) return ": ${pe.message}" + if (pe!!.localizedMessage != null) return ": ${pe.localizedMessage}" } else if (bce.location == BadConfigException.Location.LISTEN_PORT) { return resources.getString(R.string.bad_config_explanation_udp_port) } else if (bce.location == BadConfigException.Location.MTU) { @@ -111,8 +128,10 @@ object ErrorMessages { return "" } - private fun getBadConfigExceptionReason(resources: Resources, - bce: BadConfigException): String { + private fun getBadConfigExceptionReason( + resources: Resources, + bce: BadConfigException + ): String { if (bce.cause is KeyFormatException) { val kfe = bce.cause as KeyFormatException? return resources.getString(KFE_TYPE_MAP.getValue(kfe!!.type)) @@ -128,7 +147,8 @@ object ErrorMessages { var cause = throwable while (cause.cause != null) { if (cause is BadConfigException || cause is BackendException || - cause is RootShellException) break + cause is RootShellException + ) break val nextCause = cause.cause!! if (nextCause is RemoteException) break cause = nextCause diff --git a/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt b/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt deleted file mode 100644 index 4470134c..00000000 --- a/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ -package com.wireguard.android.util - -import android.util.Log -import java9.util.function.BiConsumer - -/** - * Helpers for logging exceptions from asynchronous tasks. These can be passed to - * `CompletionStage.whenComplete()` at the end of an asynchronous future chain. - */ -enum class ExceptionLoggers(private val priority: Int) : BiConsumer<Any?, Throwable?> { - D(Log.DEBUG), E(Log.ERROR); - - override fun accept(result: Any?, throwable: Throwable?) { - if (throwable != null) - Log.println(Log.ERROR, TAG, Log.getStackTraceString(throwable)) - else if (priority <= Log.DEBUG) - Log.println(priority, TAG, "Future completed successfully") - } - - companion object { - private const val TAG = "WireGuard/ExceptionLoggers" - } -} diff --git a/ui/src/main/java/com/wireguard/android/util/Extensions.kt b/ui/src/main/java/com/wireguard/android/util/Extensions.kt index a705401f..3bc85051 100644 --- a/ui/src/main/java/com/wireguard/android/util/Extensions.kt +++ b/ui/src/main/java/com/wireguard/android/util/Extensions.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ @@ -8,7 +8,11 @@ package com.wireguard.android.util import android.content.Context import android.util.TypedValue import androidx.annotation.AttrRes -import androidx.fragment.app.Fragment +import androidx.lifecycle.lifecycleScope +import androidx.preference.Preference +import com.wireguard.android.Application +import com.wireguard.android.activity.SettingsActivity +import kotlinx.coroutines.CoroutineScope fun Context.resolveAttribute(@AttrRes attrRes: Int): Int { val typedValue = TypedValue() @@ -16,6 +20,12 @@ fun Context.resolveAttribute(@AttrRes attrRes: Int): Int { return typedValue.data } -fun Fragment.requireTargetFragment(): Fragment { - return requireNotNull(targetFragment) { "A target fragment should always be set for $this" } -} +val Any.applicationScope: CoroutineScope + get() = Application.getCoroutineScope() + +val Preference.activity: SettingsActivity + get() = context as? SettingsActivity + ?: throw IllegalStateException("Failed to resolve SettingsActivity") + +val Preference.lifecycleScope: CoroutineScope + get() = activity.lifecycleScope diff --git a/ui/src/main/java/com/wireguard/android/util/FragmentUtils.kt b/ui/src/main/java/com/wireguard/android/util/FragmentUtils.kt deleted file mode 100644 index 90e7ab0c..00000000 --- a/ui/src/main/java/com/wireguard/android/util/FragmentUtils.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ -package com.wireguard.android.util - -import android.view.ContextThemeWrapper -import androidx.preference.Preference -import com.wireguard.android.activity.SettingsActivity - -object FragmentUtils { - fun getPrefActivity(preference: Preference): SettingsActivity { - val context = preference.context - if (context is ContextThemeWrapper) { - if (context is SettingsActivity) { - return context - } - } - throw IllegalStateException("Failed to resolve SettingsActivity") - } -} diff --git a/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt b/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt new file mode 100644 index 00000000..abc025a4 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt @@ -0,0 +1,112 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.util + +import android.content.ContentResolver +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.net.Uri +import android.util.Log +import com.google.zxing.BinaryBitmap +import com.google.zxing.DecodeHintType +import com.google.zxing.NotFoundException +import com.google.zxing.RGBLuminanceSource +import com.google.zxing.Reader +import com.google.zxing.Result +import com.google.zxing.common.HybridBinarizer +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +/** + * Encapsulates the logic of scanning a barcode from a file, + * @property contentResolver - Resolver to read the incoming data + * @property reader - An instance of zxing's [Reader] class to parse the image + */ +class QrCodeFromFileScanner( + private val contentResolver: ContentResolver, + private val reader: Reader, +) { + + private fun scanBitmapForResult(source: Bitmap): Result { + val width = source.width + val height = source.height + val pixels = IntArray(width * height) + source.getPixels(pixels, 0, width, 0, 0, width, height) + + val bBitmap = BinaryBitmap(HybridBinarizer(RGBLuminanceSource(width, height, pixels))) + return reader.decode(bBitmap, mapOf(DecodeHintType.TRY_HARDER to true)) + } + + private fun downscaleBitmap(source: Bitmap, scaledSize: Int): Bitmap { + + val originalWidth = source.width + val originalHeight = source.height + + var newWidth = -1 + var newHeight = -1 + val multFactor: Float + + when { + originalHeight > originalWidth -> { + newHeight = scaledSize + multFactor = originalWidth.toFloat() / originalHeight.toFloat() + newWidth = (newHeight * multFactor).toInt() + } + + originalWidth > originalHeight -> { + newWidth = scaledSize + multFactor = originalHeight.toFloat() / originalWidth.toFloat() + newHeight = (newWidth * multFactor).toInt() + } + + originalHeight == originalWidth -> { + newHeight = scaledSize + newWidth = scaledSize + } + } + return Bitmap.createScaledBitmap(source, newWidth, newHeight, false) + } + + private fun doScan(data: Uri): Result { + Log.d(TAG, "Starting to scan an image: $data") + contentResolver.openInputStream(data).use { inputStream -> + val originalBitmap = BitmapFactory.decodeStream(inputStream) + ?: throw IllegalArgumentException("Can't decode stream to Bitmap") + + return try { + scanBitmapForResult(originalBitmap).also { + Log.d(TAG, "Found result in original image") + } + } catch (e: Exception) { + Log.e(TAG, "Original image scan finished with error: $e, will try downscaled image") + val scaleBitmap = downscaleBitmap(originalBitmap, 500) + scanBitmapForResult(originalBitmap).also { scaleBitmap.recycle() } + } finally { + originalBitmap.recycle() + } + } + + } + + /** + * Attempts to parse incoming data + * @return result of the decoding operation + * @throws NotFoundException when parser didn't find QR code in the image + */ + suspend fun scan(data: Uri) = withContext(Dispatchers.Default) { doScan(data) } + + companion object { + private const val TAG = "QrCodeFromFileScanner" + + /** + * Given a reference to a file, check if this file could be parsed by this class + * @return true if the file can be parsed, false if not + */ + fun validContentType(contentResolver: ContentResolver, data: Uri): Boolean { + return contentResolver.getType(data)?.startsWith("image/") == true + } + } +} diff --git a/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt b/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt new file mode 100644 index 00000000..f7de2465 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/util/QuantityFormatter.kt @@ -0,0 +1,66 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.util + +import android.icu.text.ListFormatter +import android.icu.text.MeasureFormat +import android.icu.text.RelativeDateTimeFormatter +import android.icu.util.Measure +import android.icu.util.MeasureUnit +import android.os.Build +import com.wireguard.android.Application +import com.wireguard.android.R +import java.util.Locale +import kotlin.time.Duration.Companion.seconds + +object QuantityFormatter { + fun formatBytes(bytes: Long): String { + val context = Application.get().applicationContext + return when { + bytes < 1024 -> context.getString(R.string.transfer_bytes, bytes) + bytes < 1024 * 1024 -> context.getString(R.string.transfer_kibibytes, bytes / 1024.0) + bytes < 1024 * 1024 * 1024 -> context.getString(R.string.transfer_mibibytes, bytes / (1024.0 * 1024.0)) + bytes < 1024 * 1024 * 1024 * 1024L -> context.getString(R.string.transfer_gibibytes, bytes / (1024.0 * 1024.0 * 1024.0)) + else -> context.getString(R.string.transfer_tibibytes, bytes / (1024.0 * 1024.0 * 1024.0) / 1024.0) + } + } + + fun formatEpochAgo(epochMillis: Long): String { + var span = (System.currentTimeMillis() - epochMillis) / 1000 + + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) + return Application.get().applicationContext.getString(R.string.latest_handshake_ago, span.seconds.toString()) + + if (span <= 0L) + return RelativeDateTimeFormatter.getInstance().format(RelativeDateTimeFormatter.Direction.PLAIN, RelativeDateTimeFormatter.AbsoluteUnit.NOW) + val measureFormat = MeasureFormat.getInstance(Locale.getDefault(), MeasureFormat.FormatWidth.WIDE) + val parts = ArrayList<CharSequence>(4) + if (span >= 24 * 60 * 60L) { + val v = span / (24 * 60 * 60L) + parts.add(measureFormat.format(Measure(v, MeasureUnit.DAY))) + span -= v * (24 * 60 * 60L) + } + if (span >= 60 * 60L) { + val v = span / (60 * 60L) + parts.add(measureFormat.format(Measure(v, MeasureUnit.HOUR))) + span -= v * (60 * 60L) + } + if (span >= 60L) { + val v = span / 60L + parts.add(measureFormat.format(Measure(v, MeasureUnit.MINUTE))) + span -= v * 60L + } + if (span > 0L) + parts.add(measureFormat.format(Measure(span, MeasureUnit.SECOND))) + + val joined = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) + parts.joinToString() + else + ListFormatter.getInstance(Locale.getDefault(), ListFormatter.Type.UNITS, ListFormatter.Width.SHORT).format(parts) + + return Application.get().applicationContext.getString(R.string.latest_handshake_ago, joined) + } +}
\ No newline at end of file diff --git a/ui/src/main/java/com/wireguard/android/util/TunnelImporter.kt b/ui/src/main/java/com/wireguard/android/util/TunnelImporter.kt new file mode 100644 index 00000000..daefc378 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/util/TunnelImporter.kt @@ -0,0 +1,152 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.util + +import android.content.ContentResolver +import android.net.Uri +import android.provider.OpenableColumns +import android.util.Log +import androidx.fragment.app.FragmentManager +import com.wireguard.android.Application +import com.wireguard.android.R +import com.wireguard.android.fragment.ConfigNamingDialogFragment +import com.wireguard.android.model.ObservableTunnel +import com.wireguard.config.Config +import kotlinx.coroutines.Deferred +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.async +import kotlinx.coroutines.withContext +import java.io.BufferedReader +import java.io.ByteArrayInputStream +import java.io.InputStreamReader +import java.nio.charset.StandardCharsets +import java.util.zip.ZipEntry +import java.util.zip.ZipInputStream + +object TunnelImporter { + suspend fun importTunnel(contentResolver: ContentResolver, uri: Uri, messageCallback: (CharSequence) -> Unit) = withContext(Dispatchers.IO) { + val context = Application.get().applicationContext + val futureTunnels = ArrayList<Deferred<ObservableTunnel>>() + val throwables = ArrayList<Throwable>() + try { + val columns = arrayOf(OpenableColumns.DISPLAY_NAME) + var name = "" + contentResolver.query(uri, columns, null, null, null)?.use { cursor -> + if (cursor.moveToFirst() && !cursor.isNull(0)) { + name = cursor.getString(0) + } + } + if (name.isEmpty()) { + name = Uri.decode(uri.lastPathSegment) + } + var idx = name.lastIndexOf('/') + if (idx >= 0) { + require(idx < name.length - 1) { context.getString(R.string.illegal_filename_error, name) } + name = name.substring(idx + 1) + } + val isZip = name.lowercase().endsWith(".zip") + if (name.lowercase().endsWith(".conf")) { + name = name.substring(0, name.length - ".conf".length) + } else { + require(isZip) { context.getString(R.string.bad_extension_error) } + } + + if (isZip) { + ZipInputStream(contentResolver.openInputStream(uri)).use { zip -> + val reader = BufferedReader(InputStreamReader(zip, StandardCharsets.UTF_8)) + var entry: ZipEntry? + while (true) { + entry = zip.nextEntry ?: break + name = entry.name + idx = name.lastIndexOf('/') + if (idx >= 0) { + if (idx >= name.length - 1) { + continue + } + name = name.substring(name.lastIndexOf('/') + 1) + } + if (name.lowercase().endsWith(".conf")) { + name = name.substring(0, name.length - ".conf".length) + } else { + continue + } + try { + Config.parse(reader) + } catch (e: Throwable) { + throwables.add(e) + null + }?.let { + val nameCopy = name + futureTunnels.add(async(SupervisorJob()) { Application.getTunnelManager().create(nameCopy, it) }) + } + } + } + } else { + futureTunnels.add(async(SupervisorJob()) { Application.getTunnelManager().create(name, Config.parse(contentResolver.openInputStream(uri)!!)) }) + } + + if (futureTunnels.isEmpty()) { + if (throwables.size == 1) { + throw throwables[0] + } else { + require(throwables.isNotEmpty()) { context.getString(R.string.no_configs_error) } + } + } + val tunnels = futureTunnels.mapNotNull { + try { + it.await() + } catch (e: Throwable) { + throwables.add(e) + null + } + } + withContext(Dispatchers.Main.immediate) { onTunnelImportFinished(tunnels, throwables, messageCallback) } + } catch (e: Throwable) { + withContext(Dispatchers.Main.immediate) { onTunnelImportFinished(emptyList(), listOf(e), messageCallback) } + } + } + + fun importTunnel(parentFragmentManager: FragmentManager, configText: String, messageCallback: (CharSequence) -> Unit) { + try { + // Ensure the config text is parseable before proceeding… + Config.parse(ByteArrayInputStream(configText.toByteArray(StandardCharsets.UTF_8))) + + // Config text is valid, now create the tunnel… + ConfigNamingDialogFragment.newInstance(configText).show(parentFragmentManager, null) + } catch (e: Throwable) { + onTunnelImportFinished(emptyList(), listOf<Throwable>(e), messageCallback) + } + } + + private fun onTunnelImportFinished(tunnels: List<ObservableTunnel>, throwables: Collection<Throwable>, messageCallback: (CharSequence) -> Unit) { + val context = Application.get().applicationContext + var message = "" + for (throwable in throwables) { + val error = ErrorMessages[throwable] + message = context.getString(R.string.import_error, error) + Log.e(TAG, message, throwable) + } + if (tunnels.size == 1 && throwables.isEmpty()) + message = context.getString(R.string.import_success, tunnels[0].name) + else if (tunnels.isEmpty() && throwables.size == 1) + else if (throwables.isEmpty()) + message = context.resources.getQuantityString( + R.plurals.import_total_success, + tunnels.size, tunnels.size + ) + else if (!throwables.isEmpty()) + message = context.resources.getQuantityString( + R.plurals.import_partial_success, + tunnels.size + throwables.size, + tunnels.size, tunnels.size + throwables.size + ) + + messageCallback(message) + } + + private const val TAG = "WireGuard/TunnelImporter" +}
\ No newline at end of file diff --git a/ui/src/main/java/com/wireguard/android/util/UserKnobs.kt b/ui/src/main/java/com/wireguard/android/util/UserKnobs.kt new file mode 100644 index 00000000..2c6ca8c3 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/util/UserKnobs.kt @@ -0,0 +1,121 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.util + +import androidx.datastore.preferences.core.booleanPreferencesKey +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.core.stringSetPreferencesKey +import com.wireguard.android.Application +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map + +object UserKnobs { + private val ENABLE_KERNEL_MODULE = booleanPreferencesKey("enable_kernel_module") + val enableKernelModule: Flow<Boolean> + get() = Application.getPreferencesDataStore().data.map { + it[ENABLE_KERNEL_MODULE] ?: false + } + + suspend fun setEnableKernelModule(enable: Boolean?) { + Application.getPreferencesDataStore().edit { + if (enable == null) + it.remove(ENABLE_KERNEL_MODULE) + else + it[ENABLE_KERNEL_MODULE] = enable + } + } + + private val MULTIPLE_TUNNELS = booleanPreferencesKey("multiple_tunnels") + val multipleTunnels: Flow<Boolean> + get() = Application.getPreferencesDataStore().data.map { + it[MULTIPLE_TUNNELS] ?: false + } + + private val DARK_THEME = booleanPreferencesKey("dark_theme") + val darkTheme: Flow<Boolean> + get() = Application.getPreferencesDataStore().data.map { + it[DARK_THEME] ?: false + } + + suspend fun setDarkTheme(on: Boolean) { + Application.getPreferencesDataStore().edit { + it[DARK_THEME] = on + } + } + + private val ALLOW_REMOTE_CONTROL_INTENTS = booleanPreferencesKey("allow_remote_control_intents") + val allowRemoteControlIntents: Flow<Boolean> + get() = Application.getPreferencesDataStore().data.map { + it[ALLOW_REMOTE_CONTROL_INTENTS] ?: false + } + + private val RESTORE_ON_BOOT = booleanPreferencesKey("restore_on_boot") + val restoreOnBoot: Flow<Boolean> + get() = Application.getPreferencesDataStore().data.map { + it[RESTORE_ON_BOOT] ?: false + } + + private val LAST_USED_TUNNEL = stringPreferencesKey("last_used_tunnel") + val lastUsedTunnel: Flow<String?> + get() = Application.getPreferencesDataStore().data.map { + it[LAST_USED_TUNNEL] + } + + suspend fun setLastUsedTunnel(lastUsedTunnel: String?) { + Application.getPreferencesDataStore().edit { + if (lastUsedTunnel == null) + it.remove(LAST_USED_TUNNEL) + else + it[LAST_USED_TUNNEL] = lastUsedTunnel + } + } + + private val RUNNING_TUNNELS = stringSetPreferencesKey("enabled_configs") + val runningTunnels: Flow<Set<String>> + get() = Application.getPreferencesDataStore().data.map { + it[RUNNING_TUNNELS] ?: emptySet() + } + + suspend fun setRunningTunnels(runningTunnels: Set<String>) { + Application.getPreferencesDataStore().edit { + if (runningTunnels.isEmpty()) + it.remove(RUNNING_TUNNELS) + else + it[RUNNING_TUNNELS] = runningTunnels + } + } + + private val UPDATER_NEWER_VERSION_SEEN = stringPreferencesKey("updater_newer_version_seen") + val updaterNewerVersionSeen: Flow<String?> + get() = Application.getPreferencesDataStore().data.map { + it[UPDATER_NEWER_VERSION_SEEN] + } + + suspend fun setUpdaterNewerVersionSeen(newerVersionSeen: String?) { + Application.getPreferencesDataStore().edit { + if (newerVersionSeen == null) + it.remove(UPDATER_NEWER_VERSION_SEEN) + else + it[UPDATER_NEWER_VERSION_SEEN] = newerVersionSeen + } + } + + private val UPDATER_NEWER_VERSION_CONSENTED = stringPreferencesKey("updater_newer_version_consented") + val updaterNewerVersionConsented: Flow<String?> + get() = Application.getPreferencesDataStore().data.map { + it[UPDATER_NEWER_VERSION_CONSENTED] + } + + suspend fun setUpdaterNewerVersionConsented(newerVersionConsented: String?) { + Application.getPreferencesDataStore().edit { + if (newerVersionConsented == null) + it.remove(UPDATER_NEWER_VERSION_CONSENTED) + else + it[UPDATER_NEWER_VERSION_CONSENTED] = newerVersionConsented + } + } +} diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt index 36774c3f..c73b1efc 100644 --- a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt +++ b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt @@ -1,25 +1,30 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.viewmodel +import android.os.Build import android.os.Parcel import android.os.Parcelable +import androidx.core.os.ParcelCompat import androidx.databinding.ObservableArrayList import androidx.databinding.ObservableList import com.wireguard.config.BadConfigException import com.wireguard.config.Config import com.wireguard.config.Peer -import java.util.ArrayList class ConfigProxy : Parcelable { val `interface`: InterfaceProxy val peers: ObservableList<PeerProxy> = ObservableArrayList() private constructor(parcel: Parcel) { - `interface` = parcel.readParcelable(InterfaceProxy::class.java.classLoader)!! - parcel.readTypedList(peers, PeerProxy.CREATOR) + `interface` = ParcelCompat.readParcelable(parcel, InterfaceProxy::class.java.classLoader, InterfaceProxy::class.java) ?: InterfaceProxy() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + ParcelCompat.readParcelableList(parcel, peers, PeerProxy::class.java.classLoader, PeerProxy::class.java) + } else { + parcel.readTypedList(peers, PeerProxy.CREATOR) + } peers.forEach { it.bind(this) } } @@ -50,14 +55,18 @@ class ConfigProxy : Parcelable { val resolvedPeers: MutableCollection<Peer> = ArrayList() peers.forEach { resolvedPeers.add(it.resolve()) } return Config.Builder() - .setInterface(`interface`.resolve()) - .addPeers(resolvedPeers) - .build() + .setInterface(`interface`.resolve()) + .addPeers(resolvedPeers) + .build() } override fun writeToParcel(dest: Parcel, flags: Int) { dest.writeParcelable(`interface`, flags) - dest.writeTypedList(peers) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + dest.writeParcelableList(peers, flags) + } else { + dest.writeTypedList(peers) + } } private class ConfigProxyCreator : Parcelable.Creator<ConfigProxy> { diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt b/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt index bd2a9831..004ebed1 100644 --- a/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt +++ b/ui/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.viewmodel @@ -81,7 +81,7 @@ class InterfaceProxy : BaseObservable, Parcelable { constructor(other: Interface) { addresses = Attribute.join(other.addresses) - val dnsServerStrings = other.dnsServers.map { it.hostAddress } + val dnsServerStrings = other.dnsServers.map { it.hostAddress }.plus(other.dnsSearchDomains) dnsServers = Attribute.join(dnsServerStrings) excludedApplications.addAll(other.excludedApplications) includedApplications.addAll(other.includedApplications) diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.kt b/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.kt index 6ac04f72..e78d0826 100644 --- a/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.kt +++ b/ui/src/main/java/com/wireguard/android/viewmodel/PeerProxy.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.viewmodel @@ -16,8 +16,6 @@ import com.wireguard.config.Attribute import com.wireguard.config.BadConfigException import com.wireguard.config.Peer import java.lang.ref.WeakReference -import java.util.ArrayList -import java.util.LinkedHashSet class PeerProxy : BaseObservable, Parcelable { private val dnsRoutes: MutableList<String?> = ArrayList() @@ -240,24 +238,32 @@ class PeerProxy : BaseObservable, Parcelable { peerProxy.setTotalPeers(sender.size) } - override fun onItemRangeChanged(sender: ObservableList<PeerProxy?>, - positionStart: Int, itemCount: Int) { + override fun onItemRangeChanged( + sender: ObservableList<PeerProxy?>, + positionStart: Int, itemCount: Int + ) { // Do nothing. } - override fun onItemRangeInserted(sender: ObservableList<PeerProxy?>, - positionStart: Int, itemCount: Int) { + override fun onItemRangeInserted( + sender: ObservableList<PeerProxy?>, + positionStart: Int, itemCount: Int + ) { onChanged(sender) } - override fun onItemRangeMoved(sender: ObservableList<PeerProxy?>, - fromPosition: Int, toPosition: Int, - itemCount: Int) { + override fun onItemRangeMoved( + sender: ObservableList<PeerProxy?>, + fromPosition: Int, toPosition: Int, + itemCount: Int + ) { // Do nothing. } - override fun onItemRangeRemoved(sender: ObservableList<PeerProxy?>, - positionStart: Int, itemCount: Int) { + override fun onItemRangeRemoved( + sender: ObservableList<PeerProxy?>, + positionStart: Int, itemCount: Int + ) { onChanged(sender) } } @@ -276,12 +282,12 @@ class PeerProxy : BaseObservable, Parcelable { @JvmField val CREATOR: Parcelable.Creator<PeerProxy> = PeerProxyCreator() private val IPV4_PUBLIC_NETWORKS = setOf( - "0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3", - "64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12", - "172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7", - "176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16", - "192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10", - "193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4" + "0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3", + "64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12", + "172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7", + "176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16", + "192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10", + "193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4" ) private val IPV4_WILDCARD = setOf("0.0.0.0/0") } diff --git a/ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt b/ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt deleted file mode 100644 index 3f109b37..00000000 --- a/ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ -package com.wireguard.android.widget - -import android.view.View -import android.view.ViewGroup -import androidx.core.view.marginBottom -import androidx.core.view.marginLeft -import androidx.core.view.marginRight -import androidx.core.view.marginTop -import androidx.core.view.updateLayoutParams -import androidx.core.view.updatePadding -import com.google.android.material.floatingactionbutton.FloatingActionButton - -/** - * A utility for edge-to-edge display. It provides several features needed to make the app - * displayed edge-to-edge on Android Q with gestural navigation. - */ - -object EdgeToEdge { - @JvmStatic - fun setUpRoot(root: ViewGroup) { - root.systemUiVisibility = - View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE - } - - @JvmStatic - fun setUpScrollingContent(scrollingContent: ViewGroup, fab: FloatingActionButton?) { - val originalPaddingLeft = scrollingContent.paddingLeft - val originalPaddingRight = scrollingContent.paddingRight - val originalPaddingBottom = scrollingContent.paddingBottom - - val fabPaddingBottom = fab?.height ?: 0 - - val originalMarginTop = scrollingContent.marginTop - - scrollingContent.setOnApplyWindowInsetsListener { _, windowInsets -> - scrollingContent.updatePadding( - left = originalPaddingLeft + windowInsets.systemWindowInsetLeft, - right = originalPaddingRight + windowInsets.systemWindowInsetRight, - bottom = originalPaddingBottom + fabPaddingBottom + windowInsets.systemWindowInsetBottom - ) - scrollingContent.updateLayoutParams<ViewGroup.MarginLayoutParams> { - topMargin = originalMarginTop + windowInsets.systemWindowInsetTop - } - windowInsets - } - } - - @JvmStatic - fun setUpFAB(fab: FloatingActionButton) { - val originalMarginLeft = fab.marginLeft - val originalMarginRight = fab.marginRight - val originalMarginBottom = fab.marginBottom - fab.setOnApplyWindowInsetsListener { _, windowInsets -> - fab.updateLayoutParams<ViewGroup.MarginLayoutParams> { - leftMargin = originalMarginLeft + windowInsets.systemWindowInsetLeft - rightMargin = originalMarginRight + windowInsets.systemWindowInsetRight - bottomMargin = originalMarginBottom + windowInsets.systemWindowInsetBottom - } - windowInsets - } - } -} diff --git a/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.kt b/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.kt index 951af699..8c822dcb 100644 --- a/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.kt +++ b/ui/src/main/java/com/wireguard/android/widget/KeyInputFilter.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.widget @@ -13,10 +13,12 @@ import com.wireguard.crypto.Key * InputFilter for entering WireGuard private/public keys encoded with base64. */ class KeyInputFilter : InputFilter { - override fun filter(source: CharSequence, - sStart: Int, sEnd: Int, - dest: Spanned, - dStart: Int, dEnd: Int): CharSequence? { + override fun filter( + source: CharSequence, + sStart: Int, sEnd: Int, + dest: Spanned, + dStart: Int, dEnd: Int + ): CharSequence? { var replacement: SpannableStringBuilder? = null var rIndex = 0 val dLength = dest.length @@ -26,8 +28,9 @@ class KeyInputFilter : InputFilter { // Restrict characters to the base64 character set. // Ensure adding this character does not push the length over the limit. if ((dIndex + 1 < Key.Format.BASE64.length && isAllowed(c) || - dIndex + 1 == Key.Format.BASE64.length && c == '=') && - dLength + (sIndex - sStart) < Key.Format.BASE64.length) { + dIndex + 1 == Key.Format.BASE64.length && c == '=') && + dLength + (sIndex - sStart) < Key.Format.BASE64.length + ) { ++rIndex } else { if (replacement == null) replacement = SpannableStringBuilder(source, sStart, sEnd) diff --git a/ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt b/ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt deleted file mode 100644 index 97746c09..00000000 --- a/ui/src/main/java/com/wireguard/android/widget/MonkeyedTextInputEditText.kt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright © 2020 WireGuard LLC. All Rights Reserved. - * SPDX-License-Identifier: Apache-2.0 - */ - -package com.wireguard.android.widget - -import android.content.Context -import android.text.Editable -import android.text.SpannableStringBuilder -import android.util.AttributeSet -import com.google.android.material.R -import com.google.android.material.textfield.TextInputEditText -import com.google.android.material.textfield.TextInputLayout - -class MonkeyedTextInputEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = R.attr.editTextStyle) : TextInputEditText(context, attrs, defStyleAttr) { - @Override - override fun getText(): Editable? { - val text = super.getText() - if (!text.isNullOrEmpty()) - return text - /* We want this expression in TextInputLayout.java to be true if there's a hint set: - * final boolean hasText = editText != null && !TextUtils.isEmpty(editText.getText()); - * But for everyone else it should return the real value, so we check the caller. - */ - if (!hint.isNullOrEmpty() && Thread.currentThread().stackTrace[3].className == TextInputLayout::class.qualifiedName) - return SpannableStringBuilder(hint) - return text - } -} diff --git a/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.kt b/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.kt index 5312f5b9..91c7da0c 100644 --- a/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.kt +++ b/ui/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.widget @@ -11,10 +11,10 @@ import android.widget.RelativeLayout import com.wireguard.android.R class MultiselectableRelativeLayout @JvmOverloads constructor( - context: Context? = null, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0, - defStyleRes: Int = 0 + context: Context? = null, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0, + defStyleRes: Int = 0 ) : RelativeLayout(context, attrs, defStyleAttr, defStyleRes) { private var multiselected = false diff --git a/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.kt b/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.kt index ab894195..e21ebaba 100644 --- a/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.kt +++ b/ui/src/main/java/com/wireguard/android/widget/NameInputFilter.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.widget @@ -13,10 +13,12 @@ import com.wireguard.android.backend.Tunnel * InputFilter for entering WireGuard configuration names (Linux interface names). */ class NameInputFilter : InputFilter { - override fun filter(source: CharSequence, - sStart: Int, sEnd: Int, - dest: Spanned, - dStart: Int, dEnd: Int): CharSequence? { + override fun filter( + source: CharSequence, + sStart: Int, sEnd: Int, + dest: Spanned, + dStart: Int, dEnd: Int + ): CharSequence? { var replacement: SpannableStringBuilder? = null var rIndex = 0 val dLength = dest.length @@ -26,7 +28,8 @@ class NameInputFilter : InputFilter { // Restrict characters to those valid in interfaces. // Ensure adding this character does not push the length over the limit. if (dIndex < Tunnel.NAME_MAX_LENGTH && isAllowed(c) && - dLength + (sIndex - sStart) < Tunnel.NAME_MAX_LENGTH) { + dLength + (sIndex - sStart) < Tunnel.NAME_MAX_LENGTH + ) { ++rIndex } else { if (replacement == null) replacement = SpannableStringBuilder(source, sStart, sEnd) diff --git a/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt b/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt index ee4d278f..0e2eeff1 100644 --- a/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt +++ b/ui/src/main/java/com/wireguard/android/widget/SlashDrawable.kt @@ -1,6 +1,6 @@ /* * Copyright © 2018 The Android Open Source Project - * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.widget @@ -35,10 +35,10 @@ class SlashDrawable(private val mDrawable: Drawable) : Drawable() { val radiusX = scale(CORNER_RADIUS, width) val radiusY = scale(CORNER_RADIUS, height) updateRect( - scale(LEFT, width), - scale(TOP, height), - scale(RIGHT, width), - scale(TOP + mCurrentSlashLength, height) + scale(LEFT, width), + scale(TOP, height), + scale(RIGHT, width), + scale(TOP + mCurrentSlashLength, height) ) mPath.reset() // Draw the slash vertically diff --git a/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.kt b/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.kt index c97cb934..0bde810d 100644 --- a/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.kt +++ b/ui/src/main/java/com/wireguard/android/widget/ToggleSwitch.kt @@ -1,6 +1,6 @@ /* * Copyright © 2013 The Android Open Source Project - * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ package com.wireguard.android.widget @@ -8,9 +8,9 @@ package com.wireguard.android.widget import android.content.Context import android.os.Parcelable import android.util.AttributeSet -import android.widget.Switch +import com.google.android.material.materialswitch.MaterialSwitch -class ToggleSwitch @JvmOverloads constructor(context: Context?, attrs: AttributeSet? = null) : Switch(context, attrs) { +class ToggleSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : MaterialSwitch(context, attrs) { private var isRestoringState = false private var listener: OnBeforeCheckedChangeListener? = null override fun onRestoreInstanceState(state: Parcelable) { diff --git a/ui/src/main/java/com/wireguard/android/widget/TvCardView.kt b/ui/src/main/java/com/wireguard/android/widget/TvCardView.kt new file mode 100644 index 00000000..9f7d7011 --- /dev/null +++ b/ui/src/main/java/com/wireguard/android/widget/TvCardView.kt @@ -0,0 +1,44 @@ +/* + * Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.wireguard.android.widget + +import android.content.Context +import android.util.AttributeSet +import android.view.View +import com.google.android.material.card.MaterialCardView +import com.wireguard.android.R + +class TvCardView(context: Context?, attrs: AttributeSet?) : MaterialCardView(context, attrs) { + var isUp: Boolean = false + set(value) { + field = value + refreshDrawableState() + } + var isDeleting: Boolean = false + set(value) { + field = value + refreshDrawableState() + } + + override fun onCreateDrawableState(extraSpace: Int): IntArray { + if (isUp || isDeleting) { + val drawableState = super.onCreateDrawableState(extraSpace + (if (isUp) 1 else 0) + (if (isDeleting) 1 else 0)) + if (isUp) { + View.mergeDrawableStates(drawableState, STATE_IS_UP) + } + if (isDeleting) { + View.mergeDrawableStates(drawableState, STATE_IS_DELETING) + } + return drawableState + } + return super.onCreateDrawableState(extraSpace) + } + + companion object { + private val STATE_IS_UP = intArrayOf(R.attr.state_isUp) + private val STATE_IS_DELETING = intArrayOf(R.attr.state_isDeleting) + } +}
\ No newline at end of file diff --git a/ui/src/main/res/anim/scale_down.xml b/ui/src/main/res/anim/scale_down.xml new file mode 100644 index 00000000..3d574180 --- /dev/null +++ b/ui/src/main/res/anim/scale_down.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <scale + android:duration="300" + android:fromXScale="1.0" + android:fromYScale="1.0" + android:interpolator="@android:anim/linear_interpolator" + android:pivotX="50%" + android:pivotY="50%" + android:toXScale="0" + android:toYScale="0" /> +</set> diff --git a/ui/src/main/res/anim/scale_up.xml b/ui/src/main/res/anim/scale_up.xml new file mode 100644 index 00000000..e429b8bf --- /dev/null +++ b/ui/src/main/res/anim/scale_up.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<set xmlns:android="http://schemas.android.com/apk/res/android"> + <scale + android:duration="300" + android:fromXScale="0" + android:fromYScale="0" + android:interpolator="@android:anim/linear_interpolator" + android:pivotX="50%" + android:pivotY="50%" + android:toXScale="1.0" + android:toYScale="1.0" /> +</set> diff --git a/ui/src/main/res/color/tv_list_item_tint.xml b/ui/src/main/res/color/tv_list_item_tint.xml new file mode 100644 index 00000000..08e833a7 --- /dev/null +++ b/ui/src/main/res/color/tv_list_item_tint.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item app:state_isUp="true" app:state_isDeleting="false" android:color="?attr/colorPrimaryInverse" /> + <item android:state_focused="true" app:state_isDeleting="true" android:color="?attr/colorErrorContainer" /> + <item android:color="?attr/colorOnSurfaceInverse" /> +</selector>
\ No newline at end of file diff --git a/ui/src/main/res/drawable/ic_action_add_white.xml b/ui/src/main/res/drawable/ic_action_add_white.xml index 18fe19db..1ea440df 100644 --- a/ui/src/main/res/drawable/ic_action_add_white.xml +++ b/ui/src/main/res/drawable/ic_action_add_white.xml @@ -1,9 +1,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> <path - android:fillColor="?attr/colorOnSecondary" + android:fillColor="#FFFFFFFF" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> </vector> diff --git a/ui/src/main/res/drawable/ic_action_delete.xml b/ui/src/main/res/drawable/ic_action_delete.xml index 51517c42..73eb7352 100644 --- a/ui/src/main/res/drawable/ic_action_delete.xml +++ b/ui/src/main/res/drawable/ic_action_delete.xml @@ -1,9 +1,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/colorOnPrimary" + android:fillColor="#FFFFFFFF" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" /> </vector> diff --git a/ui/src/main/res/drawable/ic_action_edit.xml b/ui/src/main/res/drawable/ic_action_edit.xml index 8d8acf85..d40c78d9 100644 --- a/ui/src/main/res/drawable/ic_action_edit.xml +++ b/ui/src/main/res/drawable/ic_action_edit.xml @@ -1,9 +1,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/colorOnPrimary" + android:fillColor="#FFFFFFFF" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" /> </vector> diff --git a/ui/src/main/res/drawable/ic_action_edit_white.xml b/ui/src/main/res/drawable/ic_action_edit_white.xml deleted file mode 100644 index 212fc72c..00000000 --- a/ui/src/main/res/drawable/ic_action_edit_white.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="?attr/colorOnSecondary" - android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" /> -</vector> diff --git a/ui/src/main/res/drawable/ic_action_generate.xml b/ui/src/main/res/drawable/ic_action_generate.xml index 7324eae4..51d26aed 100644 --- a/ui/src/main/res/drawable/ic_action_generate.xml +++ b/ui/src/main/res/drawable/ic_action_generate.xml @@ -1,9 +1,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="#FF000000" + android:fillColor="#FFFFFFFF" android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" /> </vector> diff --git a/ui/src/main/res/drawable/ic_action_open_white.xml b/ui/src/main/res/drawable/ic_action_open.xml index 91075680..c9fd6fba 100644 --- a/ui/src/main/res/drawable/ic_action_open_white.xml +++ b/ui/src/main/res/drawable/ic_action_open.xml @@ -1,9 +1,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/colorOnSecondary" + android:fillColor="#FFFFFFFF" android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z" /> </vector> diff --git a/ui/src/main/res/drawable/ic_action_save.xml b/ui/src/main/res/drawable/ic_action_save.xml index ed98e85a..6e618edb 100644 --- a/ui/src/main/res/drawable/ic_action_save.xml +++ b/ui/src/main/res/drawable/ic_action_save.xml @@ -2,9 +2,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/colorOnPrimary" + android:fillColor="#FFFFFFFF" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" /> </vector> diff --git a/ui/src/main/res/drawable/ic_action_scan_qr_code_white.xml b/ui/src/main/res/drawable/ic_action_scan_qr_code.xml index a5ede695..4522ae46 100644 --- a/ui/src/main/res/drawable/ic_action_scan_qr_code_white.xml +++ b/ui/src/main/res/drawable/ic_action_scan_qr_code.xml @@ -1,9 +1,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/colorOnSecondary" + android:fillColor="#FFFFFFFF" android:pathData="M4,4H10V10H4V4M20,4V10H14V4H20M14,15H16V13H14V11H16V13H18V11H20V13H18V15H20V18H18V20H16V18H13V20H11V16H14V15M16,15V18H18V15H16M4,20V14H10V20H4M6,6V8H8V6H6M16,6V8H18V6H16M6,16V18H8V16H6M4,11H6V13H4V11M9,11H13V15H11V13H9V11M11,6H13V10H11V6M2,2V6H0V2A2,2 0 0,1 2,0H6V2H2M22,0A2,2 0 0,1 24,2V6H22V2H18V0H22M2,18V22H6V24H2A2,2 0 0,1 0,22V18H2M22,22V18H24V22A2,2 0 0,1 22,24H18V22H22Z" /> </vector> diff --git a/ui/src/main/res/drawable/ic_action_select_all.xml b/ui/src/main/res/drawable/ic_action_select_all.xml index 43f5f15e..490ca715 100644 --- a/ui/src/main/res/drawable/ic_action_select_all.xml +++ b/ui/src/main/res/drawable/ic_action_select_all.xml @@ -2,9 +2,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?attr/colorOnPrimary" + android:fillColor="#FFFFFFFF" android:pathData="M3 5L5 5 5 3C3.9 3 3 3.9 3 5Zm0 8l2 0 0 -2 -2 0 0 2zm4 8l2 0 0 -2 -2 0 0 2zM3 9L5 9 5 7 3 7 3 9Zm10 -6l-2 0 0 2 2 0 0 -2zm6 0l0 2 2 0C21 3.9 20.1 3 19 3ZM5 21L5 19 3 19c0 1.1 0.9 2 2 2zm-2 -4l2 0 0 -2 -2 0 0 2zM9 3L7 3 7 5 9 5 9 3Zm2 18l2 0 0 -2 -2 0 0 2zm8 -8l2 0 0 -2 -2 0 0 2zm0 8c1.1 0 2 -0.9 2 -2l-2 0 0 2zm0 -12l2 0 0 -2 -2 0 0 2zm0 8l2 0 0 -2 -2 0 0 2zm-4 4l2 0 0 -2 -2 0 0 2zm0 -16l2 0 0 -2 -2 0 0 2zM7 17L17 17 17 7 7 7 7 17Zm2 -8l6 0 0 6 -6 0 0 -6z" /> </vector> diff --git a/ui/src/main/res/drawable/ic_action_share_white.xml b/ui/src/main/res/drawable/ic_action_share_white.xml index 70843cf3..04ee5b74 100644 --- a/ui/src/main/res/drawable/ic_action_share_white.xml +++ b/ui/src/main/res/drawable/ic_action_share_white.xml @@ -1,6 +1,7 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path diff --git a/ui/src/main/res/drawable/ic_arrow_back.xml b/ui/src/main/res/drawable/ic_arrow_back.xml new file mode 100644 index 00000000..0df5dc6c --- /dev/null +++ b/ui/src/main/res/drawable/ic_arrow_back.xml @@ -0,0 +1,15 @@ +<!-- + ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + ~ SPDX-License-Identifier: Apache-2.0 + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z" /> +</vector> diff --git a/ui/src/main/res/drawable/ic_settings.xml b/ui/src/main/res/drawable/ic_settings.xml index 6d1cfa71..af9f2634 100644 --- a/ui/src/main/res/drawable/ic_settings.xml +++ b/ui/src/main/res/drawable/ic_settings.xml @@ -1,9 +1,10 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" + android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="?android:attr/colorForeground" + android:fillColor="#FFFFFFFF" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" /> </vector> diff --git a/ui/src/main/res/drawable/ic_tile.xml b/ui/src/main/res/drawable/ic_tile.xml index f5774968..6232123f 100644 --- a/ui/src/main/res/drawable/ic_tile.xml +++ b/ui/src/main/res/drawable/ic_tile.xml @@ -1,6 +1,6 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="400dp" - android:height="400dp" + android:width="200dp" + android:height="200dp" android:viewportWidth="400.0" android:viewportHeight="400.0"> <path diff --git a/ui/src/main/res/drawable/list_item_background.xml b/ui/src/main/res/drawable/list_item_background.xml index d517bbb6..16714e7b 100644 --- a/ui/src/main/res/drawable/list_item_background.xml +++ b/ui/src/main/res/drawable/list_item_background.xml @@ -6,7 +6,10 @@ <item android:state_activated="true" app:state_multiselected="true"> - <color android:color="?attr/colorMultiselectActiveBackground" /> + <color android:color="?attr/colorSurfaceVariant" /> + </item> + <item android:state_activated="true"> + <color android:color="?attr/colorControlHighlight" /> </item> </selector> </item> diff --git a/ui/src/main/res/drawable/tv_logo_banner.xml b/ui/src/main/res/drawable/tv_logo_banner.xml new file mode 100644 index 00000000..734702f3 --- /dev/null +++ b/ui/src/main/res/drawable/tv_logo_banner.xml @@ -0,0 +1,211 @@ +<!-- + ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + ~ SPDX-License-Identifier: Apache-2.0 + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="1934.5dp" + android:height="393.14dp" + android:viewportWidth="1934.5" + android:viewportHeight="393.14"> + <path + android:fillColor="#88171a" + android:fillType="nonZero" + android:pathData="M0,0L1934.5,0L1934.5,393.14L0,393.14Z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="M432.69,266.47 L367.47,66.48l24.46,0l49.64,154.34 50.91,-154.34l22.28,0l50.72,153.98 49.81,-153.98L639.03,66.48L573.99,266.47L555.87,266.47L503.16,105.43 450.99,266.47Z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="m634.56,111.4l24.64,0l0,155.07l-24.64,0z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="m716.31,198.9l0,67.57L692.04,266.47L692.04,112.13l106.52,0c15.82,0 28.2,3.8 37.14,11.41 8.94,7.61 13.41,18.18 13.41,31.7 0.18,10.5 -3.6,20.69 -10.6,28.53 -7.06,8.03 -16.27,12.95 -27.63,14.77l42.93,67.93l-26.27,0l-43.84,-67.57zM716.31,176.25l82.24,0c8.33,0 14.7,-1.81 19.11,-5.43 4.41,-3.63 6.61,-8.82 6.61,-15.58 0,-6.77 -2.2,-11.93 -6.61,-15.49 -4.41,-3.56 -10.78,-5.34 -19.11,-5.34l-82.24,0z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="M871.98,266.47L871.98,111.77l145.1,0l0,22.64l-120.83,0l0,38.59l79.34,0l0,22.28l-79.34,0l0,48.91l127.53,0l0,22.28L871.97,266.47Z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="m1194.46,212.31l0,-29.35l-54.53,0l0,-23.01l79.34,0l0,60.14c-9.66,16.67 -22.25,29.44 -37.77,38.31 -15.52,8.88 -33.13,13.32 -52.81,13.32 -29.95,0 -54.68,-9.87 -74.18,-29.62 -19.51,-19.75 -29.26,-44.78 -29.26,-75.09 0,-30.43 9.78,-55.52 29.34,-75.27 19.57,-19.75 44.27,-29.62 74.09,-29.62 18.48,0 35.32,4.05 50.54,12.13 15.2,8.08 28.01,20.01 37.13,34.6L1195.55,123.72c-6.13,-11.8 -15.58,-21.56 -27.17,-28.08 -12.09,-6.83 -25.79,-10.33 -39.67,-10.15 -22.46,0 -41.06,7.7 -55.8,23.1 -14.73,15.4 -22.1,34.87 -22.1,58.42 0,23.55 7.37,42.99 22.1,58.33 14.73,15.34 33.33,23.01 55.8,23.01 14.01,0 26.48,-3.02 37.41,-9.06 10.93,-6.04 20.38,-15.03 28.35,-26.99z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="m1246.36,112.14l24.28,0l0,99.09c0,14.85 3.5,24.87 10.5,30.07 7.01,5.2 20.89,7.79 41.67,7.79 20.89,0 34.84,-2.59 41.84,-7.79 7.01,-5.19 10.51,-15.21 10.51,-30.07L1375.16,112.14l24.09,0l0,105.43c0,18.96 -6.01,32.67 -18.02,41.13 -12.02,8.45 -31.61,12.68 -58.79,12.68 -27.05,0 -46.49,-4.17 -58.33,-12.5 -11.84,-8.33 -17.75,-22.1 -17.75,-41.3z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="m1395.46,266.47 l78.62,-154.7l15.22,0l79.34,154.7l-25.9,0l-20.11,-39.31l-81.7,0l-19.93,39.31zM1451.44,206.69l60.51,0l-30.07,-59.23z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="m1595.56,198.9l0,67.57l-24.28,0L1571.29,112.13l106.52,0c15.82,0 28.2,3.8 37.14,11.41 8.94,7.61 13.41,18.18 13.41,31.7 0.18,10.5 -3.6,20.69 -10.6,28.53 -7.06,8.03 -16.27,12.95 -27.62,14.77l42.93,67.93l-26.27,0l-43.84,-67.57zM1595.56,176.25l82.24,0c8.33,0 14.7,-1.81 19.11,-5.43 4.41,-3.63 6.61,-8.82 6.61,-15.58 0,-6.77 -2.2,-11.93 -6.61,-15.49 -4.41,-3.56 -10.78,-5.34 -19.11,-5.34l-82.24,0z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="m1820.26,111.77c25.24,0 45.59,7.21 61.05,21.65 15.46,14.43 23.19,33.18 23.19,56.25 0,23.31 -7.58,41.94 -22.73,55.89 -15.16,13.95 -35.66,20.92 -61.5,20.92l-68.66,0L1751.6,111.78l68.66,0zM1820.63,134.05l-44.75,0l0,110.14l44.75,0c18.35,0 32.79,-4.92 43.29,-14.77 10.51,-9.84 15.76,-23.21 15.76,-40.12 0,-16.3 -5.43,-29.59 -16.3,-39.85 -10.87,-10.26 -25.12,-15.4 -42.75,-15.4l0,0z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m429.67,318.63l0,18.61l-6.35,0l0,-40.45l37.37,0l0,5.92l-31.02,0l0,10.08l20.04,0l0,5.83z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m455.24,337.24 l20.56,-40.45l3.98,0l20.75,40.45l-6.78,0l-5.26,-10.28l-21.36,0l-5.21,10.28zM469.87,321.61l15.82,0l-7.86,-15.49z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m505.02,332.08 l3.08,-5.3c2.81,1.87 5.87,3.34 9.09,4.35 3.04,1.01 6.22,1.53 9.43,1.57 3.06,0.14 6.09,-0.62 8.71,-2.2 2.03,-1.16 3.3,-3.32 3.32,-5.66 0.08,-2.16 -1.1,-4.17 -3.03,-5.14 -2.03,-1.12 -5.21,-1.75 -9.57,-1.87 -7.36,-0.09 -12.41,-0.95 -15.16,-2.56 -2.75,-1.61 -4.13,-4.28 -4.13,-8.01 -0.04,-3.39 1.67,-6.56 4.53,-8.38 3.01,-2.12 7.06,-3.18 12.15,-3.18 3.43,-0.01 6.83,0.49 10.11,1.47 3.33,1.01 6.52,2.48 9.45,4.36l-3.17,5.26c-2.52,-1.7 -5.25,-3.03 -8.15,-3.95 -2.69,-0.9 -5.5,-1.37 -8.34,-1.4 -2.56,-0.11 -5.1,0.44 -7.39,1.61 -1.66,0.76 -2.75,2.39 -2.8,4.21 -0.03,1.77 1.13,3.33 2.82,3.84 1.88,0.76 5.14,1.14 9.78,1.14 6.44,0 11.31,1.09 14.59,3.27 3.29,2.18 4.93,5.42 4.93,9.71 0.01,3.8 -1.86,7.37 -5,9.52 -3.33,2.53 -7.65,3.79 -12.95,3.79 -3.95,-0.01 -7.88,-0.57 -11.67,-1.68 -3.75,-1.07 -7.34,-2.67 -10.63,-4.76z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m568.06,337.24l0,-34.81l-17.05,0l0,-5.63l40.45,0l0,5.63L574.36,302.43l0,34.81z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m604.52,345.48c0.91,-1.32 1.73,-2.7 2.46,-4.12 0.68,-1.32 1.25,-2.7 1.7,-4.12l-0.38,0c-0.96,0.01 -1.86,-0.44 -2.44,-1.21 -0.67,-0.87 -1.01,-1.95 -0.97,-3.06 -0.05,-1.22 0.36,-2.41 1.16,-3.34 0.73,-0.84 1.8,-1.32 2.92,-1.3 1.3,-0.02 2.52,0.64 3.22,1.73 0.89,1.39 1.32,3.02 1.23,4.67 -0.09,2.03 -0.71,3.99 -1.8,5.71 -1.5,2.45 -3.3,4.7 -5.35,6.7z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m668.13,337.24l0,-40.45l5.25,0l16.58,23.68 16.58,-23.68l5.26,0l0,40.45l-6.3,0l0,-29.08l-15.54,22.49 -15.49,-22.49l0,29.08z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m748.83,338.52c-7.2,0 -13.12,-2.04 -17.76,-6.11 -4.42,-3.87 -6.96,-9.46 -6.96,-15.33 -0.01,-5.87 2.52,-11.47 6.94,-15.34 4.63,-4.02 10.55,-6.04 17.78,-6.04 7.3,0 13.25,2.01 17.88,6.02 4.42,3.89 6.95,9.48 6.94,15.36 -0.01,5.88 -2.54,11.47 -6.96,15.35 -4.64,4.06 -10.59,6.09 -17.85,6.09zM748.83,332.6c5.4,0 9.81,-1.46 13.22,-4.38 3.25,-2.79 5.12,-6.86 5.11,-11.15 -0.01,-4.29 -1.89,-8.35 -5.14,-11.14 -3.43,-2.94 -7.82,-4.4 -13.19,-4.4 -5.36,0 -9.75,1.46 -13.14,4.38 -3.23,2.8 -5.09,6.87 -5.09,11.15 0,4.28 1.86,8.35 5.09,11.16 3.39,2.92 7.78,4.38 13.14,4.38z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m803.92,296.79c6.6,0 11.92,1.89 15.96,5.66 4.04,3.78 6.06,8.68 6.06,14.71 0,6.09 -1.98,10.96 -5.94,14.61 -3.96,3.65 -9.32,5.47 -16.08,5.47l-17.95,0l0,-40.45zM804.02,302.61l-11.7,0l0,28.8l11.7,0c4.8,0 8.57,-1.29 11.32,-3.86 2.75,-2.57 4.13,-6.07 4.13,-10.49 0.13,-3.93 -1.42,-7.72 -4.27,-10.42 -2.84,-2.68 -6.57,-4.03 -11.18,-4.03z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m837.87,337.24l0,-40.45l37.94,0l0,5.92l-31.59,0l0,10.09l20.75,0l0,5.82l-20.75,0l0,12.79l33.34,0l0,5.82z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m894.94,319.57l0,17.67l-6.35,0L888.59,296.88l27.85,0c4.14,0 7.37,0.99 9.71,2.98 2.38,2.08 3.67,5.14 3.51,8.29 0.05,2.75 -0.94,5.41 -2.77,7.46 -1.86,2.11 -4.43,3.48 -7.22,3.86l11.22,17.76l-6.87,0l-11.46,-17.67zM894.94,313.65l21.5,0c1.78,0.12 3.55,-0.39 5,-1.42 1.18,-1.01 1.82,-2.52 1.72,-4.07 0.1,-1.55 -0.54,-3.05 -1.72,-4.05 -1.46,-1.02 -3.22,-1.52 -5,-1.4l-21.5,0z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m943.11,337.24l0,-40.45l3.32,0l25.72,28.42l0,-28.42l6.2,0l0,40.45l-3.32,0l-25.67,-28.32l0,28.32z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m999,345.48c0.91,-1.32 1.73,-2.7 2.46,-4.12 0.68,-1.32 1.25,-2.7 1.7,-4.12l-0.37,0c-0.96,0.01 -1.87,-0.44 -2.44,-1.21 -0.67,-0.87 -1.01,-1.95 -0.97,-3.06 -0.05,-1.22 0.37,-2.41 1.16,-3.34 0.72,-0.84 1.8,-1.32 2.91,-1.3 1.3,-0.02 2.52,0.64 3.22,1.73 0.89,1.39 1.32,3.02 1.23,4.67 -0.09,2.03 -0.71,3.99 -1.8,5.71 -1.5,2.45 -3.3,4.7 -5.35,6.7z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1059.16,332.08 l3.08,-5.3c2.81,1.87 5.87,3.34 9.09,4.35 3.04,1.01 6.22,1.53 9.43,1.57 3.06,0.14 6.09,-0.62 8.71,-2.2 2.03,-1.16 3.3,-3.32 3.31,-5.66 0.09,-2.16 -1.1,-4.17 -3.03,-5.14 -2.02,-1.12 -5.21,-1.75 -9.57,-1.87 -7.35,-0.09 -12.41,-0.95 -15.15,-2.56 -2.75,-1.61 -4.12,-4.28 -4.12,-8.01 -0.04,-3.39 1.67,-6.56 4.53,-8.38 3.02,-2.12 7.06,-3.18 12.15,-3.18 3.43,-0.01 6.83,0.49 10.11,1.47 3.33,1.01 6.52,2.48 9.45,4.36l-3.17,5.26c-2.51,-1.7 -5.25,-3.03 -8.15,-3.95 -2.69,-0.9 -5.51,-1.37 -8.34,-1.4 -2.56,-0.11 -5.1,0.44 -7.39,1.61 -1.66,0.76 -2.74,2.39 -2.8,4.21 -0.03,1.77 1.13,3.33 2.82,3.84 1.88,0.76 5.14,1.14 9.78,1.14 6.44,0 11.3,1.09 14.59,3.27 3.28,2.18 4.93,5.41 4.93,9.71 0.01,3.8 -1.86,7.37 -5,9.52 -3.33,2.53 -7.65,3.79 -12.95,3.79 -3.95,-0.01 -7.88,-0.57 -11.68,-1.68 -3.75,-1.07 -7.33,-2.67 -10.63,-4.76z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1112.56,337.24l0,-40.45l37.94,0l0,5.92L1118.91,302.71l0,10.09l20.74,0l0,5.82L1118.91,318.63l0,12.79l33.34,0l0,5.82z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1206.06,327.34c-2.21,3.55 -5.35,6.42 -9.07,8.31 -3.96,1.96 -8.34,2.94 -12.77,2.87 -7.1,0 -12.95,-2.01 -17.55,-6.04 -4.38,-3.89 -6.89,-9.48 -6.89,-15.34 0,-5.87 2.51,-11.45 6.89,-15.35 4.59,-4.06 10.44,-6.08 17.55,-6.08 4.15,-0.06 8.25,0.79 12.03,2.49 3.47,1.55 6.47,3.97 8.71,7.04l-5.02,3.51c-1.7,-2.33 -3.97,-4.16 -6.6,-5.33 -2.87,-1.28 -5.98,-1.92 -9.12,-1.87 -4.69,-0.17 -9.27,1.41 -12.86,4.43 -3.23,2.78 -5.09,6.84 -5.09,11.11 0.01,4.27 1.87,8.32 5.11,11.1 3.58,3.02 8.16,4.59 12.83,4.43 3.3,0.07 6.57,-0.66 9.52,-2.13 2.93,-1.58 5.41,-3.86 7.24,-6.64z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1218.66,296.89l6.34,0l0,25.91c0,3.89 0.92,6.51 2.75,7.86 1.83,1.36 5.46,2.04 10.89,2.04 5.46,0 9.11,-0.68 10.94,-2.04 1.83,-1.36 2.75,-3.98 2.75,-7.86l0,-25.91l6.3,0l0,27.56c0,4.96 -1.57,8.54 -4.71,10.75 -3.14,2.21 -8.27,3.31 -15.37,3.31 -7.07,0 -12.16,-1.09 -15.25,-3.27 -3.09,-2.18 -4.64,-5.78 -4.64,-10.8z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1280.86,319.57l0,17.67l-6.34,0L1274.52,296.88l27.85,0c4.14,0 7.37,0.99 9.71,2.98 2.38,2.08 3.67,5.14 3.51,8.29 0.05,2.75 -0.94,5.41 -2.77,7.46 -1.86,2.11 -4.43,3.48 -7.22,3.86l11.22,17.76l-6.86,0l-11.46,-17.67zM1280.86,313.65l21.5,0c1.78,0.12 3.55,-0.39 5,-1.42 1.18,-1.01 1.82,-2.52 1.73,-4.07 0.1,-1.55 -0.55,-3.05 -1.73,-4.05 -1.46,-1.02 -3.22,-1.52 -5,-1.4l-21.5,0z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1328.96,337.24l0,-40.45l37.94,0l0,5.92l-31.59,0l0,10.09l20.75,0l0,5.82l-20.75,0l0,12.79l33.34,0l0,5.82z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1431.46,337.24l-3.27,0l-20.32,-40.45l6.72,0l15.2,30.27 14.97,-30.27l6.96,0z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1468.06,319.57l0,17.67l-6.35,0L1461.71,296.79l29.41,0c4.17,0 7.42,0.99 9.73,2.96 2.37,2.09 3.66,5.15 3.48,8.31 0.1,3.13 -1.16,6.16 -3.46,8.29 -2.49,2.22 -5.76,3.37 -9.09,3.22zM1468.06,313.65l23.06,0c1.77,0.11 3.51,-0.39 4.95,-1.42 2.28,-2.21 2.31,-5.85 0.07,-8.1 -1.35,-1.03 -3.04,-1.53 -4.73,-1.42l-23.35,0z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1515.26,337.24l0,-40.45l3.32,0l25.71,28.42l0,-28.42l6.21,0l0,40.45l-3.32,0l-25.67,-28.32l0,28.32z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1610.06,337.24l0,-34.81l-17.05,0l0,-5.63l40.45,0l0,5.63l-17.1,0l0,34.81z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1641.76,296.89l6.35,0l0,25.91c0,3.89 0.91,6.51 2.75,7.86 1.83,1.36 5.46,2.04 10.89,2.04 5.46,0 9.11,-0.68 10.94,-2.04 1.83,-1.36 2.75,-3.98 2.75,-7.86l0,-25.91l6.3,0l0,27.56c0,4.96 -1.57,8.54 -4.71,10.75 -3.14,2.21 -8.27,3.31 -15.37,3.31 -7.07,0 -12.16,-1.09 -15.25,-3.27 -3.09,-2.18 -4.64,-5.78 -4.64,-10.8z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1697.66,337.24l0,-40.45l3.31,0l25.72,28.42l0,-28.42l6.21,0l0,40.45l-3.32,0l-25.67,-28.32l0,28.32z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1748.76,337.24l0,-40.45l3.32,0l25.71,28.42L1777.79,296.79L1784,296.79l0,40.45l-3.32,0l-25.67,-28.32l0,28.32z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1799.76,337.24l0,-40.45l37.94,0l0,5.92l-31.59,0l0,10.09l20.75,0l0,5.82l-20.75,0l0,12.79l33.34,0l0,5.82z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1850.46,337.24l0,-40.45l6.35,0l0,34.62l30.03,0l0,5.82z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="M329.74,185.56C329.74,185.56 336.68,40 176.7,40 35.22,40 30.8,179.63 30.8,179.63 30.8,179.63 9.99,340 179.96,340 342.98,340 329.74,185.56 329.74,185.56ZM131.94,134.7c30.02,-18.36 68.36,-7.14 82.73,20.47 2.72,5.23 3.07,13.29 1.34,18.78 -5.95,18.96 -20.02,29.59 -39.31,34.1 5.69,-4.87 10.22,-10.4 11.66,-18.03 1.52,-7.31 -0.13,-14.93 -4.55,-20.95 -7.03,-9.65 -19.59,-13.49 -30.81,-9.39 -11.89,4.51 -18.39,15.35 -17.22,28.68 1.09,12.38 10.48,20.41 28.06,23.45 -2.63,1.39 -4.65,2.42 -6.63,3.52 -8.05,4.41 -15.06,10.51 -20.54,17.87 -1.79,2.41 -3.01,2.6 -5.73,0.94 -35.34,-21.61 -37.61,-75.84 0.98,-99.45zM105.49,268.23c-5.68,1.44 -11.18,3.57 -16.98,5.47 2.84,-19.15 25.27,-36.79 44.23,-34.78 -5.49,7.57 -8.7,16.56 -9.24,25.9 -6.3,1.16 -12.25,1.94 -18.01,3.4zM226.28,81.25c5.61,0.21 11.23,0.12 16.84,0.25 1.4,0.09 2.8,0.29 4.17,0.58 -1.26,1.93 -2.67,3.75 -4.23,5.43 -2.01,1.87 -4.28,3.7 -7.17,0.85 -0.69,-0.68 -2.34,-0.53 -3.55,-0.54 -5.58,-0.07 -11.17,-0.25 -16.75,-0.04 -4.84,0.16 -9.66,0.65 -14.43,1.47 -0.9,0.16 -2.23,3.13 -1.82,4.22 0.97,2.59 2.38,5.44 4.47,7.09 7.75,6.11 15.97,11.59 23.75,17.66 7.56,5.9 14.59,12.36 18.87,21.25 5.58,11.59 5.74,23.74 3.34,35.95 -4.02,20.38 -14.33,37.26 -31.03,49.53 -6.73,4.94 -15.06,7.74 -22.77,11.29 -6.78,3.13 -13.75,5.81 -20.55,8.9 -12.25,5.57 -19.13,18.87 -17.1,32.69 1.85,12.69 12.98,23.27 25.73,25.46 15.29,2.62 31.07,-7.32 34.81,-22.86 4.2,-17.48 -5.29,-33.08 -23.07,-37.81 -0.78,-0.21 -1.57,-0.41 -3.2,-0.83 4.75,-2.12 8.86,-3.64 12.66,-5.72 6.61,-3.64 13.11,-7.49 19.48,-11.56 1.88,-1.2 2.89,-1.2 4.49,0.18 12.23,10.57 19.52,23.72 21.56,39.84 3.39,26.68 -9.25,51.2 -33.07,63.76 -36.87,19.44 -81.97,-2.68 -90.11,-43.55 -6.97,-35 17.73,-66.75 47.46,-72.88 12.79,-2.63 24.48,-7.96 33.57,-17.81 5.87,-6.35 8.71,-11.81 9.68,-14.27 1.81,-4.61 2.73,-9.52 2.72,-14.47 -0.2,-4.29 -1.2,-8.49 -2.96,-12.4 -3.1,-7.07 -15,-18.33 -17.94,-20.7l-28,-21.92c-0.98,-0.81 -2.1,-0.75 -4.51,-0.59 -2.86,0.19 -10.18,0.6 -13.33,-0.23 2.55,-1.93 9.52,-4.74 12.51,-7.01 -9.08,-6.13 -19.43,-3.92 -28.94,-5.75 2.2,-4.09 13.08,-10.39 19.27,-11.09 -0.37,-3.46 -0.93,-6.89 -1.69,-10.28 -0.38,-1.39 -1.93,-2.74 -3.29,-3.54 -3.29,-1.93 -6.77,-3.52 -10.55,-5.43 3.39,-2.19 7.31,-3.4 11.33,-3.51 3.82,-0.15 7.63,0.23 11.35,1.1 6.74,1.54 12.12,0.54 17.49,-4.05 -4.22,-1.7 -8.45,-3.25 -12.54,-5.09 -4.03,-1.84 -7.96,-3.9 -11.78,-6.16 10.62,1.48 20.89,5.46 31.75,4 0.09,-0.49 0.19,-0.99 0.28,-1.48 -8.12,-1.89 -16.24,-3.78 -25.23,-5.87 15.04,-1.37 29.04,-1.6 42.3,4.85 3.73,1.82 7.63,3.32 11.21,5.4 1.74,1.02 2.92,3.01 4.35,4.56 1.13,1.23 2.05,2.88 3.44,3.63 5.3,2.82 11.13,2.93 17.08,2.79 0.05,-0.68 0.09,-1.31 0.13,-1.99 5.98,1.87 12.72,8.77 12.71,13.8 -9.69,0 -19.37,-0.04 -29.06,0.06 -1.04,0.01 -2.06,0.77 -3.09,1.17 0.98,0.57 1.94,1.6 2.94,1.64z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#ffffff" + android:fillType="nonZero" + android:pathData="m213.78,66.91c-0.84,0.53 -0.94,1.71 -0.19,2.37 0.61,1.08 1.99,1.45 3.07,0.82 0.94,-0.47 1.85,-0.97 2.98,-1.57 -0.91,-0.78 -1.64,-1.42 -2.39,-2.03 -1.32,-1.09 -2.41,-0.41 -3.47,0.41z" + android:strokeColor="#00000000" /> + <path + android:fillColor="#d1d1d1" + android:fillType="nonZero" + android:pathData="m1890,97.71l-1.24,0c-7.56,0.08 -11.84,6.64 -11.84,13 0,6.16 3.92,12.32 12.2,12.32l0.56,0c8.6,-0.24 12.36,-6.16 12.36,-12.24l0,-0.72c-0.28,-6.36 -4.84,-12.36 -12.04,-12.36zM1884.48,102.87l0,14.44l1.8,0l0,-12.96l3.4,0c1.88,0 2.8,1.16 2.8,2.32 0,1.4 -1.36,3 -3.8,3 -0.37,0 -0.84,-0.08 -1.28,-0.16l5.44,7.8l2.36,0l-4.92,-6.64c2.4,-0.44 4,-2.36 4,-4.24 0,-1.76 -1.52,-3.56 -4.88,-3.56zM1881.04,103.16c2.52,-2.72 5.16,-3.72 8.24,-3.72l1.28,0c5.48,0.24 9.44,5.8 9.44,11.16 0,0.76 -0.08,1.64 -0.24,2.36 -0.84,4.92 -5.12,8.36 -10.08,8.36 -0.12,0 -0.37,0.04 -0.49,0.04 -6.28,0 -10.28,-5.68 -10.28,-11.36 0,-0.48 0.08,-1.12 0.12,-1.64 0,0 0.28,-3.12 2,-5.2z" + android:strokeColor="#00000000" /> +</vector> diff --git a/ui/src/main/res/layout-sw600dp/main_activity.xml b/ui/src/main/res/layout-sw600dp/main_activity.xml index 00fa1c49..b5ce34a4 100644 --- a/ui/src/main/res/layout-sw600dp/main_activity.xml +++ b/ui/src/main/res/layout-sw600dp/main_activity.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/main_activity_container" android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".activity.MainActivity"> diff --git a/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml b/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml index 41cfe8bd..3a5ddf0a 100644 --- a/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml +++ b/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml @@ -8,17 +8,19 @@ <com.google.android.material.button.MaterialButton android:id="@+id/create_from_file" - style="@style/Widget.MaterialComponents.Button.TextButton.Icon" + style="@style/Widget.Material3.Button.TextButton.Icon" android:layout_width="match_parent" android:layout_height="@dimen/bottom_sheet_item_height" android:layout_marginStart="@dimen/normal_margin" android:layout_marginLeft="@dimen/normal_margin" android:layout_marginEnd="@dimen/normal_margin" android:layout_marginRight="@dimen/normal_margin" + android:nextFocusDown="@id/create_from_qrcode" + android:nextFocusForward="@id/create_from_qrcode" android:text="@string/create_from_file" android:textAlignment="viewStart" android:textColor="?attr/colorOnSurface" - app:icon="@drawable/ic_action_open_white" + app:icon="@drawable/ic_action_open" app:iconPadding="@dimen/bottom_sheet_icon_padding" app:iconTint="?attr/colorSecondary" app:layout_constraintBottom_toTopOf="@+id/create_from_qrcode" @@ -29,17 +31,20 @@ <com.google.android.material.button.MaterialButton android:id="@+id/create_from_qrcode" - style="@style/Widget.MaterialComponents.Button.TextButton.Icon" + style="@style/Widget.Material3.Button.TextButton.Icon" android:layout_width="match_parent" android:layout_height="@dimen/bottom_sheet_item_height" android:layout_marginStart="@dimen/normal_margin" android:layout_marginLeft="@dimen/normal_margin" android:layout_marginEnd="@dimen/normal_margin" android:layout_marginRight="@dimen/normal_margin" + android:nextFocusUp="@id/create_from_file" + android:nextFocusDown="@id/create_empty" + android:nextFocusForward="@id/create_empty" android:text="@string/create_from_qr_code" android:textAlignment="viewStart" android:textColor="?attr/colorOnSurface" - app:icon="@drawable/ic_action_scan_qr_code_white" + app:icon="@drawable/ic_action_scan_qr_code" app:iconPadding="@dimen/bottom_sheet_icon_padding" app:iconTint="?attr/colorSecondary" app:layout_constraintBottom_toBottomOf="@+id/create_empty" @@ -50,13 +55,14 @@ <com.google.android.material.button.MaterialButton android:id="@+id/create_empty" - style="@style/Widget.MaterialComponents.Button.TextButton.Icon" + style="@style/Widget.Material3.Button.TextButton.Icon" android:layout_width="match_parent" android:layout_height="@dimen/bottom_sheet_item_height" android:layout_marginStart="@dimen/normal_margin" android:layout_marginLeft="@dimen/normal_margin" android:layout_marginEnd="@dimen/normal_margin" android:layout_marginRight="@dimen/normal_margin" + android:nextFocusUp="@id/create_from_qrcode" android:text="@string/create_empty" android:textAlignment="viewStart" android:textColor="?attr/colorOnSurface" diff --git a/ui/src/main/res/layout/app_list_dialog_fragment.xml b/ui/src/main/res/layout/app_list_dialog_fragment.xml index 4503de15..4000c64b 100644 --- a/ui/src/main/res/layout/app_list_dialog_fragment.xml +++ b/ui/src/main/res/layout/app_list_dialog_fragment.xml @@ -25,7 +25,7 @@ <com.google.android.material.tabs.TabLayout android:id="@+id/tabs" - style="@style/Widget.MaterialComponents.TabLayout.Colored" + style="@style/Widget.Material3.TabLayout.OnSurface" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/ui/src/main/res/layout/app_list_item.xml b/ui/src/main/res/layout/app_list_item.xml index e4e4483c..d6a4b715 100644 --- a/ui/src/main/res/layout/app_list_item.xml +++ b/ui/src/main/res/layout/app_list_item.xml @@ -39,7 +39,6 @@ <TextView android:id="@+id/app_name" - style="?android:attr/textAppearanceMedium" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="16dp" @@ -48,6 +47,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{key}" + android:textAppearance="?attr/textAppearanceBodyLarge" tools:text="@tools:sample/full_names" /> <CheckBox diff --git a/ui/src/main/res/layout/config_naming_dialog_fragment.xml b/ui/src/main/res/layout/config_naming_dialog_fragment.xml index a7017804..63d3141d 100644 --- a/ui/src/main/res/layout/config_naming_dialog_fragment.xml +++ b/ui/src/main/res/layout/config_naming_dialog_fragment.xml @@ -17,17 +17,20 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <EditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/tunnel_name_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/tunnel_name" + android:imeOptions="actionDone" android:inputType="textNoSuggestions|textVisiblePassword" - app:filter="@{NameInputFilter.newInstance()}" /> + app:filter="@{NameInputFilter.newInstance()}"> + + <requestFocus /> + </com.google.android.material.textfield.TextInputEditText> </com.google.android.material.textfield.TextInputLayout> </FrameLayout> - </layout> diff --git a/ui/src/main/res/layout/log_viewer_activity.xml b/ui/src/main/res/layout/log_viewer_activity.xml index b4451921..2a377a15 100644 --- a/ui/src/main/res/layout/log_viewer_activity.xml +++ b/ui/src/main/res/layout/log_viewer_activity.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?><!-- - ~ Copyright © 2020 WireGuard LLC. All Rights Reserved. + ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. ~ SPDX-License-Identifier: Apache-2.0 --> diff --git a/ui/src/main/res/layout/log_viewer_entry.xml b/ui/src/main/res/layout/log_viewer_entry.xml index 82a0d7a3..762d2ddf 100644 --- a/ui/src/main/res/layout/log_viewer_entry.xml +++ b/ui/src/main/res/layout/log_viewer_entry.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?><!-- - ~ Copyright © 2020 WireGuard LLC. All Rights Reserved. + ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. ~ SPDX-License-Identifier: Apache-2.0 --> @@ -12,20 +12,19 @@ <com.google.android.material.textview.MaterialTextView android:id="@+id/log_date" - style="@style/TextAppearance.MaterialComponents.Caption" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?android:attr/textColorPrimary" - android:textSize="10sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="Fri Mar 13 10:17:37 GMT+05:30 2020" /> <com.google.android.material.textview.MaterialTextView android:id="@+id/log_msg" - style="@style/TextAppearance.MaterialComponents.Caption" android:layout_width="match_parent" android:layout_height="wrap_content" + android:textAppearance="?attr/textAppearanceBodySmall" android:textColor="?android:attr/textColorPrimary" app:layout_constraintTop_toBottomOf="@id/log_date" tools:text="FATAL EXCEPTION: Thread-2" /> diff --git a/ui/src/main/res/layout/main_activity.xml b/ui/src/main/res/layout/main_activity.xml index 89be4fe4..a970d8e2 100644 --- a/ui/src/main/res/layout/main_activity.xml +++ b/ui/src/main/res/layout/main_activity.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/master_detail_wrapper" + android:id="@+id/main_activity_container" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml index 72c58e76..332df04a 100644 --- a/ui/src/main/res/layout/tunnel_detail_fragment.xml +++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml @@ -25,7 +25,7 @@ <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorBackground" + android:background="?attr/colorSurface" android:clickable="true" android:focusable="true"> @@ -50,10 +50,10 @@ <com.google.android.material.textview.MaterialTextView android:id="@+id/interface_title" - style="@style/SectionText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/interface_title" + android:textAppearance="?attr/textAppearanceTitleMedium" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -62,14 +62,16 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" + android:nextFocusDown="@id/interface_name_text" + android:nextFocusForward="@id/interface_name_text" app:checked="@{tunnel.state == State.UP}" - app:layout_constraintBaseline_toBaselineOf="@+id/interface_title" + app:layout_constraintBaseline_toBottomOf="@+id/interface_title" app:layout_constraintEnd_toEndOf="parent" app:onBeforeCheckedChanged="@{fragment::setTunnelState}" /> <TextView android:id="@+id/interface_name_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/interface_name_text" @@ -79,19 +81,22 @@ <TextView android:id="@+id/interface_name_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/name" + android:nextFocusUp="@id/tunnel_switch" + android:nextFocusDown="@id/public_key_text" + android:nextFocusForward="@id/public_key_text" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{tunnel.name}" + android:textAppearance="?attr/textAppearanceBodyLarge" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/interface_name_label" tools:text="wg0" /> <TextView android:id="@+id/public_key_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/public_key_text" @@ -101,22 +106,25 @@ <TextView android:id="@+id/public_key_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/public_key" android:ellipsize="end" android:maxLines="1" + android:nextFocusUp="@id/interface_name_text" + android:nextFocusDown="@id/addresses_text" + android:nextFocusForward="@id/addresses_text" android:onClick="@{ClipboardUtils::copyTextView}" android:singleLine="true" android:text="@{config.interface.keyPair.publicKey.toBase64}" + android:textAppearance="?attr/textAppearanceBodyLarge" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/public_key_label" tools:text="wOs2eguFEohqIZxlSJ1CAT9584tc6ejj9hfGFsoBVkA=" /> <TextView android:id="@+id/addresses_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/addresses_text" @@ -127,12 +135,15 @@ <TextView android:id="@+id/addresses_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/addresses" + android:nextFocusUp="@id/public_key_text" + android:nextFocusDown="@id/dns_servers_text" + android:nextFocusForward="@id/dns_servers_text" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{config.interface.addresses}" + android:textAppearance="?attr/textAppearanceBodyLarge" android:visibility="@{config.interface.addresses.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/addresses_label" @@ -140,7 +151,7 @@ <TextView android:id="@+id/dns_servers_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/dns_servers_text" @@ -151,39 +162,73 @@ <TextView android:id="@+id/dns_servers_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/dns_servers" + android:nextFocusUp="@id/addresses_text" + android:nextFocusDown="@id/dns_search_domains_text" + android:nextFocusForward="@id/dns_search_domains_text" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{config.interface.dnsServers}" + android:textAppearance="?attr/textAppearanceBodyLarge" android:visibility="@{config.interface.dnsServers.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/dns_servers_label" tools:text="8.8.8.8, 8.8.4.4" /> <TextView + android:id="@+id/dns_search_domains_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:labelFor="@+id/dns_search_domain_text" + android:text="@string/dns_search_domains" + android:visibility="@{config.interface.dnsSearchDomains.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/dns_servers_text" /> + + <TextView + android:id="@+id/dns_search_domains_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/dns_search_domains" + android:nextFocusUp="@id/dns_servers_text" + android:nextFocusDown="@id/listen_port_text" + android:nextFocusForward="@id/listen_port_text" + android:onClick="@{ClipboardUtils::copyTextView}" + android:text="@{config.interface.dnsSearchDomains}" + android:textAppearance="?attr/textAppearanceBodyLarge" + android:visibility="@{config.interface.dnsSearchDomains.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/dns_search_domains_label" + tools:text="zx2c4.com" /> + + <TextView android:id="@+id/listen_port_label" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/listen_port_text" android:text="@string/listen_port" - android:visibility="@{config.interface.listenPort.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + android:visibility="@{!config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintEnd_toStartOf="@id/mtu_label" app:layout_constraintHorizontal_weight="0.5" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/dns_servers_text" /> + app:layout_constraintTop_toBottomOf="@id/dns_search_domains_text" /> <TextView android:id="@+id/listen_port_text" - style="@style/DetailText" android:layout_width="0dp" android:layout_height="wrap_content" android:contentDescription="@string/listen_port" + android:nextFocusRight="@id/mtu_text" + android:nextFocusUp="@id/dns_search_domains_text" + android:nextFocusDown="@id/applications_text" + android:nextFocusForward="@id/mtu_text" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{config.interface.listenPort}" - android:visibility="@{config.interface.listenPort.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + android:textAppearance="?attr/textAppearanceBodyLarge" + android:visibility="@{!config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintEnd_toStartOf="@id/mtu_label" app:layout_constraintHorizontal_weight="0.5" app:layout_constraintStart_toStartOf="parent" @@ -197,22 +242,25 @@ android:layout_marginTop="8dp" android:labelFor="@+id/mtu_text" android:text="@string/mtu" - android:visibility="@{config.interface.mtu.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + android:visibility="@{!config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="0.5" app:layout_constraintLeft_toRightOf="@id/listen_port_label" app:layout_constraintStart_toEndOf="@id/listen_port_label" - app:layout_constraintTop_toBottomOf="@id/dns_servers_text" /> + app:layout_constraintTop_toBottomOf="@id/dns_search_domains_text" /> <TextView android:id="@+id/mtu_text" - style="@style/DetailText" android:layout_width="0dp" android:layout_height="wrap_content" android:contentDescription="@string/mtu" + android:nextFocusLeft="@id/listen_port_text" + android:nextFocusUp="@id/dns_servers_text" + android:nextFocusForward="@id/applications_text" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{config.interface.mtu}" - android:visibility="@{config.interface.mtu.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + android:textAppearance="?attr/textAppearanceBodyLarge" + android:visibility="@{!config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="0.5" app:layout_constraintStart_toEndOf="@id/listen_port_label" @@ -220,25 +268,35 @@ app:layout_constraintTop_toBottomOf="@+id/mtu_label" tools:text="1500" /> + <androidx.constraintlayout.widget.Barrier + android:id="@+id/listen_port_mtu_barrier" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:barrierDirection="bottom" + app:constraint_referenced_ids="listen_port_text,mtu_text" /> + <TextView android:id="@+id/applications_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/applications_text" android:text="@string/applications" android:visibility="@{config.interface.includedApplications.isEmpty() && config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/listen_port_text" /> + app:layout_constraintTop_toBottomOf="@+id/listen_port_mtu_barrier" /> <TextView android:id="@+id/applications_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/applications" + android:nextFocusUp="@id/mtu_text" + android:nextFocusDown="@id/peers_layout" + android:nextFocusForward="@id/peers_layout" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{config.interface.includedApplications.isEmpty() ? @plurals/n_excluded_applications(config.interface.excludedApplications.size(), config.interface.excludedApplications.size()) : @plurals/n_included_applications(config.interface.includedApplications.size(), config.interface.includedApplications.size())}" + android:textAppearance="?attr/textAppearanceBodyLarge" android:visibility="@{config.interface.includedApplications.isEmpty() && config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/applications_label" @@ -260,4 +318,4 @@ tools:ignore="UselessLeaf" /> </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView> -</layout> +</layout>
\ No newline at end of file diff --git a/ui/src/main/res/layout/tunnel_detail_peer.xml b/ui/src/main/res/layout/tunnel_detail_peer.xml index d0de329b..25081cea 100644 --- a/ui/src/main/res/layout/tunnel_detail_peer.xml +++ b/ui/src/main/res/layout/tunnel_detail_peer.xml @@ -23,16 +23,16 @@ <com.google.android.material.textview.MaterialTextView android:id="@+id/peer_title" - style="@style/SectionText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/peer" + android:textAppearance="?attr/textAppearanceTitleMedium" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <TextView android:id="@+id/public_key_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/public_key_text" @@ -42,48 +42,53 @@ <TextView android:id="@+id/public_key_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/public_key" android:ellipsize="end" android:maxLines="1" + android:nextFocusDown="@id/pre_shared_key_text" + android:nextFocusForward="@id/pre_shared_key_text" android:onClick="@{ClipboardUtils::copyTextView}" android:singleLine="true" android:text="@{item.publicKey.toBase64}" + android:textAppearance="?attr/textAppearanceBodyLarge" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/public_key_label" tools:text="wOs2eguFEohqIZxlSJ1CAT9584tc6ejj9hfGFsoBVkA=" /> <TextView android:id="@+id/pre_shared_key_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/pre_shared_key_text" android:text="@string/pre_shared_key" - android:visibility="@{item.preSharedKey.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + android:visibility="@{!item.preSharedKey.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/public_key_text" /> <TextView android:id="@+id/pre_shared_key_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/pre_shared_key" android:ellipsize="end" android:maxLines="1" + android:nextFocusUp="@id/public_key_text" + android:nextFocusDown="@id/allowed_ips_text" + android:nextFocusForward="@id/allowed_ips_text" android:singleLine="true" android:text="@string/pre_shared_key_enabled" - android:visibility="@{item.preSharedKey.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + android:textAppearance="?attr/textAppearanceBodyLarge" + android:visibility="@{!item.preSharedKey.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/pre_shared_key_label" tools:text="8VyS8W8XeMcBWfKp1GuG3/fZlnUQFkqMNbrdmZtVQIM=" /> <TextView android:id="@+id/allowed_ips_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/allowed_ips_text" @@ -94,12 +99,15 @@ <TextView android:id="@+id/allowed_ips_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/allowed_ips" + android:nextFocusUp="@id/pre_shared_key_text" + android:nextFocusDown="@id/endpoint_text" + android:nextFocusForward="@id/endpoint_text" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{item.allowedIps}" + android:textAppearance="?attr/textAppearanceBodyLarge" android:visibility="@{item.allowedIps.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/allowed_ips_label" @@ -107,57 +115,63 @@ <TextView android:id="@+id/endpoint_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/endpoint_text" android:text="@string/endpoint" - android:visibility="@{item.endpoint.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + android:visibility="@{!item.endpoint.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/allowed_ips_text" /> <TextView android:id="@+id/endpoint_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/endpoint" + android:nextFocusUp="@id/allowed_ips_text" + android:nextFocusDown="@id/persistent_keepalive_text" + android:nextFocusForward="@id/persistent_keepalive_text" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{item.endpoint}" - android:visibility="@{item.endpoint.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + android:textAppearance="?attr/textAppearanceBodyLarge" + android:visibility="@{!item.endpoint.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/endpoint_label" tools:text="192.168.0.1:51820" /> <TextView android:id="@+id/persistent_keepalive_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:labelFor="@+id/persistent_keepalive_text" android:text="@string/persistent_keepalive" - android:visibility="@{item.persistentKeepalive.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + android:visibility="@{!item.persistentKeepalive.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/endpoint_text" /> <TextView android:id="@+id/persistent_keepalive_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/persistent_keepalive" + android:nextFocusUp="@id/endpoint_text" + android:nextFocusDown="@id/transfer_text" + android:nextFocusForward="@id/transfer_text" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{@plurals/persistent_keepalive_seconds_unit(item.persistentKeepalive.orElse(0), item.persistentKeepalive.orElse(0))}" - android:visibility="@{item.persistentKeepalive.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" + android:textAppearance="?attr/textAppearanceBodyLarge" + android:visibility="@{!item.persistentKeepalive.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/persistent_keepalive_label" tools:text="every 3 seconds" /> <TextView android:id="@+id/transfer_label" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/endpoint_text" + android:layout_below="@+id/persistent_keepalive_text" android:layout_marginTop="8dp" android:labelFor="@+id/transfer_text" android:text="@string/transfer" @@ -168,17 +182,46 @@ <TextView android:id="@+id/transfer_text" - style="@style/DetailText" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/transfer_label" android:contentDescription="@string/transfer" + android:nextFocusUp="@id/persistent_keepalive_text" android:onClick="@{ClipboardUtils::copyTextView}" + android:textAppearance="?attr/textAppearanceBodyLarge" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/transfer_label" tools:text="1024 MB" tools:visibility="visible" /> + + <TextView + android:id="@+id/latest_handshake_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/transfer_text" + android:layout_marginTop="8dp" + android:labelFor="@+id/latest_handshake_text" + android:text="@string/latest_handshake" + android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/transfer_text" + tools:visibility="visible" /> + + <TextView + android:id="@+id/latest_handshake_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/latest_handshake_label" + android:contentDescription="@string/latest_handshake" + android:nextFocusUp="@id/transfer_text" + android:onClick="@{ClipboardUtils::copyTextView}" + android:textAppearance="?attr/textAppearanceBodyLarge" + android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/latest_handshake_label" + tools:text="4 minutes, 27 seconds ago" + tools:visibility="visible" /> </androidx.constraintlayout.widget.ConstraintLayout> </com.google.android.material.card.MaterialCardView> </layout> diff --git a/ui/src/main/res/layout/tunnel_editor_fragment.xml b/ui/src/main/res/layout/tunnel_editor_fragment.xml index dffc9d97..0350486b 100644 --- a/ui/src/main/res/layout/tunnel_editor_fragment.xml +++ b/ui/src/main/res/layout/tunnel_editor_fragment.xml @@ -28,7 +28,7 @@ android:id="@+id/main_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorBackground"> + android:background="?attr/colorSurface"> <ScrollView android:layout_width="match_parent" @@ -53,12 +53,12 @@ <com.google.android.material.textview.MaterialTextView android:id="@+id/interface_title" - style="@style/SectionText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" android:layout_marginTop="32dp" android:text="@string/interface_title" + android:textAppearance="?attr/textAppearanceTitleMedium" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -76,7 +76,10 @@ android:id="@+id/interface_name_text" android:layout_width="match_parent" android:layout_height="wrap_content" + android:imeOptions="actionNext" android:inputType="textNoSuggestions|textVisiblePassword" + android:nextFocusDown="@id/private_key_text" + android:nextFocusForward="@id/private_key_text" android:text="@={name}" app:filter="@{NameInputFilter.newInstance()}" /> </com.google.android.material.textfield.TextInputLayout> @@ -98,7 +101,11 @@ android:id="@+id/private_key_text" android:layout_width="match_parent" android:layout_height="wrap_content" + android:imeOptions="actionNext" android:inputType="textNoSuggestions|textPassword" + android:nextFocusUp="@id/interface_name_text" + android:nextFocusDown="@id/public_key_text" + android:nextFocusForward="@id/public_key_text" android:onClick="@{fragment::onKeyClick}" android:text="@={config.interface.privateKey}" app:filter="@{KeyInputFilter.newInstance()}" @@ -111,11 +118,12 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/public_key" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/private_key_text_layout"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/public_key_text" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -123,6 +131,10 @@ android:ellipsize="end" android:focusable="false" android:hint="@string/hint_generated" + android:imeOptions="actionNext" + android:nextFocusUp="@id/private_key_text" + android:nextFocusDown="@id/addresses_label_text" + android:nextFocusForward="@id/addresses_label_text" android:onClick="@{ClipboardUtils::copyTextView}" android:singleLine="true" android:text="@{config.interface.publicKey}" /> @@ -144,7 +156,11 @@ android:id="@+id/addresses_label_text" android:layout_width="match_parent" android:layout_height="wrap_content" + android:imeOptions="actionNext" android:inputType="textNoSuggestions|textVisiblePassword" + android:nextFocusUp="@id/public_key_text" + android:nextFocusDown="@id/dns_servers_text" + android:nextFocusForward="@id/listen_port_text" android:text="@={config.interface.addresses}" /> </com.google.android.material.textfield.TextInputLayout> @@ -154,16 +170,22 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/listen_port" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="0.3" app:layout_constraintStart_toEndOf="@id/addresses_label_layout" app:layout_constraintTop_toBottomOf="@id/public_key_label_layout"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/listen_port_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hint_random" + android:imeOptions="actionNext" android:inputType="number" + android:nextFocusUp="@id/public_key_text" + android:nextFocusDown="@id/mtu_text" + android:nextFocusForward="@id/dns_servers_text" android:text="@={config.interface.listenPort}" android:textAlignment="center" /> </com.google.android.material.textfield.TextInputLayout> @@ -185,7 +207,11 @@ android:id="@+id/dns_servers_text" android:layout_width="match_parent" android:layout_height="wrap_content" + android:imeOptions="actionNext" android:inputType="textNoSuggestions|textVisiblePassword" + android:nextFocusUp="@id/addresses_label_text" + android:nextFocusDown="@id/set_excluded_applications" + android:nextFocusForward="@id/mtu_text" android:text="@={config.interface.dnsServers}" /> </com.google.android.material.textfield.TextInputLayout> @@ -195,27 +221,35 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/mtu" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="0.3" app:layout_constraintStart_toEndOf="@id/dns_servers_label_layout" app:layout_constraintTop_toBottomOf="@id/addresses_label_layout"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/mtu_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hint_automatic" + android:imeOptions="actionDone" android:inputType="number" + android:nextFocusUp="@id/listen_port_text" + android:nextFocusDown="@id/set_excluded_applications" + android:nextFocusForward="@id/set_excluded_applications" android:text="@={config.interface.mtu}" android:textAlignment="center" /> </com.google.android.material.textfield.TextInputLayout> <com.google.android.material.button.MaterialButton android:id="@+id/set_excluded_applications" - style="@style/Widget.MaterialComponents.Button.TextButton" + style="@style/Widget.Material3.Button.TextButton" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" + android:nextFocusUp="@id/dns_servers_text" + android:nextFocusDown="@id/peers_layout" + android:nextFocusForward="@id/peers_layout" android:onClick="@{fragment::onRequestSetExcludedIncludedApplications}" android:text="@{config.interface.includedApplications.size > 0 ? @plurals/set_included_applications(config.interface.includedApplications.size, config.interface.includedApplications.size) : config.interface.excludedApplications.size > 0 ? @plurals/set_excluded_applications(config.interface.excludedApplications.size, config.interface.excludedApplications.size) : @string/all_applications}" android:textColor="?attr/colorSecondary" @@ -223,11 +257,13 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/mtu_label_layout" - app:rippleColor="?attr/colorSecondary" /> + app:rippleColor="?attr/colorSecondary" + tools:text="4 excluded applications" /> </androidx.constraintlayout.widget.ConstraintLayout> </com.google.android.material.card.MaterialCardView> <LinearLayout + android:id="@+id/peers_layout" android:layout_width="match_parent" android:layout_height="wrap_content" android:divider="@null" @@ -238,7 +274,8 @@ tools:ignore="UselessLeaf" /> <com.google.android.material.button.MaterialButton - style="@style/Widget.MaterialComponents.Button.TextButton" + android:id="@+id/add_peer_button" + style="@style/Widget.Material3.Button.TextButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" diff --git a/ui/src/main/res/layout/tunnel_editor_peer.xml b/ui/src/main/res/layout/tunnel_editor_peer.xml index 88c9044b..305fa927 100644 --- a/ui/src/main/res/layout/tunnel_editor_peer.xml +++ b/ui/src/main/res/layout/tunnel_editor_peer.xml @@ -37,11 +37,11 @@ <com.google.android.material.textview.MaterialTextView android:id="@+id/peer_title" - style="@style/SectionText" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="8dp" android:text="@string/peer" + android:textAppearance="?attr/textAppearanceTitleMedium" app:layout_constraintBottom_toTopOf="@+id/public_key_label_layout" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -51,6 +51,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:background="@null" + android:nextFocusDown="@id/public_key_text" + android:nextFocusForward="@id/public_key_text" android:onClick="@{() -> item.unbind()}" android:padding="8dp" android:src="@drawable/ic_action_delete" @@ -73,7 +75,11 @@ android:id="@+id/public_key_text" android:layout_width="match_parent" android:layout_height="wrap_content" + android:imeOptions="actionNext" android:inputType="textNoSuggestions|textVisiblePassword" + android:nextFocusUp="@id/delete" + android:nextFocusDown="@id/pre_shared_key_text" + android:nextFocusForward="@id/pre_shared_key_text" android:text="@={item.publicKey}" app:filter="@{KeyInputFilter.newInstance()}" /> </com.google.android.material.textfield.TextInputLayout> @@ -84,16 +90,21 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/pre_shared_key" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/public_key_label_layout"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/pre_shared_key_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hint_optional" + android:imeOptions="actionNext" android:inputType="textNoSuggestions|textPassword" + android:nextFocusUp="@id/public_key_text" + android:nextFocusDown="@id/persistent_keepalive_text" + android:nextFocusForward="@id/persistent_keepalive_text" android:onClick="@{fragment::onKeyClick}" android:text="@={item.preSharedKey}" app:filter="@{KeyInputFilter.newInstance()}" @@ -106,18 +117,23 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/persistent_keepalive" - app:suffixText="@{@plurals/persistent_keepalive_seconds_suffix(BindingAdapters.tryParseInt(item.persistentKeepalive))}" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/pre_shared_key_label_layout"> + app:layout_constraintTop_toBottomOf="@id/pre_shared_key_label_layout" + app:suffixText="@{@plurals/persistent_keepalive_seconds_suffix(BindingAdapters.tryParseInt(item.persistentKeepalive))}"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/persistent_keepalive_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hint_optional_discouraged" + android:imeOptions="actionNext" android:inputType="number" - android:text="@={item.persistentKeepalive}"/> + android:nextFocusUp="@id/persistent_keepalive_text" + android:nextFocusDown="@id/endpoint_text" + android:nextFocusForward="@id/endpoint_text" + android:text="@={item.persistentKeepalive}" /> </com.google.android.material.textfield.TextInputLayout> <com.google.android.material.textfield.TextInputLayout @@ -134,7 +150,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentStart="true" + android:imeOptions="actionNext" android:inputType="textNoSuggestions|textVisiblePassword" + android:nextFocusUp="@id/persistent_keepalive_text" + android:nextFocusDown="@id/allowed_ips_text" + android:nextFocusForward="@id/allowed_ips_text" android:text="@={item.endpoint}" /> </com.google.android.material.textfield.TextInputLayout> @@ -153,7 +173,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentStart="true" + android:imeOptions="actionDone" android:inputType="textNoSuggestions|textVisiblePassword" + android:nextFocusUp="@id/endpoint_text" + android:nextFocusDown="@id/selected_checkbox" + android:nextFocusForward="@id/selected_checkbox" android:text="@={item.allowedIps}" /> </com.google.android.material.textfield.TextInputLayout> @@ -164,6 +188,8 @@ android:layout_marginStart="4dp" android:layout_marginTop="0dp" android:checked="@={item.excludingPrivateIps}" + android:nextFocusDown="@id/add_peer_button" + android:nextFocusForward="@id/add_peer_button" android:text="@string/exclude_private_ips" android:visibility="@{item.ableToExcludePrivateIps ? View.VISIBLE : View.GONE}" app:layout_constraintEnd_toEndOf="parent" diff --git a/ui/src/main/res/layout/tunnel_list_fragment.xml b/ui/src/main/res/layout/tunnel_list_fragment.xml index 277ecd01..2ee2ff38 100644 --- a/ui/src/main/res/layout/tunnel_list_fragment.xml +++ b/ui/src/main/res/layout/tunnel_list_fragment.xml @@ -24,15 +24,16 @@ android:id="@+id/main_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorBackground" + android:background="?attr/colorSurface" android:clipChildren="false"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/tunnel_list" android:layout_width="match_parent" android:layout_height="match_parent" - android:choiceMode="multipleChoiceModal" android:clipToPadding="false" + android:nextFocusDown="@id/create_fab" + android:nextFocusForward="@id/create_fab" android:paddingBottom="@{@dimen/design_fab_size_normal * 1.1f}" android:visibility="@{tunnels.size() > 0 ? android.view.View.VISIBLE : android.view.View.GONE}" app:configurationHandler="@{rowConfigurationHandler}" @@ -62,6 +63,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" + android:layout_marginStart="@dimen/tunnel_list_placeholder_margin" + android:layout_marginEnd="@dimen/tunnel_list_placeholder_margin" android:text="@string/tunnel_list_placeholder" android:textSize="20sp" /> </LinearLayout> @@ -72,6 +75,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" + android:nextFocusUp="@id/tunnel_list" app:srcCompat="@drawable/ic_action_add_white" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/ui/src/main/res/layout/tunnel_list_item.xml b/ui/src/main/res/layout/tunnel_list_item.xml index 9c9517a7..3d5b02d1 100644 --- a/ui/src/main/res/layout/tunnel_list_item.xml +++ b/ui/src/main/res/layout/tunnel_list_item.xml @@ -34,26 +34,27 @@ android:descendantFocusability="beforeDescendants" android:focusable="true" android:nextFocusRight="@+id/tunnel_switch" - android:padding="16dp"> + android:paddingHorizontal="16dp" + android:paddingVertical="8dp"> <TextView android:id="@+id/tunnel_name" - style="?android:attr/textAppearanceMedium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentStart="true" - android:layout_alignParentTop="true" + android:layout_centerVertical="true" android:ellipsize="end" android:maxLines="1" android:text="@{key}" + android:textAppearance="?attr/textAppearanceBodyLarge" tools:text="@sample/interface_names.json/names/names/name" /> <com.wireguard.android.widget.ToggleSwitch android:id="@+id/tunnel_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/tunnel_name" android:layout_alignParentEnd="true" + android:layout_centerVertical="true" android:nextFocusLeft="@+id/tunnel_list_item" app:checked="@{item.state == State.UP}" app:onBeforeCheckedChanged="@{fragment::setTunnelState}" diff --git a/ui/src/main/res/layout/tv_activity.xml b/ui/src/main/res/layout/tv_activity.xml new file mode 100644 index 00000000..cfa1f6ba --- /dev/null +++ b/ui/src/main/res/layout/tv_activity.xml @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> + + <data> + + <import type="android.view.View" /> + + <import type="com.wireguard.android.model.ObservableTunnel" /> + + <import type="com.wireguard.android.activity.TvMainActivity.KeyedFile" /> + + <variable + name="isDeleting" + type="androidx.databinding.ObservableBoolean" /> + + <variable + name="files" + type="com.wireguard.android.databinding.ObservableKeyedArrayList<String, KeyedFile>" /> + + <variable + name="filesRoot" + type="androidx.databinding.ObservableField<String>" /> + + <variable + name="tunnels" + type="com.wireguard.android.databinding.ObservableKeyedArrayList<String, ObservableTunnel>" /> + + <variable + name="tunnelRowConfigurationHandler" + type="com.wireguard.android.databinding.ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler" /> + + <variable + name="filesRowConfigurationHandler" + type="com.wireguard.android.databinding.ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler" /> + </data> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.card.MaterialCardView + android:id="@+id/banner_logo" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginStart="5dp" + android:layout_marginTop="5dp" + app:cardElevation="2dp" + app:contentPadding="0dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <ImageView + android:layout_width="320dp" + android:layout_height="67dp" + android:contentDescription="@string/app_name" + android:scaleType="fitXY" + app:srcCompat="@drawable/tv_logo_banner" /> + + </com.google.android.material.card.MaterialCardView> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/tunnel_list" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_marginTop="16dp" + android:orientation="horizontal" + android:visibility="@{(tunnels.isEmpty || !filesRoot.isEmpty) ? View.GONE : View.VISIBLE}" + app:configurationHandler="@{tunnelRowConfigurationHandler}" + app:items="@{tunnels}" + app:layout="@{@layout/tv_tunnel_list_item}" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:layout_constraintBottom_toTopOf="@id/delete_button" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/banner_logo" + app:spanCount="3" + tools:itemCount="10" + tools:listitem="@layout/tv_tunnel_list_item" /> + + <TextView + android:id="@+id/files_root_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginStart="8dp" + android:text="@{filesRoot}" + android:textAppearance="?attr/textAppearanceTitleLarge" + android:visibility="@{filesRoot.isEmpty ? View.GONE : View.VISIBLE}" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/banner_logo" + tools:visibility="gone" /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/files_list" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_marginTop="16dp" + android:orientation="horizontal" + android:visibility="@{filesRoot.isEmpty ? View.GONE : View.VISIBLE}" + app:configurationHandler="@{filesRowConfigurationHandler}" + app:items="@{files}" + app:layout="@{@layout/tv_file_list_item}" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:layout_constraintBottom_toTopOf="@id/import_button" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/files_root_label" + app:spanCount="5" + tools:itemCount="10" + tools:listitem="@layout/tv_file_list_item" + tools:visibility="gone" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:text="@string/tv_add_tunnel_get_started" + android:textAppearance="?attr/textAppearanceHeadlineSmall" + android:visibility="@{(filesRoot.isEmpty && tunnels.isEmpty) ? View.VISIBLE : View.GONE}" + app:layout_constraintBottom_toTopOf="@id/delete_button" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/banner_logo" + tools:visibility="gone" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/import_button" + style="@style/Widget.Material3.Button.IconButton.Filled.Tonal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:minWidth="0dp" + android:visibility="@{isDeleting ? View.GONE : View.VISIBLE}" + app:icon="@{filesRoot.isEmpty ? @drawable/ic_action_add_white : @drawable/ic_arrow_back}" + app:iconPadding="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/delete_button" + style="@style/Widget.Material3.Button.IconButton.Filled.Tonal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:minWidth="0dp" + android:visibility="@{((tunnels.isEmpty && !isDeleting) || !filesRoot.isEmpty) ? View.GONE : View.VISIBLE}" + app:icon="@{isDeleting ? @drawable/ic_arrow_back : @drawable/ic_action_delete}" + app:iconPadding="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + </androidx.constraintlayout.widget.ConstraintLayout> +</layout> diff --git a/ui/src/main/res/layout/tv_file_list_item.xml b/ui/src/main/res/layout/tv_file_list_item.xml new file mode 100644 index 00000000..d5afa0a4 --- /dev/null +++ b/ui/src/main/res/layout/tv_file_list_item.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <data> + + <import type="com.wireguard.android.activity.TvMainActivity.KeyedFile" /> + + <variable + name="key" + type="String" /> + + <variable + name="item" + type="KeyedFile" /> + </data> + + <com.google.android.material.card.MaterialCardView + android:layout_width="320dp" + android:layout_height="50dp" + android:layout_margin="8dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="0dp" + android:checkable="true" + android:focusable="true" + app:contentPadding="8dp"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.textview.MaterialTextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@{key}" + android:textAppearance="?attr/textAppearanceTitleLarge" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + + </com.google.android.material.card.MaterialCardView> + +</layout> diff --git a/ui/src/main/res/layout/tv_tunnel_list_item.xml b/ui/src/main/res/layout/tv_tunnel_list_item.xml new file mode 100644 index 00000000..2d6039f1 --- /dev/null +++ b/ui/src/main/res/layout/tv_tunnel_list_item.xml @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> + + <data> + + <import type="android.view.View" /> + + <import type="com.wireguard.android.model.ObservableTunnel" /> + + <import type="com.wireguard.android.backend.Tunnel.State" /> + + <variable + name="isDeleting" + type="androidx.databinding.ObservableBoolean" /> + + <variable + name="isFocused" + type="androidx.databinding.ObservableBoolean" /> + + <variable + name="key" + type="String" /> + + <variable + name="item" + type="com.wireguard.android.model.ObservableTunnel" /> + </data> + + <com.wireguard.android.widget.TvCardView + android:layout_width="225dp" + android:layout_height="110dp" + android:layout_margin="8dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="0dp" + android:backgroundTint="@color/tv_list_item_tint" + android:checkable="true" + android:focusable="true" + app:contentPadding="8dp" + app:isDeleting="@{isDeleting}" + app:isUp="@{item.state == State.UP}"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.textview.MaterialTextView + android:id="@+id/tunnel_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@{item.name}" + android:textAppearance="?attr/textAppearanceTitleLarge" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="@sample/interface_names.json/names/names/name" /> + + <com.google.android.material.textview.MaterialTextView + android:id="@+id/tunnel_transfer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?attr/textAppearanceBodyLarge" + android:visibility="@{isDeleting ? View.GONE : View.VISIBLE}" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + tools:text="rx: 200 MB, tx: 100 MB" /> + + <com.google.android.material.textview.MaterialTextView + android:id="@+id/tunnel_delete" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/tv_delete" + android:visibility="@{(isDeleting && isFocused) ? View.VISIBLE : View.GONE}" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + tools:visibility="gone" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + + </com.wireguard.android.widget.TvCardView> + +</layout> diff --git a/ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index a8a8fa55..5c84730c 100644 --- a/ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -2,4 +2,5 @@ <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@color/ic_launcher_background" /> <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <monochrome android:drawable="@drawable/ic_launcher_foreground" /> </adaptive-icon> diff --git a/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index a8a8fa55..5c84730c 100644 --- a/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/ui/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -2,4 +2,5 @@ <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@color/ic_launcher_background" /> <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <monochrome android:drawable="@drawable/ic_launcher_foreground" /> </adaptive-icon> diff --git a/ui/src/main/res/mipmap-tvdpi/banner.png b/ui/src/main/res/mipmap-tvdpi/banner.png Binary files differdeleted file mode 100644 index d7764594..00000000 --- a/ui/src/main/res/mipmap-tvdpi/banner.png +++ /dev/null diff --git a/ui/src/main/res/mipmap-xhdpi/banner.png b/ui/src/main/res/mipmap-xhdpi/banner.png Binary files differnew file mode 100644 index 00000000..2cceb821 --- /dev/null +++ b/ui/src/main/res/mipmap-xhdpi/banner.png diff --git a/ui/src/main/res/resources.properties b/ui/src/main/res/resources.properties new file mode 100644 index 00000000..467b3efe --- /dev/null +++ b/ui/src/main/res/resources.properties @@ -0,0 +1 @@ +unqualifiedResLocale=en-US diff --git a/ui/src/main/res/values-ar-rSA/strings.xml b/ui/src/main/res/values-ar-rSA/strings.xml new file mode 100644 index 00000000..73f6111a --- /dev/null +++ b/ui/src/main/res/values-ar-rSA/strings.xml @@ -0,0 +1,311 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="zero">غير قادر على حذف %d النفق: %s</item> + <item quantity="one">غير قادر على حذف %d النفق: %s</item> + <item quantity="two">غير قادر على حذف %d النفق: %s</item> + <item quantity="few">غير قادر على حذف %d أنفاق: %s</item> + <item quantity="many">غير قادر على حذف %d أنفاق: %s</item> + <item quantity="other">غير قادر على حذف %d أنفاق: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="zero">تم حذف %d من الأنفاق بنجاح</item> + <item quantity="one">تم حذف %d من الأنفاق بنجاح</item> + <item quantity="two">تم حذف %d من الأنفاق بنجاح</item> + <item quantity="few">تم حذف %d من الأنفاق بنجاح</item> + <item quantity="many">تم حذف %d من الأنفاق بنجاح</item> + <item quantity="other">تم حذف %d من الأنفاق بنجاح</item> + </plurals> + <plurals name="delete_title"> + <item quantity="zero">تم تحديد %d من الأنفاق</item> + <item quantity="one">تم تحديد %d من الأنفاق</item> + <item quantity="two">تم تحديد %d من الأنفاق</item> + <item quantity="few">تم تحديد %d من الأنفاق</item> + <item quantity="many">تم تحديد %d من الأنفاق</item> + <item quantity="other">تم تحديد %d من الأنفاق</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="zero">تم استيراد %1$d من %2$d من الأنفاق</item> + <item quantity="one">تم استيراد %1$d من %2$d من الأنفاق</item> + <item quantity="two">تم استيراد %1$d من %2$d من الأنفاق</item> + <item quantity="few">تم استيراد %1$d من %2$d من الأنفاق</item> + <item quantity="many">تم استيراد %1$d من %2$d من الأنفاق</item> + <item quantity="other">تم استيراد %1$d من %2$d من الأنفاق</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="zero">تم استيراد %d نفق</item> + <item quantity="one">تم استيراد %d نفق</item> + <item quantity="two">تم استيراد نفقين</item> + <item quantity="few">تم استيراد %d أنفاق</item> + <item quantity="many">تم استيراد %d أنفاق</item> + <item quantity="other">تم استيراد %d أنفاق</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="zero">%d تطبيقات مستبعدة</item> + <item quantity="one">%d تطبيق مستبعد</item> + <item quantity="two">تطبيقين مستبعدين</item> + <item quantity="few">%d تطبيقات مستبعدة</item> + <item quantity="many">%d تطبيقات مستبعدة</item> + <item quantity="other">%d تطبيقات مستبعدة</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="zero">%d تطبيق مضمن</item> + <item quantity="one">%d تطبيق مضمن</item> + <item quantity="two">تطبيقين مضمننين</item> + <item quantity="few">%d تطبيقات مضمنة</item> + <item quantity="many">%d تطبيقات مضمنة</item> + <item quantity="other">%d تطبيقات مضمنة</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="zero">تم استبعاد %d</item> + <item quantity="one">تم استبعاد %d</item> + <item quantity="two">تم استبعاد %d</item> + <item quantity="few">تم استبعاد %d</item> + <item quantity="many">تم استبعاد %d</item> + <item quantity="other">تم استبعاد %d</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="zero">تم تضمين %d</item> + <item quantity="one">تم تضمين %d</item> + <item quantity="two">تم تضمين %d</item> + <item quantity="few">تم تضمين %d</item> + <item quantity="many">تم تضمين %d</item> + <item quantity="other">تم تضمين %d</item> + </plurals> + <string name="all_applications">جميع التطبيقات</string> + <string name="exclude_from_tunnel">استبعاد</string> + <string name="include_in_tunnel">تضمين فقط</string> + <plurals name="include_n_applications"> + <item quantity="zero">تضمين %d من التطبيقات</item> + <item quantity="one">تضمين تطبيق %d</item> + <item quantity="two">تضمين %d من التطبيقات</item> + <item quantity="few">تضمين %d من التطبيقات</item> + <item quantity="many">تضمين %d من التطبيقات</item> + <item quantity="other">تضمين %d من التطبيقات</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="zero">استبعاد %d تطبيقات</item> + <item quantity="one">استبعاد %d تطبيقات</item> + <item quantity="two">استبعاد طبيقين</item> + <item quantity="few">استبعاد %d تطبيقات</item> + <item quantity="many">استبعاد %d تطبيقات</item> + <item quantity="other">استبعاد %d تطبيقات</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="zero">كل %d ثانية</item> + <item quantity="one">كل ثانية</item> + <item quantity="two">كل ثانيتين</item> + <item quantity="few">كل %d ثوانٍ</item> + <item quantity="many">كل %d ثوانٍ</item> + <item quantity="other">كل %d ثوانٍ</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="zero">لا ثانية</item> + <item quantity="one">ثانية</item> + <item quantity="two">ثنيتين</item> + <item quantity="few">ثواني</item> + <item quantity="many">ثواني</item> + <item quantity="other">ثوان</item> + </plurals> + <string name="use_all_applications">استخدام جميع التطبيقات</string> + <string name="add_peer">إضافة ند</string> + <string name="addresses">العناوين</string> + <string name="applications">التطبيقات</string> + <string name="allow_remote_control_intents_summary_off">لا يمكن للتطبيقات الخارجية تبدل الأنفاق (مستحسن)</string> + <string name="allow_remote_control_intents_summary_on">يمكن للتطبيقات الخارجية تبدل الأنفاق (مستحسن)</string> + <string name="allow_remote_control_intents_title">السماح بتطبيقات التحكم عن بعد</string> + <string name="allowed_ips">عناوين بروتوكول الإنترنت (IP) المسموح بها</string> + <string name="bad_config_context">%2$s الخاص بـ %1$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s في %2$s</string> + <string name="bad_config_explanation_pka">: يجب أن يكون موجباً و ألا يتجاوز 65535</string> + <string name="bad_config_explanation_positive_number">يجب أن يكون إيجابياً</string> + <string name="bad_config_explanation_udp_port">: يجب أن يكون رقم منفذ حزم بيانات المستخدم (UDP) صالح</string> + <string name="bad_config_reason_invalid_key">مفتاح غير صالح</string> + <string name="bad_config_reason_invalid_number">رَقَم غير صالح</string> + <string name="bad_config_reason_invalid_value">قيمة غير صالحة</string> + <string name="bad_config_reason_missing_attribute">سمة مفقودة</string> + <string name="bad_config_reason_missing_section">قسم مفقود</string> + <string name="bad_config_reason_syntax_error">خطأ في التركيب</string> + <string name="bad_config_reason_unknown_attribute">سمة مجهولة</string> + <string name="bad_config_reason_unknown_section">قسم مجهول</string> + <string name="bad_config_reason_value_out_of_range">قيمة خارج النطاق</string> + <string name="bad_extension_error">يجب أن يكون تنسيق الملف .conf أو .zip</string> + <string name="error_no_qr_found">لم يتم العثور على رمز الاستجابة السريعة (QR) في الصورة</string> + <string name="error_qr_checksum">فشل التحقق من مجموعة رمز الاستجابة السريعة (QR)</string> + <string name="cancel">إلغاء</string> + <string name="config_delete_error">لا يمكن حذف ملف التكوين %s</string> + <string name="config_exists_error">التكوين لـ \"%s\" موجود بالفعل</string> + <string name="config_file_exists_error">ملفّ التكوين لـ \"%s\" موجود بالفعل</string> + <string name="config_not_found_error">ملف التكوين “%s” غير موجود</string> + <string name="config_rename_error">لا يمكن إعادة تسمية ملف التكوين \"%s\"</string> + <string name="config_save_error">لا يمكن حفظ التكوين لـ \"%1$s\": %2$s</string> + <string name="config_save_success">تم حفظ التكوين ل \"%s\" بنجاح</string> + <string name="create_activity_title">إنشاء نفق وايرجارد</string> + <string name="create_bin_dir_error">لا يمكن إنشاء الدليل الثنائي المحلي</string> + <string name="create_downloads_file_error">لا يمكن إنشاء ملف في دليل التنزيلات</string> + <string name="create_empty">الإنشاء من الصفر</string> + <string name="create_from_file">استيراد من ملف أو أرشيف</string> + <string name="create_from_qr_code">مسح من رمز الاستجابة السريعة (QR)</string> + <string name="create_output_dir_error">لا يمكن إنشاء دليل الإخراج</string> + <string name="create_temp_dir_error">لا يمكن إنشاء دليل مؤقت محلي</string> + <string name="create_tunnel">إنشاء نفق</string> + <string name="copied_to_clipboard">%s نسخ إلى الحافظة</string> + <string name="dark_theme_summary_off">المظهر الفاتح مستخدم حالياً</string> + <string name="dark_theme_summary_on">المظهر الغامق مستخدم حالياً</string> + <string name="dark_theme_title">إستخدام المظهر الغامق</string> + <string name="delete">حذف</string> + <string name="tv_delete">اختر نفقاً لحذفه</string> + <string name="tv_select_a_storage_drive">تحديد محرك تخزين</string> + <string name="tv_no_file_picker">الرجاء تثبيت مدير ملفات لتتمكن من تصفح الملفات</string> + <string name="tv_add_tunnel_get_started">أضف نفقاً لتبدأ</string> + <string name="donate_title">♥️ تبرع لمشروع وايرجارد</string> + <string name="donate_summary">كل مساهمة تساعد</string> + <string name="donate_google_play_disappointment">شكرًا لك على دعم مشروع\n\nWireGuard! للأسف، نظرًا لسياسات Google، لا يُسمح لنا بالارتباط بجزء من صفحة الويب الخاصة بالمشروع حيث يمكنك التبرع. نأمل أن تتمكن من معرفة ذلك!\n\nشكرًا مرة أخرى على مساهمتك.</string> + <string name="disable_config_export_title">تعطيل تصدير التكوين</string> + <string name="disable_config_export_description">تعطيل تصدير الإعدادات يجعل المفاتيح الخاصة غير متاحة</string> + <string name="dns_servers">خوادم DNS</string> + <string name="dns_search_domains">البحث عن النطاقات</string> + <string name="edit">تعديل</string> + <string name="endpoint">نقطة نهاية</string> + <string name="error_down">خطأ في فصل النفق:%s</string> + <string name="error_fetching_apps">خطأ في جلب قائمة التطبيقات: %s</string> + <string name="error_root">الرجاء الحصول على صلاحيات الروت وحاول مرة أخرى</string> + <string name="error_prepare">خطأ في تحضير النفق: %s</string> + <string name="error_up">خطأ خلال إنشاء النفق: %s</string> + <string name="exclude_private_ips">استبعاد عناوين بروتوكول الإنترنت (IP) الخاصة</string> + <string name="generate_new_private_key">توليد مفتاح خاص جديد</string> + <string name="generic_error">خطأ \"%s\" غير معروف</string> + <string name="hint_automatic">(تلقائي)</string> + <string name="hint_generated">(توليد)</string> + <string name="hint_optional">(إختياري)</string> + <string name="hint_optional_discouraged">(اختياري، غير مستحسن)</string> + <string name="hint_random">(عشوائي)</string> + <string name="illegal_filename_error">اسم الملف غير مسموح به \"%s\"</string> + <string name="import_error">غير قادر على استيراد النفق: %s</string> + <string name="import_from_qr_code">استيراد نفق من رمز الاستجابة السريعة (QR)</string> + <string name="import_success">تم استيراد \"%s\"</string> + <string name="interface_title">الواجهة</string> + <string name="key_contents_error">أحرف سيئة في المفتاح</string> + <string name="key_length_error">طول المفتاح غير صحيح</string> + <string name="key_length_explanation_base64">: مفاتيح وايرجارد في الأساس 64 (base64) يجب أن تكون 44 حرفاً (32 بايت)</string> + <string name="key_length_explanation_binary">: مفاتيح وايرجارد يجب أن تكون 32 بايت</string> + <string name="key_length_explanation_hex">: مفاتيح وايرجارد في نظام عد ستة عشري (hexadecimal) يجب أن تكون 64 حرفاً (32 بايت)</string> + <string name="latest_handshake">أحدث مصافحة</string> + <string name="latest_handshake_ago">منذ %s</string> + <string name="listen_port">منفذ الاستماع</string> + <string name="log_export_error">غير قادر على تصدير السجل: %s</string> + <string name="log_export_subject">ملف سجل اندرويد وايرجارد</string> + <string name="log_export_success">تم الحفظ في \"%s\"</string> + <string name="log_export_title">تصدير ملف السجل</string> + <string name="log_saver_activity_label">حفظ السجل</string> + <string name="log_viewer_pref_summary">قد تساعد السجلات في تصحيح الأخطاء</string> + <string name="log_viewer_pref_title">عرض سجل التطبيق</string> + <string name="log_viewer_title">سجل</string> + <string name="logcat_error">غير قادر على تشغيل logcat: </string> + <string name="module_enabler_disabled_summary">يمكن لوحدة النواة التجريبية أن تحسن الأداء</string> + <string name="module_enabler_disabled_title">تمكين خلفية وحدة النواة</string> + <string name="module_enabler_enabled_summary">خلفية مساحة المستخدم البطيئة قد تحسن الاستقرار</string> + <string name="module_enabler_enabled_title">تعطيل خلفية وحدة النواة</string> + <string name="module_installer_error">حدث خطأ ما. يرجى المحاولة مرة أخرى</string> + <string name="module_installer_initial">يمكن لوحدة النواة التجريبية أن تحسن الأداء</string> + <string name="module_installer_not_found">لا توجد وحدات متوفرة لجهازك</string> + <string name="module_installer_title">تحميل وتثبيت الوحدة للنواة (Kernel Module)</string> + <string name="module_installer_working">جارٍ التنزيل والتثبيت…</string> + <string name="module_version_error">غير قادر على تحديد إصدار وحدة النواة</string> + <string name="mtu">وحدة النقل العظمى (MTU)</string> + <string name="multiple_tunnels_summary_off">سيؤدي تشغيل نفق واحد إلى إيقاف تشغيل الأنفاق الأخرى</string> + <string name="multiple_tunnels_summary_on">يمكن تشغيل أنفاق متعددة في نفس الوقت</string> + <string name="multiple_tunnels_title">السماح بأنفاق متعددة متزامنة</string> + <string name="name">إسم</string> + <string name="no_config_error">محاولة جلب نفق بدون تكوين</string> + <string name="no_configs_error">لم يتم العثور على تكوينات</string> + <string name="no_tunnels_error">لا توجد أنفاق</string> + <string name="parse_error_generic">سلسلة</string> + <string name="parse_error_inet_address">عنوان بروتوكول الإنترنت (IP)</string> + <string name="parse_error_inet_endpoint">نقطة نهاية</string> + <string name="parse_error_inet_network">شبكة بروتوكول الإنترنت (IP)</string> + <string name="parse_error_integer">رقم</string> + <string name="parse_error_reason">لا يمكن تحليل %1$s \"%2$s\"</string> + <string name="peer">ند</string> + <string name="permission_description">التحكم في أنفاق WireGuard، وتمكين الأنفاق وتعطيلها حسب الرغبة، مما قد يؤدي إلى تضليل حركة مرور الإنترنت</string> + <string name="permission_label">التحكم في أنفاق وايرجارد</string> + <string name="persistent_keepalive">الحفاظ المستمر</string> + <string name="pre_shared_key">مفتاح مسبق التشارك (Pre-shared key)</string> + <string name="pre_shared_key_enabled">مفعّل</string> + <string name="private_key">مفتاح خاص</string> + <string name="public_key">مفتاح عام</string> + <string name="qr_code_hint">نصيحة: إنشاء بواسطة `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="quick_settings_tile_add_title">إضافة بلاطة إلى لوحة الإعدادات السريعة</string> + <string name="quick_settings_tile_add_summary">بلاطة الاختصار تستبدل أحدث نفق</string> + <string name="quick_settings_tile_add_failure">تعذر إضافة لوحة الاختصار: خطأ %d</string> + <string name="quick_settings_tile_action">تبديل النفق</string> + <string name="restore_on_boot_summary_off">لن تجلب الأنفاق المفعلة عند التمهيد</string> + <string name="restore_on_boot_summary_on">سوف تجلب الأنفاق المفعلة عند التمهيد</string> + <string name="restore_on_boot_title">الإستعادة عند تشغيل الجهاز</string> + <string name="save">حفظ</string> + <string name="select_all">اختيار الكلّ</string> + <string name="settings">الإعدادات</string> + <string name="shell_exit_status_read_error">لا يمكن للقشرة (shell) قراءة حالة الخروج</string> + <string name="shell_marker_count_error">القشرة متوقعة 4 علامات، استلمت %d</string> + <string name="shell_start_error">فشل تشغيل القشرة: %d</string> + <string name="success_application_will_restart">تم بنجاح. ستتم الآن إعادة تشغيل التطبيق…</string> + <string name="toggle_all">تبديل الكل</string> + <string name="toggle_error">خطأ في تبديل نفق وايرجارد: %s</string> + <string name="tools_installer_already">تم بالفعل تثبيت wg و wg-quick</string> + <string name="tools_installer_failure">غير قادر على تثبيت أدوات سطر الأوامر (لا يوجد root؟)</string> + <string name="tools_installer_initial">تثبيت الأدوات الاختيارية للبرمجة النصية (scripting)</string> + <string name="tools_installer_initial_magisk">تثبيت الأدوات الاختيارية للبرمجة النصية كوحدة ماجيسك (Magisk Module)</string> + <string name="tools_installer_initial_system">تثبيت الأدوات الاختيارية للبرمجة النصية في قسم النظام</string> + <string name="tools_installer_success_magisk">wg و wg-quick ثبتا كوحدة ماجيسك (إعادة التشغيل مطلوبة)</string> + <string name="tools_installer_success_system">wg و wg-quick ثبتا في قسم النظام</string> + <string name="tools_installer_title">تثبيت أدوات سطر الأوامر</string> + <string name="tools_installer_working">تثبيت wg وwg-quick</string> + <string name="tools_unavailable_error">الأدوات المطلوبة غير متوفرة</string> + <string name="transfer">تحويل</string> + <string name="transfer_bytes">%d بايت</string> + <string name="transfer_gibibytes">%.2f جيبي بايت</string> + <string name="transfer_kibibytes">%.2f كيبيبايت</string> + <string name="transfer_mibibytes">%.2f مبيبايت</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f تيبي بايت</string> + <string name="tun_create_error">غير قادر على إنشاء جهاز tun</string> + <string name="tunnel_config_error">غير قادر على تكوين النفق (wg-quick أعاد %d)</string> + <string name="tunnel_create_error">غير قادر على إنشاء النفق: %s</string> + <string name="tunnel_create_success">تم إنشاء نفق \"%s\" بنجاح</string> + <string name="tunnel_error_already_exists">النفق \"%s\" موجود بالفعل</string> + <string name="tunnel_error_invalid_name">إسم غير صالح</string> + <string name="tunnel_list_placeholder">أضف نفق باستخدام الزر أدناه</string> + <string name="tunnel_name">إسم النفق</string> + <string name="tunnel_on_error">غير قادر على تشغيل النفق (wgTurnOn أعاد %d)</string> + <string name="tunnel_dns_failure">غير قادر على حل اسم مضيف نظام أسماء النطاقات (DNS hostname): \"%s\"</string> + <string name="tunnel_rename_error">غير قادر على إعادة تسمية النفق: %s</string> + <string name="tunnel_rename_success">تمت إعادة تسمية النفق بنجاح إلى \"%s\"</string> + <string name="type_name_go_userspace">انتقل مساحة المستخدمين</string> + <string name="type_name_kernel_module">وحدة النواة</string> + <string name="unknown_error">خطأ غير معروف</string> + <string name="updater_avalable">يتوفر تحديث للتطبيق. الرجاء التحديث الآن.</string> + <string name="updater_action">تنزيل & تحديث</string> + <string name="updater_rechecking">جارِ جلب تحديث البيانات الوصفية…</string> + <string name="updater_download_progress">جارِ تنزيل التحديث: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">جارِ تنزيل التحديث: %s</string> + <string name="updater_installing">جارِ تثبيت التحديث…</string> + <string name="updater_failure">فشل التحديث: %s. ستتم إعادة المحاولة للحظات…</string> + <string name="updater_corrupt_title">التطبيق تالف</string> + <string name="updater_corrupt_message">هذا التطبيق تالف. يرجى إعادة تنزيل APK من موقع الويب المرتبط أدناه. بعد ذلك، قم بإلغاء تثبيت هذا التطبيق، وأعِد تثبيته من ملف APK الذي تم تنزيله.</string> + <string name="updater_corrupt_navigate">فتح الموقع</string> + <string name="version_summary">%1$s خلفية %2$s</string> + <string name="version_summary_checking">التحقق من إصدار خلفية %s</string> + <string name="version_summary_unknown">إصدار %s غير معروف</string> + <string name="version_title">وايرجارد لأندويد النسخة %s</string> + <string name="vpn_not_authorized_error">خدمة شبكة خاصة افتراضية (VPN) غير مسموح بها من قبل المستخدم</string> + <string name="vpn_start_error">غير قادر على تشغيل خدمة الشبكة الخاصة الافتراضية (VPN) لنظام أندرويد</string> + <string name="zip_export_error">غير قادر على تصدير الأنفاق: %s</string> + <string name="zip_export_success">تم الحفظ في \"%s\"</string> + <string name="zip_export_summary">سيتم حفظ ملف Zip في مجلد التنزيلات</string> + <string name="zip_export_title">تصدير الأنفاق إلى ملف zip</string> + <string name="biometric_prompt_zip_exporter_title">تحتاج للاستيثاق لتصدير الأنفاق</string> + <string name="biometric_prompt_private_key_title">تحتاج للاستيثاق لعرض المفتاح الخاص</string> + <string name="biometric_auth_error">فشل في المصادقة</string> + <string name="biometric_auth_error_reason">فشل في المصادقة: %s</string> +</resources> diff --git a/ui/src/main/res/values-ca-rES/strings.xml b/ui/src/main/res/values-ca-rES/strings.xml new file mode 100644 index 00000000..073bb798 --- /dev/null +++ b/ui/src/main/res/values-ca-rES/strings.xml @@ -0,0 +1,226 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">No s\'ha pogut esborrar %d túnel: %s</item> + <item quantity="other">No s\'han pogut esborrar %d túnels: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">El túnel %d s\'ha eliminat correctament</item> + <item quantity="other">Els túnels %d s\'han eliminat correctament</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d túnel seleccionat</item> + <item quantity="other">%d túnels seleccionats</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Túnel %1$d de %2$d importat</item> + <item quantity="other">Túnels %1$d de %2$d importats</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">%d túnel importat</item> + <item quantity="other">%d túnels importats</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d Aplicació exclosa</item> + <item quantity="other">%d Aplicacins excloses</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d Aplicació inclosa</item> + <item quantity="other">%d Aplicacions incloses</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d exclòs</item> + <item quantity="other">%d exclosos</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d inclòs</item> + <item quantity="other">%d inclosos</item> + </plurals> + <string name="all_applications">Totes les aplicacions</string> + <string name="exclude_from_tunnel">Exclou</string> + <string name="include_in_tunnel">Inclou només</string> + <plurals name="include_n_applications"> + <item quantity="one">Inclou %d aplicació</item> + <item quantity="other">Inclou %d aplicacions</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Exclou %d aplicació</item> + <item quantity="other">Exclou %d aplicacions</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">cada segon</item> + <item quantity="other">cada %d segons</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">segon</item> + <item quantity="other">segons</item> + </plurals> + <string name="use_all_applications">Utilitza totes les aplicacions</string> + <string name="add_peer">Afegir parell</string> + <string name="addresses">Adreces</string> + <string name="applications">Aplicacions</string> + <string name="allow_remote_control_intents_summary_off">Aplicacions externes no poden cambiar túnels (recomanat)</string> + <string name="allow_remote_control_intents_summary_on">Aplicacions externes poden cambiar túnels (avançat)</string> + <string name="allow_remote_control_intents_title">Permet aplicacions de control remot</string> + <string name="allowed_ips">IPs permeses</string> + <string name="bad_config_context">%1$s de %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s en %2$s</string> + <string name="bad_config_explanation_pka">: Ha de ser positiu i no superior a 65535</string> + <string name="bad_config_explanation_positive_number">: Ha de ser positiu</string> + <string name="bad_config_explanation_udp_port">: Ha de ser un nombre vàlid de port UDP</string> + <string name="bad_config_reason_invalid_key">Clau no vàlida</string> + <string name="bad_config_reason_invalid_number">Número no vàlid</string> + <string name="bad_config_reason_invalid_value">Valor no vàlid</string> + <string name="bad_config_reason_missing_attribute">Falta atribut</string> + <string name="bad_config_reason_missing_section">Falta secció</string> + <string name="bad_config_reason_syntax_error">Error de sintaxi</string> + <string name="bad_config_reason_unknown_attribute">Atribut desconegut</string> + <string name="bad_config_reason_unknown_section">Secció desconeguda</string> + <string name="bad_config_reason_value_out_of_range">Valor fora de rang</string> + <string name="bad_extension_error">El fitxer ha de ser .conf o .zip</string> + <string name="cancel">Cancel·la</string> + <string name="config_delete_error">No es pot esborrar fitxer de configuració %s</string> + <string name="config_exists_error">Configuració per \"%s\" ja existeix</string> + <string name="config_file_exists_error">Fitxer de configuració \"%s\" ja existeix</string> + <string name="config_not_found_error">No s\'ha trobat el fitxer de configuració \"%s\"</string> + <string name="config_rename_error">No es pot cambiar el nom del fitxer de configuració \"%s\"</string> + <string name="config_save_error">No es pot guardar la configuraxió per \"%1$s\": %2$s</string> + <string name="config_save_success">La configuració per \"%s\" s\'ha guadat correctament</string> + <string name="create_activity_title">Crear túnel WireGuard</string> + <string name="create_bin_dir_error">No s\'ha pogut crear la carpeta local pels binaris</string> + <string name="create_downloads_file_error">No es pot crear arxiu en la carpeta de descàrregues</string> + <string name="create_empty">Crea des de zero</string> + <string name="create_from_file">Importa des de fitxer o arxiu</string> + <string name="create_from_qr_code">Escaneja codi QR</string> + <string name="create_output_dir_error">Incapaç de crear directori de sortida</string> + <string name="create_temp_dir_error">No s’ha pogut crear el directori local temporal</string> + <string name="create_tunnel">Crear túnel</string> + <string name="copied_to_clipboard">S\'ha copiat %s al portaretalls</string> + <string name="dark_theme_summary_off">Actualment fent servir el tema clar (dia)</string> + <string name="dark_theme_summary_on">Actualment fent servir el tema fosc (nit)</string> + <string name="dark_theme_title">Utilitza tema fosc</string> + <string name="delete">Elimina</string> + <string name="tv_delete">Slecciona túnel a esborrar</string> + <string name="tv_select_a_storage_drive">Seleccioneu un disc d\'emmagatzematge</string> + <string name="tv_no_file_picker">Si us plau, instsleu un gestor de fitxers per navegar pels arxius</string> + <string name="tv_add_tunnel_get_started">Afegeix un túnel per començar</string> + <string name="disable_config_export_title">Desactiva l\'exportació de configuracions</string> + <string name="disable_config_export_description">Desactivar l\'exportacio de configuracions fa que les claus privades siguin menys accessibles</string> + <string name="dns_servers">Servidors DNS</string> + <string name="edit">Edita</string> + <string name="endpoint">Extrem</string> + <string name="error_down">Error desactivant el túnel: %s</string> + <string name="error_fetching_apps">Error obtenint llista d\'aplicacions: %s</string> + <string name="error_root">Si us plau, obteniu accés root i torneu a intentar</string> + <string name="error_up">Error activant túnel: %s</string> + <string name="exclude_private_ips">Exclou IPs privades</string> + <string name="generate_new_private_key">Genera nova clau privada</string> + <string name="generic_error">Error “%s” desconegut</string> + <string name="hint_automatic">(automàtic)</string> + <string name="hint_generated">(generat)</string> + <string name="hint_optional">(opcional)</string> + <string name="hint_optional_discouraged">(opcional, no recomanat)</string> + <string name="hint_random">(aleatori)</string> + <string name="illegal_filename_error">Nom de fitxer no vàlid \"%s\"</string> + <string name="import_error">No s\'ha pogut importar el túnel: %s</string> + <string name="import_from_qr_code">Importa túnel desde codi QR</string> + <string name="import_success">Importat “%s”</string> + <string name="interface_title">Interfície</string> + <string name="key_contents_error">Caràcters incorrectes en la clau</string> + <string name="key_length_error">Longitud de clau incorrecta</string> + <string name="key_length_explanation_base64">: Les claus en base64 a WireGuard han de tenir 44 caràcters (32 bytes)</string> + <string name="key_length_explanation_binary">: Les claus WireGuard han de ser de 32 bytes</string> + <string name="key_length_explanation_hex">: Les claus en hexadecimal a WireGuard han de tenir 64 caràcters (32 bytes)</string> + <string name="listen_port">Port d\'escolta</string> + <string name="log_export_error">No s\'ha estat capaç d\'exportar el registre: %s</string> + <string name="log_export_subject">WireGuard Android Log File</string> + <string name="log_export_success">Guardat a \"%s\"</string> + <string name="log_export_title">Exporta el registre</string> + <string name="log_saver_activity_label">Guarda registre</string> + <string name="log_viewer_pref_summary">El registre pot ajudar a solucionar errors</string> + <string name="log_viewer_pref_title">Mostra el registre d\'aplicació</string> + <string name="log_viewer_title">Registre</string> + <string name="logcat_error">No es pot executar logcat: </string> + <string name="module_enabler_disabled_summary">El mòdul experimental del kernel pot millorar el rendiment</string> + <string name="module_enabler_disabled_title">Activa el backend del mòdul del kernel</string> + <string name="module_enabler_enabled_title">Desactiva el backend del mòdul del kernel</string> + <string name="module_installer_error">Alguna cosa ha anat malament. Si us plau, prova de nou</string> + <string name="module_installer_not_found">El vostre dispositiu no té mòduls disponibles</string> + <string name="module_installer_title">Descàrega i instala el mòdul kernel</string> + <string name="module_installer_working">Descarregant i instalant…</string> + <string name="module_version_error">No s\'ha pogut determinar la versió del mòdul del kernel</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Activar un túnel desactivarà els altres</string> + <string name="multiple_tunnels_summary_on">Múltiples túnels es podran activar a la vegada</string> + <string name="multiple_tunnels_title">Permet múltiples túnels simultanis</string> + <string name="name">Nom</string> + <string name="no_config_error">Intentant activar un túnel que no té configuració</string> + <string name="no_configs_error">No s\'ha trobat cap configuració</string> + <string name="no_tunnels_error">No existeixen túnels</string> + <string name="parse_error_inet_address">Adreça IP</string> + <string name="parse_error_inet_endpoint">extrem</string> + <string name="parse_error_inet_network">Xarxa IP</string> + <string name="parse_error_integer">número</string> + <string name="parse_error_reason">No es pot analitzar %1$s \"%2$s\"</string> + <string name="peer">Parell</string> + <string name="permission_description">controla els túnels de WireGuard, habilitant i deshabilitant túnels a discreció, potencialment desviant el trànsit</string> + <string name="permission_label">controla els túnels WireGuard</string> + <string name="persistent_keepalive">Missatge de persistència</string> + <string name="pre_shared_key">Clau precompartida</string> + <string name="pre_shared_key_enabled">activat</string> + <string name="private_key">Clau privada</string> + <string name="public_key">Clau pública</string> + <string name="qr_code_hint">Consell: generar amb `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="restore_on_boot_summary_off">No s\'activaran els túnels seleccionats al arrancar el sistema</string> + <string name="restore_on_boot_summary_on">S\'activaran els túnels seleccionats al arrancar el sistema</string> + <string name="restore_on_boot_title">Restableix a l\'inici</string> + <string name="save">Guarda</string> + <string name="select_all">Selecciona-ho tot</string> + <string name="settings">Configuració</string> + <string name="shell_exit_status_read_error">La shell no pot llegit l\'estat de sortida</string> + <string name="shell_marker_count_error">La shell esperava 4 marcadors, n\'ha rebut %d</string> + <string name="shell_start_error">No s\'ha pogut iniciar: %d</string> + <string name="success_application_will_restart">Èxit. Ara l\'aplicació es reiniciarà…</string> + <string name="toggle_all">Canviar tot</string> + <string name="toggle_error">Error al canviar el túnel WireGuard: %s</string> + <string name="tools_installer_already">wg i wg-quick ja estan instalats</string> + <string name="tools_installer_failure">No s\'ha pogut instalar les eines de linia de comandes (ets root?)</string> + <string name="tools_installer_success_magisk">wg i wg-quick instalats com a mòdul de Magisk (es necessita reinicar)</string> + <string name="tools_installer_success_system">wg i wg-quick instalats a la partició de sistema</string> + <string name="tools_installer_title">Instala les eines de la línia d\'ordres</string> + <string name="tools_installer_working">Instalant wg i wg-quick</string> + <string name="tools_unavailable_error">Eines necessàries no disponibles</string> + <string name="transfer">Transferir</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">No s\'ha pogut crear el dispositiu túnel</string> + <string name="tunnel_config_error">No s\'ha pigut confirmgurar el túnel (wg-quick ha tornat %d)</string> + <string name="tunnel_create_error">No s\'ha pogut crear túnel: %s</string> + <string name="tunnel_create_success">El túnel \"%s\" s\'ha creat correctament</string> + <string name="tunnel_error_already_exists">El túnel \"%s\" ja existeix</string> + <string name="tunnel_error_invalid_name">Nom no vàlid</string> + <string name="tunnel_name">Nom del túnel</string> + <string name="tunnel_on_error">No s\'ha estat capaç d\'activar el túnel (wgTurnOn ha retornat %d)</string> + <string name="tunnel_dns_failure">Impossible resoldre el nom del domini \"%s\"</string> + <string name="tunnel_rename_error">No s\'ha pogut renombrar el túnel: %s</string> + <string name="tunnel_rename_success">El nom del túnel s\'ha canviat correctament a \"%s\"</string> + <string name="type_name_kernel_module">Mòdul del kernel</string> + <string name="unknown_error">Error desconegut</string> + <string name="version_summary_unknown">Versió de %s desconeguda</string> + <string name="version_title">WireGuard per a Android v%s</string> + <string name="vpn_not_authorized_error">Servei de VPN no autoritzat per l\'usuari</string> + <string name="vpn_start_error">No s\'ha pogut iniciar el servei de VPN de Android</string> + <string name="zip_export_error">No s\'han pogut exportar els túnels: %s</string> + <string name="zip_export_success">Guardat a \"%s\"</string> + <string name="zip_export_summary">El fitxer zip es guardarà a la carpeta de descàrregues</string> + <string name="zip_export_title">Exporta els túnels a un fitxer zip</string> + <string name="biometric_prompt_zip_exporter_title">Autentifiqueu-vos per exportar els túnels</string> + <string name="biometric_prompt_private_key_title">Autentifiqueu-vos per veure la clau privada</string> + <string name="biometric_auth_error">Error d\'autenticació</string> + <string name="biometric_auth_error_reason">Error d\'autenticació: %s</string> +</resources> diff --git a/ui/src/main/res/values-cs-rCZ/strings.xml b/ui/src/main/res/values-cs-rCZ/strings.xml new file mode 100644 index 00000000..3b50d711 --- /dev/null +++ b/ui/src/main/res/values-cs-rCZ/strings.xml @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">%d tunel nelze smazat: %s</item> + <item quantity="few">%d tunely nelze smazat: %s</item> + <item quantity="many">%d tunelů nelze smazat: %s</item> + <item quantity="other">%d tunelů nelze smazat: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">%d tunel byl smazán</item> + <item quantity="few">%d tunely byly smazány</item> + <item quantity="many">%d tunelů bylo smazáno</item> + <item quantity="other">%d tunelů bylo smazáno</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">Vybrán %d tunel</item> + <item quantity="few">Vybrány %d tunely</item> + <item quantity="many">Vybráno %d tunelů</item> + <item quantity="other">Vybráno %d tunelů</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Importován %1$d z %2$d tunelů</item> + <item quantity="few">Importovány %1$d z %2$d tunelů</item> + <item quantity="many">Importováno %1$d z %2$d tunelů</item> + <item quantity="other">Importováno %1$d z %2$d tunelů</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">Importován %d tunel</item> + <item quantity="few">Importovány %d tunely</item> + <item quantity="many">Importováno %d tunelů</item> + <item quantity="other">Importováno %d tunelů</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d vyloučená aplikace</item> + <item quantity="few">%d vyloučené aplikace</item> + <item quantity="many">%d vyloučených aplikací</item> + <item quantity="other">%d vyloučených aplikací</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d zahrnutá aplikace</item> + <item quantity="few">%d zahrnuté aplikace</item> + <item quantity="many">%d zahrnutých aplikací</item> + <item quantity="other">%d zahrnutých aplikací</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d vyloučena</item> + <item quantity="few">%d vyloučeny</item> + <item quantity="many">%d vyloučeno</item> + <item quantity="other">%d vyloučeno</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d zahrnuta</item> + <item quantity="few">%d zahrnuty</item> + <item quantity="many">%d zahrnuto</item> + <item quantity="other">%d zahrnuto</item> + </plurals> + <string name="all_applications">Všechny aplikace</string> + <string name="exclude_from_tunnel">Vyloučit</string> + <string name="include_in_tunnel">Zahrnout pouze</string> + <plurals name="include_n_applications"> + <item quantity="one">Zahrnout %d aplikaci</item> + <item quantity="few">Zahrnout %d aplikace</item> + <item quantity="many">Zahrnout %d aplikací</item> + <item quantity="other">Zahrnout %d aplikací</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Vyloučit %d aplikaci</item> + <item quantity="few">Vyloučit %d aplikace</item> + <item quantity="many">Vyloučit %d aplikací</item> + <item quantity="other">Vyloučit %d aplikací</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">každou sekundu</item> + <item quantity="few">každé %d sekundy</item> + <item quantity="many">každých %d sekund</item> + <item quantity="other">každých %d sekund</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">sekunda</item> + <item quantity="few">sekundy</item> + <item quantity="many">sekund</item> + <item quantity="other">sekund</item> + </plurals> + <string name="use_all_applications">Použít všechny aplikace</string> + <string name="add_peer">Přidat peera</string> + <string name="addresses">Adresy</string> + <string name="applications">Aplikace</string> + <string name="allow_remote_control_intents_summary_off">Externí aplikace nemohou přepínat tunely (doporučeno)</string> + <string name="allow_remote_control_intents_summary_on">Externí aplikace mohou přepínat tunely (pokročilé)</string> + <string name="allow_remote_control_intents_title">Povolit aplikace vzdálené správy</string> + <string name="allowed_ips">Povolené IP</string> + <string name="bad_config_context">%2$s položky %1$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s v %2$s</string> + <string name="bad_config_explanation_pka">: Musí být kladný a maximálně 65535</string> + <string name="bad_config_explanation_positive_number">: Musí být kladný</string> + <string name="bad_config_explanation_udp_port">: Musí být platné číslo UDP portu</string> + <string name="bad_config_reason_invalid_key">Neplatný klíč</string> + <string name="bad_config_reason_invalid_number">Neplatné číslo</string> + <string name="bad_config_reason_invalid_value">Neplatná hodnota</string> + <string name="bad_config_reason_missing_attribute">Chybějící atribut</string> + <string name="bad_config_reason_missing_section">Chybějící sekce</string> + <string name="bad_config_reason_syntax_error">Syntaktická chyba</string> + <string name="bad_config_reason_unknown_attribute">Neznámý atribut</string> + <string name="bad_config_reason_unknown_section">Neznámá sekce</string> + <string name="bad_config_reason_value_out_of_range">Hodnota je mimo rozsah</string> + <string name="bad_extension_error">Soubor musí být .conf nebo .zip</string> + <string name="cancel">Zrušit</string> + <string name="config_delete_error">Nelze smazat konfigurační soubor %s</string> + <string name="config_exists_error">Konfigurace pro „%s“ již existuje</string> + <string name="config_file_exists_error">Konfigurační soubor „%s“ již existuje</string> + <string name="config_not_found_error">Konfigurační soubor „%s“ nebyl nalezen</string> + <string name="config_rename_error">Konfigurační soubor „%s“ nelze přejmenovat</string> + <string name="config_save_error">Nelze uložit konfiguraci pro „%1$s“: %2$s</string> + <string name="config_save_success">Konfigurace pro „%s“ byla úspěšně uložena</string> + <string name="create_activity_title">Vytvořit WireGuard tunel</string> + <string name="delete">Smazat</string> + <string name="log_viewer_pref_summary">Logy mohou pomoci s debuggingem</string> + <string name="log_viewer_pref_title">Zobrazit log aplikace</string> + <string name="log_viewer_title">Log</string> + <string name="logcat_error">Nelze spustit logcat: </string> + <string name="module_enabler_disabled_summary">Experimentální kernel modul může zlepšit výkon</string> + <string name="module_enabler_disabled_title">Povolit backend kernel modulu</string> + <string name="module_enabler_enabled_title">Vypnout backend kernel modulu</string> + <string name="module_installer_error">Něco se pokazilo. Zkuste to prosím znovu</string> + <string name="module_installer_initial">Experimentální kernel modul může zlepšit výkon</string> + <string name="module_installer_not_found">Pro toto zařízení nejsou dostupné žádné moduly</string> + <string name="module_installer_title">Stáhnout a nainstalovat kernel modul</string> + <string name="module_installer_working">Stahování a instalace…</string> + <string name="module_version_error">Nelze určit verzi kernel modulu</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Zapnutí jednoho tunelu vypne ostatní tunely</string> + <string name="multiple_tunnels_summary_on">Více tunelů může být zapnuto najednou</string> + <string name="multiple_tunnels_title">Povolit více simultánních tunelů</string> + <string name="name">Název</string> +</resources> diff --git a/ui/src/main/res/values-da-rDK/strings.xml b/ui/src/main/res/values-da-rDK/strings.xml new file mode 100644 index 00000000..bf786c07 --- /dev/null +++ b/ui/src/main/res/values-da-rDK/strings.xml @@ -0,0 +1,192 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Kan ikke slette %d tunnel: %s</item> + <item quantity="other">Ikke i stand til at slette %d tunneler: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">Slettede %d tunnel</item> + <item quantity="other">%d tunneller blev slettet</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d tunnel valgt</item> + <item quantity="other">%d tunneler valgt</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Importeret %1$d ud af %2$d tunneler</item> + <item quantity="other">Importeret %1$d ud af %2$d tunneler</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">Importeret %d tunnel</item> + <item quantity="other">Importeret %d tunneler</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d Ekskluderet Applikation</item> + <item quantity="other">%d Ekskluderet Applikationer</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d Inkluderet Applikation</item> + <item quantity="other">%d Inkluderet Applikationer</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d ekskluderet</item> + <item quantity="other">%d ekskluderet</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d inkluderet</item> + <item quantity="other">%d inkluderet</item> + </plurals> + <string name="all_applications">Alle Applikationer</string> + <string name="exclude_from_tunnel">Ekskludér</string> + <string name="include_in_tunnel">Inkludér kun</string> + <plurals name="include_n_applications"> + <item quantity="one">Inkludér %d app</item> + <item quantity="other">Inkludér %d apps</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Ekskludér %d app</item> + <item quantity="other">Ekskludér %d apps</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">hvert sekund</item> + <item quantity="other">hver %d. sekund</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">sekund</item> + <item quantity="other">sekunder</item> + </plurals> + <string name="use_all_applications">Brug alle apps</string> + <string name="add_peer">Tilføj modpart</string> + <string name="addresses">Adresser</string> + <string name="applications">Applikationer</string> + <string name="allow_remote_control_intents_summary_off">Eksterne apps kan ikke slå tunneler til/fra (Anbefales)</string> + <string name="allow_remote_control_intents_summary_on">Eksterne apps må slå tunneler til/fra (Avanceret)</string> + <string name="allow_remote_control_intents_title">Tillad fjernstyring fra eksterne apps</string> + <string name="allowed_ips">Tilladte IP-adresser</string> + <string name="bad_config_context">%1$s\'s %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s i %2$s</string> + <string name="bad_config_explanation_positive_number">: Skal være positiv</string> + <string name="bad_config_reason_invalid_key">Ugyldig nøgle</string> + <string name="bad_config_reason_invalid_number">Ugyldigt nummer</string> + <string name="bad_config_reason_invalid_value">Ugyldig værdi</string> + <string name="bad_config_reason_missing_section">Mangler sektion</string> + <string name="bad_config_reason_syntax_error">Syntaksfejl</string> + <string name="bad_config_reason_unknown_attribute">Ukendt egenskab</string> + <string name="bad_config_reason_unknown_section">Ukendt sektion</string> + <string name="bad_config_reason_value_out_of_range">Værdi udenfor området</string> + <string name="bad_extension_error">Filen skal være .conf eller .zip</string> + <string name="error_no_qr_found">QR-kode ikke fundet i billede</string> + <string name="cancel">Annullér</string> + <string name="config_delete_error">Kunne ikke slette konfigurationsfilen %s</string> + <string name="config_exists_error">Konfiguration for \"%s\" findes allerede</string> + <string name="config_file_exists_error">Konfigurationsfilen \"%s\" findes allerede</string> + <string name="config_not_found_error">Konfigurationsfilen \"%s\" blev ikke fundet</string> + <string name="config_rename_error">Kan ikke omdøbe konfigurationsfilen \"%s\"</string> + <string name="config_save_error">Kan ikke gemme konfigurationen for \"%1$s\": %2$s</string> + <string name="config_save_success">Konfiguration for \"%s\" blev gemt</string> + <string name="create_activity_title">Opret WireGuard tunnel</string> + <string name="create_empty">Opret fra ny</string> + <string name="create_from_file">Importér fra fil eller arkiv</string> + <string name="create_from_qr_code">Scan fra QR-kode</string> + <string name="create_tunnel">Opret Tunnel</string> + <string name="copied_to_clipboard">%s kopieret til udklipsholder</string> + <string name="dark_theme_summary_off">Bruger lige nu lyst (dag) tema</string> + <string name="dark_theme_summary_on">Bruger lige nu mørkt (nat) tema</string> + <string name="dark_theme_title">Brug mørkt tema</string> + <string name="delete">Slet</string> + <string name="tv_delete">Vælg tunnel du vil slette</string> + <string name="tv_select_a_storage_drive">Vælg et lagerdrev</string> + <string name="tv_add_tunnel_get_started">Tilføj en tunnel for at komme i gang</string> + <string name="donate_title">♥ Donér til WireGuard projektet</string> + <string name="disable_config_export_title">Deaktivér eksportering af konfiguration</string> + <string name="dns_servers">DNS-servere</string> + <string name="dns_search_domains">DNS-søgedomæner</string> + <string name="edit">Redigér</string> + <string name="endpoint">Slutpunkt</string> + <string name="error_prepare">Fejl ved forberedelse af tunnel: %s</string> + <string name="error_up">Fejl under aktivering af tunnel: %s</string> + <string name="exclude_private_ips">Eksludér private IP-adresser</string> + <string name="generate_new_private_key">Generér ny privat nøgle</string> + <string name="generic_error">Ukendt \"%s\" fejl</string> + <string name="hint_automatic">(auto)</string> + <string name="hint_generated">(genereret)</string> + <string name="hint_optional">(valgfri)</string> + <string name="hint_optional_discouraged">(valgfri, ikke anbefalet)</string> + <string name="hint_random">(tilfældig)</string> + <string name="illegal_filename_error">Ugyldigt filnavn \"%s\"</string> + <string name="import_error">Kunne ikke importere tunnel: %s</string> + <string name="import_from_qr_code">Importér tunnel fra QR-kode</string> + <string name="import_success">Importeret \"%s\"</string> + <string name="interface_title">Grænseflade</string> + <string name="key_contents_error">Ugyldige tegn i nøgle</string> + <string name="key_length_error">Forkert længde på nøgle</string> + <string name="latest_handshake_ago">%s siden</string> + <string name="listen_port">Lytteport</string> + <string name="log_export_error">Kunne ikke eksportere log: %s</string> + <string name="log_export_subject">WireGuard Android Log-fil</string> + <string name="log_export_success">Gemt til \"%s\"</string> + <string name="log_export_title">Eksportér log-fil</string> + <string name="log_saver_activity_label">Gem log</string> + <string name="log_viewer_pref_summary">Logfiler kan hjælpe ved fejlsøgning</string> + <string name="log_viewer_pref_title">Vis applikationslog</string> + <string name="log_viewer_title">Log</string> + <string name="logcat_error">Kunne ikke køre logcat: </string> + <string name="module_installer_error">Noget gik galt. Forsøg venligst igen</string> + <string name="module_installer_title">Hent og installér kerne-modul</string> + <string name="module_installer_working">Henter og installerer…</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_title">Tillad flere samtidige tunneler</string> + <string name="name">Navn</string> + <string name="no_configs_error">Ingen konfigurationer fundet</string> + <string name="no_tunnels_error">Ingen tilgængelige tunneler</string> + <string name="parse_error_generic">streng</string> + <string name="parse_error_inet_address">IP adresse</string> + <string name="parse_error_inet_endpoint">slutpunkt</string> + <string name="parse_error_inet_network">IP netværk</string> + <string name="parse_error_integer">nummer</string> + <string name="peer">Modpart</string> + <string name="pre_shared_key">Forhåndsdelt nøgle</string> + <string name="pre_shared_key_enabled">aktiveret</string> + <string name="private_key">Privat nøgle</string> + <string name="public_key">Offentlig nøgle</string> + <string name="restore_on_boot_title">Gendan ved opstart</string> + <string name="save">Gem</string> + <string name="select_all">Vælg alle</string> + <string name="settings">Indstillinger</string> + <string name="toggle_all">Vælg/Fravælg Alle</string> + <string name="tools_installer_already">wg og wg-quick er allerede installeret</string> + <string name="tools_installer_working">Installerer wg og wg-quick</string> + <string name="transfer">Overførsel</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Kunne ikke oprette tun enhed</string> + <string name="tunnel_config_error">Kunne ikke konfigurere tunnel (wg-quick returnerede %d)</string> + <string name="tunnel_create_error">Ikke i stand til at oprette tunnel: %s</string> + <string name="tunnel_create_success">Tunnelen blev succesfuldt oprettet \"%s\"</string> + <string name="tunnel_error_already_exists">Tunnel \"%s\" eksisterer allerede</string> + <string name="tunnel_error_invalid_name">Ugyldigt navn</string> + <string name="tunnel_list_placeholder">Tilføj en tunnel ved hjælp af knappen nedenfor</string> + <string name="tunnel_name">Tunnel Navn</string> + <string name="tunnel_dns_failure">Kunne ikke opslå DNS adresse: \"%s\"</string> + <string name="tunnel_rename_error">Kan ikke omdøbe tunnel: %s</string> + <string name="tunnel_rename_success">Tunnel blev succesfuldt omdøbt til \"%s\"</string> + <string name="type_name_kernel_module">Kerne modul</string> + <string name="unknown_error">Ukendt fejl</string> + <string name="updater_avalable">En applikationsopdatering er tilgængelig. Opdatér venligst nu.</string> + <string name="updater_action">Hent & Opdatér</string> + <string name="updater_download_progress">Henter opdatering: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Henter opdatering: %s</string> + <string name="updater_installing">Installerer opdatering…</string> + <string name="version_summary_unknown">Ukendt %s version</string> + <string name="version_title">WireGuard for Android v%s</string> + <string name="zip_export_error">Ikke i stand til at eksportere tunneler: %s</string> + <string name="zip_export_success">Gemt til \"%s\"</string> + <string name="zip_export_title">Eksportér tunneler til zip-fil</string> + <string name="biometric_auth_error">Fejl ved godkendelse</string> + <string name="biometric_auth_error_reason">Fejl ved godkendelse: %s</string> +</resources> diff --git a/ui/src/main/res/values-de/strings.xml b/ui/src/main/res/values-de/strings.xml index d7033592..372abcad 100644 --- a/ui/src/main/res/values-de/strings.xml +++ b/ui/src/main/res/values-de/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <plurals name="delete_error"> - <item quantity="one">%d Tunnel konnte nicht gelöscht werden: %s</item> + <item quantity="one">%d Tunnel konnten nicht gelöscht werden: %s</item> <item quantity="other">%d Tunnel konnten nicht gelöscht werden: %s</item> </plurals> <plurals name="delete_success"> @@ -25,7 +25,7 @@ <item quantity="other">%d ausgeschlossene Anwendungen</item> </plurals> <plurals name="set_included_applications"> - <item quantity="one">%d ausgeschlossene Anwendung</item> + <item quantity="one">%d einbezogene Anwendung</item> <item quantity="other">%d einbezogene Anwendungen</item> </plurals> <plurals name="n_excluded_applications"> @@ -53,18 +53,17 @@ </plurals> <plurals name="persistent_keepalive_seconds_suffix"> <item quantity="one">Sekunde</item> - <item quantity="other">Sekunde</item> + <item quantity="other">seconds</item> </plurals> <string name="use_all_applications">Alle Apps verwenden</string> - <string name="add_peer">Teilnehmer hinzufügen</string> + <string name="add_peer">Gegenüber hinzufügen</string> <string name="addresses">Adressen</string> - <string name="applications">Applikationen</string> + <string name="applications">Anwendungen</string> <string name="allow_remote_control_intents_summary_off">Externe Apps dürfen keine Tunnel umschalten (empfohlen)</string> <string name="allow_remote_control_intents_summary_on">Externe Apps dürfen Tunnel umschalten (erweitert)</string> <string name="allow_remote_control_intents_title">Erlaube Steuerung über externe Apps</string> <string name="allowed_ips">Erlaubte IPs</string> - <string name="app_name">WireGuard</string> - <string name="bad_config_context">%1$ss %2$s</string> + <string name="bad_config_context">%2$s des %1$s</string> <string name="bad_config_context_top_level">%s</string> <string name="bad_config_error">%1$s in %2$s</string> <string name="bad_config_explanation_pka">: Muss positiv sein und nicht größer als 65535</string> @@ -73,13 +72,15 @@ <string name="bad_config_reason_invalid_key">Ungültiger Schlüssel</string> <string name="bad_config_reason_invalid_number">Ungültige Zahl</string> <string name="bad_config_reason_invalid_value">Ungültiger Wert</string> - <string name="bad_config_reason_missing_attribute">Attribut fehlt</string> - <string name="bad_config_reason_missing_section">Fehlende Sektion</string> + <string name="bad_config_reason_missing_attribute">Fehlendes Attribut</string> + <string name="bad_config_reason_missing_section">Fehlender Abschnitt</string> <string name="bad_config_reason_syntax_error">Syntaxfehler</string> <string name="bad_config_reason_unknown_attribute">Unbekanntes Attribut</string> <string name="bad_config_reason_unknown_section">Unbekannter Abschnitt</string> <string name="bad_config_reason_value_out_of_range">Wert ist außerhalb des gültigen Bereichs</string> <string name="bad_extension_error">Dateiendung muss .conf oder .zip sein</string> + <string name="error_no_qr_found">Es wurde kein QR-Code im Bild gefunden</string> + <string name="error_qr_checksum">Die QR-Code Prüfsummenkontrolle ist fehlgeschlagen</string> <string name="cancel">Abbrechen</string> <string name="config_delete_error">Konfigurationsdatei %s kann nicht gelöscht werden</string> <string name="config_exists_error">Konfiguration für „%s“ existiert bereits</string> @@ -89,30 +90,42 @@ <string name="config_save_error">Konfiguration für „%1$s“ kann nicht gespeichert werden: %2$s</string> <string name="config_save_success">Konfiguration für „%s ” erfolgreich gespeichert</string> <string name="create_activity_title">WireGuard-Tunnel erstellen</string> - <string name="create_bin_dir_error">Lokales Anwendungsverzeichnis konnte nicht erstellt werden</string> - <string name="create_downloads_file_error">Datei konnte im Download-Verzeichnis nicht erstellt werden</string> + <string name="create_bin_dir_error">Lokales Anwendungsverzeichnis kann nicht erstellt werden</string> + <string name="create_downloads_file_error">Datei kann im Download-Verzeichnis nicht erstellt werden</string> <string name="create_empty">Neu erstellen</string> <string name="create_from_file">Aus Datei oder Archiv importieren</string> - <string name="create_from_qr_code">Vom QR-Code scannen</string> + <string name="create_from_qr_code">Von QR-Code scannen</string> <string name="create_output_dir_error">Konnte das Ausgabeverzeichnis nicht erstellen</string> - <string name="create_temp_dir_error">Lokales temporäres Verzeichnis konnte nicht erstellt werden</string> + <string name="create_temp_dir_error">Lokales temporäres Verzeichnis kann nicht erstellt werden</string> <string name="create_tunnel">Tunnel erstellen</string> + <string name="copied_to_clipboard">%s in die Zwischenanlage kopiert</string> <string name="dark_theme_summary_off">Helles (Tag) Design in Verwendung</string> <string name="dark_theme_summary_on">Dunkles (Nacht) Design in Verwendung</string> <string name="dark_theme_title">Dunkles Design verwenden</string> <string name="delete">Entfernen</string> - <string name="dns_servers">DNS-Server</string> + <string name="tv_delete">Wählen Sie den zu löschenden Tunnel aus</string> + <string name="tv_select_a_storage_drive">Wählen Sie ein Speicherlaufwerk</string> + <string name="tv_no_file_picker">Bitte installieren Sie ein Dateiverwaltungsprogramm, um Dateien zu durchsuchen</string> + <string name="tv_add_tunnel_get_started">Fügen Sie einen Tunnel hinzu, um loszulegen</string> + <string name="donate_title">♥ Spende an das WireGuard Projekt</string> + <string name="donate_summary">Jeder Beitrag hilft</string> + <string name="donate_google_play_disappointment">Vielen Dank für Ihre Unterstützung des WireGuard-Projekts!\n\nLeider ist es uns aufgrund der Google-Richtlinien nicht gestattet, einen Link zu dem Teil der Projekt-Webseite zu setzen, auf dem Sie eine Spende tätigen können. Hoffentlich finden Sie das heraus!\n\nNochmals vielen Dank für Ihren Beitrag.</string> + <string name="disable_config_export_title">Deaktivieren Sie den Konfigurationsexport</string> + <string name="disable_config_export_description">Durch Deaktivieren des Konfigurationsexports werden private Schlüssel weniger zugänglich</string> + <string name="dns_servers">Nameserver</string> + <string name="dns_search_domains">Suchdomäne</string> <string name="edit">Bearbeiten</string> <string name="endpoint">Endpunkt</string> - <string name="error_down">Fehler beim Herunterfahren des Tunnels: %s</string> + <string name="error_down">Fehler beim Abschalten des Tunnels: %s</string> <string name="error_fetching_apps">Fehler beim Abrufen der App-Liste: %s</string> <string name="error_root">Bitte root-Zugriff anfordern und erneut versuchen</string> + <string name="error_prepare">Fehler beim Vorbereiten des Tunnels: %s</string> <string name="error_up">Fehler beim Starten des Tunnels: %s</string> <string name="exclude_private_ips">Private IPs ausschließen</string> <string name="generate_new_private_key">Neuen privaten Schlüssel generieren</string> <string name="generic_error">Unbekannter „%s“ Fehler</string> <string name="hint_automatic">(auto)</string> - <string name="hint_generated">(generiert)</string> + <string name="hint_generated">(erzeugt)</string> <string name="hint_optional">(optional)</string> <string name="hint_optional_discouraged">(optional, nicht empfohlen)</string> <string name="hint_random">(zufällig)</string> @@ -120,38 +133,40 @@ <string name="import_error">Kann Tunnel nicht importieren: %s</string> <string name="import_from_qr_code">Tunnel aus QR-Code importieren</string> <string name="import_success">„%s” importiert</string> - <string name="interface_title">Schnittstelle</string> - <string name="key_contents_error">Falsche Zeichen in Schlüssel</string> + <string name="interface_title">Interface</string> + <string name="key_contents_error">Unzulässige Zeichen im Schlüssel</string> <string name="key_length_error">Falsche Schlüssellänge</string> <string name="key_length_explanation_base64">: WireGuard base64-Schlüssel müssen 44 Zeichen enthalten (32 Bytes)</string> <string name="key_length_explanation_binary">: WireGuard-Schlüssel müssen 32 Bytes groß sein</string> <string name="key_length_explanation_hex">: WireGuard Hex-Schlüssel müssen 64 Zeichen (32 Bytes) groß sein</string> + <string name="latest_handshake">Letzter Handshake</string> + <string name="latest_handshake_ago">vor %s</string> <string name="listen_port">Eingangs-Port</string> - <string name="log_export_error">Fehler beim Exportieren des Logs: %s</string> - <string name="log_export_subject">WireGuard Android Log Datei</string> + <string name="log_export_error">Konnte Protokoll nicht exportieren: %s</string> + <string name="log_export_subject">WireGuard Android Protokolldatei</string> <string name="log_export_success">Gespeichert in „%s”</string> <string name="log_export_title">Logdatei exportieren</string> - <string name="log_saver_activity_label">Log speichern</string> - <string name="log_viewer_pref_summary">Logs können beim Debuggen helfen</string> - <string name="log_viewer_pref_title">Protokoll der Anwendung anzeigen</string> - <string name="log_viewer_title">Loggen</string> + <string name="log_saver_activity_label">Protokoll speichern</string> + <string name="log_viewer_pref_summary">Protokolle können beim Debuggen helfen</string> + <string name="log_viewer_pref_title">Anwendungs-Protokoll anzeigen</string> + <string name="log_viewer_title">Protokoll</string> <string name="logcat_error">Konnte logcat nicht ausführen: </string> - <string name="module_disabler_disabled_summary">Das experimentelle Kernelmodul kann die Leistung verbessern</string> - <string name="module_disabler_disabled_title">Kernelmodul-Backend aktivieren</string> - <string name="module_disabler_enabled_summary">Das langsamere Userspace-Backend kann die Stabilität verbessern</string> - <string name="module_disabler_enabled_title">Kernelmodul-Backend deaktivieren</string> - <string name="module_installer_error">Es ist etwas schief gelaufen. Bitte versuchen Sie es später erneut</string> + <string name="module_enabler_disabled_summary">Das experimentelle Kernelmodul kann die Leistung verbessern</string> + <string name="module_enabler_disabled_title">Kernelmodul-Backend aktivieren</string> + <string name="module_enabler_enabled_summary">Das langsamere Userspace-Backend kann die Stabilität verbessern</string> + <string name="module_enabler_enabled_title">Kernelmodul-Backend deaktivieren</string> + <string name="module_installer_error">Es ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut</string> <string name="module_installer_initial">Das experimentelle Kernelmodul kann die Leistung verbessern</string> <string name="module_installer_not_found">Für Ihr Gerät sind keine Module verfügbar</string> <string name="module_installer_title">Kernelmodul herunterladen und installieren</string> - <string name="module_installer_working">Herunterladen und Installieren…</string> + <string name="module_installer_working">Lade herunter und installiere…</string> <string name="module_version_error">Konnte Version des Kernel-Moduls nicht ermitteln</string> <string name="mtu">MTU</string> - <string name="multiple_tunnels_summary_off">Einschalten eines Tunnels wird andere ausschalten</string> - <string name="multiple_tunnels_summary_on">Mehrere Tunnel können gleichzeitig aktiviert werden</string> - <string name="multiple_tunnels_title">Erlaube mehrere Tunnel gleichzeitig</string> + <string name="multiple_tunnels_summary_off">Das einschalten eines Tunnels wird andere ausschalten</string> + <string name="multiple_tunnels_summary_on">Mehrere Tunnel können gleichzeitig aktiviert sein</string> + <string name="multiple_tunnels_title">Erlaube mehrere gleichzeitige Tunnel</string> <string name="name">Name</string> - <string name="no_config_error">Versucht einen Tunnel ohne Konfiguration zu starten</string> + <string name="no_config_error">Es wurde versucht, einen Tunnel ohne Konfiguration zu starten</string> <string name="no_configs_error">Keine Konfigurationen gefunden</string> <string name="no_tunnels_error">Keine Tunnel vorhanden</string> <string name="parse_error_generic">String (Zeichenkette)</string> @@ -169,6 +184,10 @@ <string name="private_key">Privater Schlüssel</string> <string name="public_key">Öffentlicher Schlüssel</string> <string name="qr_code_hint">Tipp: Mit `qrencode -t ansiutf8 < tunnel.conf` generieren.</string> + <string name="quick_settings_tile_add_title">Kachel zu Schnelleinstellungen hinzufügen</string> + <string name="quick_settings_tile_add_summary">Die Verknüpfung schaltet den letzten Tunnel um</string> + <string name="quick_settings_tile_add_failure">Verknüpfung kann nicht hinzugefügt werden: Fehler %d</string> + <string name="quick_settings_tile_action">Tunnel umschalten</string> <string name="restore_on_boot_summary_off">Aktivierte Tunnel beim Systemstart nicht automatisch starten</string> <string name="restore_on_boot_summary_on">Aktivierte Tunnel beim Systemstart automatisch wieder starten</string> <string name="restore_on_boot_title">Beim Neustart wiederherstellen</string> @@ -183,14 +202,14 @@ <string name="toggle_error">Fehler beim Umschalten des WireGuard-Tunnels: %s</string> <string name="tools_installer_already">wg und wg-quick sind bereits installiert</string> <string name="tools_installer_failure">Kommandozeilenwerkzeuge konnten nicht installiert werden (kein Root?)</string> - <string name="tools_installer_initial">Optionale Tools für Skripte installieren</string> + <string name="tools_installer_initial">Optionale Werkzeuge für Skripte installieren</string> <string name="tools_installer_initial_magisk">Optionale Werkzeuge für das Skripten als Magisk-Modul installieren</string> <string name="tools_installer_initial_system">Optionale Werkzeuge für Skripte auf der Systempartition installieren</string> <string name="tools_installer_success_magisk">wg und wg-quick als Magisk-Modul installiert (Neustart erforderlich)</string> <string name="tools_installer_success_system">wg und wg-quick auf der Systempartition installiert</string> <string name="tools_installer_title">Kommandozeilenwerkzeuge installieren</string> <string name="tools_installer_working">Installiere wg und wg-quick</string> - <string name="tools_unavailable_error">Erforderliche Tools nicht verfügbar</string> + <string name="tools_unavailable_error">Erforderliche Werkzeuge nicht verfügbar</string> <string name="transfer">Transfer</string> <string name="transfer_bytes">%d B</string> <string name="transfer_gibibytes">%.2f GiB</string> @@ -204,15 +223,26 @@ <string name="tunnel_create_success">Tunnel „%s “ erfolgreich erstellt</string> <string name="tunnel_error_already_exists">Tunnel „%s“ existiert bereits</string> <string name="tunnel_error_invalid_name">Ungültiger Name</string> - <string name="tunnel_list_placeholder">Füge einen Tunnel mit der blauen Taste hinzu</string> + <string name="tunnel_list_placeholder">Füge einen Tunnel mit der Schaltfläche unten hinzu</string> <string name="tunnel_name">Tunnelname</string> <string name="tunnel_on_error">Tunnel kann nicht eingeschaltet werden (wgTurnOn gab %d zurück)</string> + <string name="tunnel_dns_failure">DNS-Hostname kann nicht aufgelöst werden: „%s“</string> <string name="tunnel_rename_error">Kann Tunnel nicht umbenennen: %s</string> <string name="tunnel_rename_success">Tunnel erfolgreich in „%s “ umbenannt</string> <string name="type_name_go_userspace">Go userspace</string> <string name="type_name_kernel_module">Kernelmodul</string> <string name="unknown_error">Unbekannter Fehler</string> - <string name="version_summary">%1$s Backend v%2$s</string> + <string name="updater_avalable">Ein Anwendungsupdate ist verfügbar. Bitte jetzt aktualisieren.</string> + <string name="updater_action">Download & Update</string> + <string name="updater_rechecking">Update-Metadaten abrufen…</string> + <string name="updater_download_progress">Update wird heruntergeladen: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Update wird heruntergeladen: %s</string> + <string name="updater_installing">Installiere Update…</string> + <string name="updater_failure">Fehler beim Aktualisieren: %s. Versuche es in Kürze erneut…</string> + <string name="updater_corrupt_title">Anwendung beschädigt</string> + <string name="updater_corrupt_message">Diese Anwendung ist beschädigt. Bitte laden Sie die APK erneut von der unten verlinkten Website herunter. Deinstallieren Sie danach diese Anwendung und installieren Sie sie mit der heruntergeladenen APK neu.</string> + <string name="updater_corrupt_navigate">Webseite öffnen</string> + <string name="version_summary">%1$s backend %2$s</string> <string name="version_summary_checking">Überprüfe %s Backend-Version</string> <string name="version_summary_unknown">Unbekannte %s Version</string> <string name="version_title">WireGuard für Android v%s</string> diff --git a/ui/src/main/res/values-el-rGR/strings.xml b/ui/src/main/res/values-el-rGR/strings.xml new file mode 100644 index 00000000..d4afbf60 --- /dev/null +++ b/ui/src/main/res/values-el-rGR/strings.xml @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Δεν είναι δυνατή η διαγραφή του %d tunnel: %s</item> + <item quantity="other">Δεν είναι δυνατή η διαγραφή %d tunnels: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">Το %d tunnel διαγράφηκε με επιτυχία</item> + <item quantity="other">Διαγράφηκαν επιτυχώς τα %d tunnels</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d επιλεγμένο tunnel</item> + <item quantity="other">%d επιλεγμένα tunnels</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Έγινε εισαγωγή %1$d από %2$d tunnels</item> + <item quantity="other">Έγινε εισαγωγή %1$d από %2$d tunnels</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">Εισαγωγή tunnel %d</item> + <item quantity="other">Εισαγωγή tunnels %d</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d Εξαιρούμενη εφαρμογή</item> + <item quantity="other">%d Εξαιρούμενες εφαρμογές</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d Συμπεριλαμβανόμενη εφαρμογή</item> + <item quantity="other">%d Συμπεριλαμβανόμενες εφαρμογές</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">εξαιρέθηκε %d</item> + <item quantity="other">εξαιρέθηκε %d</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">περιλαμβάνεται %d</item> + <item quantity="other">περιλαμβάνεται %d</item> + </plurals> + <string name="all_applications">Όλες οι εφαρμογές</string> + <string name="exclude_from_tunnel">Εξαίρεση</string> + <string name="include_in_tunnel">Συμπεριλάβετε μόνο</string> + <plurals name="include_n_applications"> + <item quantity="one">Συμπερίληψη %d app</item> + <item quantity="other">Συμπερίληψη %d apps</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Εξαίρεση %d app</item> + <item quantity="other">Εξαίρεση %d apps</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">κάθε δευτερόλεπτο</item> + <item quantity="other">κάθε %d δευτερόλεπτα</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">δευτερόλεπτο</item> + <item quantity="other">δευτερόλεπτα</item> + </plurals> + <string name="use_all_applications">Χρησιμοποίησε όλες τις εφαρμογές</string> + <string name="add_peer">Προσθήκη peer</string> + <string name="addresses">Διευθύνσεις</string> + <string name="applications">Εφαρμογές</string> + <string name="allow_remote_control_intents_summary_off">Οι εξωτερικές εφαρμογές δεν θα μπορούν να αλλάζουν την κατάσταση των tunnel (συνιστάται)</string> + <string name="allow_remote_control_intents_summary_on">Οι εξωτερικές εφαρμογές θα μπορούν να αλλάζουν την κατάσταση των tunnel (για προχωρημένους)</string> + <string name="allow_remote_control_intents_title">Επιτρέψτε τον έλεγχο από άλλες εφαρμογές</string> + <string name="allowed_ips">Επιτρεπόμενες IP</string> + <string name="bad_config_context">%1$s του %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s στο %2$s</string> + <string name="bad_config_explanation_pka">: Πρέπει να είναι θετικό και μικρότερο από 65535</string> + <string name="bad_config_explanation_positive_number">: Πρέπει να είναι θετικό</string> + <string name="bad_config_explanation_udp_port">: Πρέπει να είναι έγκυρος αριθμός θύρας UDP</string> + <string name="bad_config_reason_invalid_key">Μη έγκυρο κλειδί</string> + <string name="bad_config_reason_invalid_number">Μη έγκυρος αριθμός</string> + <string name="bad_config_reason_invalid_value">Μη έγκυρη τιμή</string> + <string name="bad_config_reason_syntax_error">Σφάλμα σύνταξης</string> + <string name="bad_config_reason_unknown_attribute">Άγνωστη ιδιότητα</string> + <string name="bad_config_reason_value_out_of_range">Τιμή εκτός εύρους</string> + <string name="bad_extension_error">Το αρχείο πρέπει να είναι .conf ή .zip</string> + <string name="error_no_qr_found">Δεν βρέθηκε κωδικός QR στην εικόνα</string> + <string name="error_qr_checksum">Αποτυχία επαλήθευσης checksum κωδικού QR</string> + <string name="cancel">Ακύρωση</string> + <string name="create_empty">Δημιουργία από την αρχή</string> + <string name="create_from_file">Εισαγωγή από αρχείο ή αρχειοθήκη</string> + <string name="create_from_qr_code">Σάρωση από κωδικό QR</string> + <string name="dark_theme_title">Χρήση σκούρου θέματος</string> + <string name="delete">Διαγραφή</string> + <string name="dns_servers">Διακομιστές DNS</string> + <string name="dns_search_domains">Αναζήτηση τομέων</string> + <string name="edit">Επεξεργασία</string> + <string name="exclude_private_ips">Εξαίρεση ιδιωτικών IP</string> + <string name="generate_new_private_key">Δημιουργία νέου ιδιωτικού κλειδιού</string> + <string name="generic_error">Άγνωστο σφάλμα «%s»</string> + <string name="hint_automatic">(αυτόματο)</string> + <string name="hint_optional">(προαιρετικό)</string> + <string name="key_contents_error">Μη έγκυροι χαρακτήρες στο κλειδί</string> + <string name="key_length_error">Εσφαλμένο μήκος κλειδιού</string> + <string name="key_length_explanation_binary">: Τα κλειδιά του WireGuard πρέπει να είναι 32 bytes</string> + <string name="log_export_title">Εξαγωγή αρχείου καταγραφής</string> + <string name="log_saver_activity_label">Αποθήκευση αρχείου καταγραφής</string> + <string name="log_viewer_title">Αρχείο καταγραφής</string> + <string name="mtu">MTU</string> + <string name="name">Όνομα</string> + <string name="parse_error_inet_address">Διεύθυνση IP</string> + <string name="parse_error_inet_network">Δίκτυο IP</string> + <string name="parse_error_integer">αριθμός</string> + <string name="peer">Peer</string> + <string name="private_key">Ιδιωτικό κλειδί</string> + <string name="public_key">Δημόσιο κλειδί</string> + <string name="save">Αποθήκευση</string> + <string name="select_all">Επιλογή όλων</string> + <string name="settings">Ρυθμίσεις</string> + <string name="tools_installer_title">Εγκατάσταση εργαλείων γραμμής εντολών</string> + <string name="transfer">Μεταφορά</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tunnel_error_invalid_name">Μη έγκυρο όνομα</string> + <string name="unknown_error">Άγνωστο σφάλμα</string> + <string name="version_summary_unknown">Άγνωστη έκδοση %s</string> + <string name="version_title">WireGuard για Android v%s</string> + <string name="biometric_auth_error">Αποτυχία ελέγχου ταυτότητας</string> + <string name="biometric_auth_error_reason">Αποτυχία ελέγχου ταυτότητας: %s</string> +</resources> diff --git a/ui/src/main/res/values-es-rES/strings.xml b/ui/src/main/res/values-es-rES/strings.xml new file mode 100644 index 00000000..709b183b --- /dev/null +++ b/ui/src/main/res/values-es-rES/strings.xml @@ -0,0 +1,245 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Imposible eliminar %d túnel: %s</item> + <item quantity="other">Imposible eliminar %d túnels: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">Túnel eliminado correctamente %d</item> + <item quantity="other">Túneles eliminados correctamente %d</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d túnel seleccionado</item> + <item quantity="other">%d túneles seleccionados</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Importados %1$d de %2$d túneles</item> + <item quantity="other">Importados %1$d de %2$d túneles</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">%d túnel importado</item> + <item quantity="other">%d túneles importados</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d Aplicación Excluida</item> + <item quantity="other">%d Aplicaciones Excluidas</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d Aplicación Incluida</item> + <item quantity="other">%d Aplicaciones Incluidas</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d excluido</item> + <item quantity="other">%d excluidos</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d incluído</item> + <item quantity="other">%d incluidos</item> + </plurals> + <string name="all_applications">Todas las Aplicaciones</string> + <string name="exclude_from_tunnel">Excluir</string> + <string name="include_in_tunnel">Sólo inclusión</string> + <plurals name="include_n_applications"> + <item quantity="one">Incluir %d aplicación</item> + <item quantity="other">Incluir %d aplicaciones</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Excluir %d aplicación</item> + <item quantity="other">Excluir %d aplicaciones</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">cada segundo</item> + <item quantity="other">cada %d segundos</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">segundo</item> + <item quantity="other">segundos</item> + </plurals> + <string name="use_all_applications">Usar todas las aplicaciones</string> + <string name="add_peer">Añadir par</string> + <string name="addresses">Direcciones</string> + <string name="applications">Aplicaciones</string> + <string name="allow_remote_control_intents_summary_off">Las aplicaciones externas no pueden cambiar el estado de los túneles (recomendado)</string> + <string name="allow_remote_control_intents_summary_on">Las aplicaciones externas pueden cambiar el estado de los túneles (avanzado)</string> + <string name="allow_remote_control_intents_title">Permitir aplicaciones de control remoto</string> + <string name="allowed_ips">IPs permitidas</string> + <string name="bad_config_context">%1$s de %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s en %2$s</string> + <string name="bad_config_explanation_pka">: Debe ser positivo y no más de 65535</string> + <string name="bad_config_explanation_positive_number">: Debe ser positivo</string> + <string name="bad_config_explanation_udp_port">: Debe ser un número válido de puerto UDP</string> + <string name="bad_config_reason_invalid_key">Clave inválida</string> + <string name="bad_config_reason_invalid_number">Número inválido</string> + <string name="bad_config_reason_invalid_value">Valor inválido</string> + <string name="bad_config_reason_missing_attribute">Falta atributo</string> + <string name="bad_config_reason_missing_section">Sección faltante</string> + <string name="bad_config_reason_syntax_error">Error de sintaxis</string> + <string name="bad_config_reason_unknown_attribute">Atributo desconocido</string> + <string name="bad_config_reason_unknown_section">Sección desconocida</string> + <string name="bad_config_reason_value_out_of_range">Valor fuera de rango</string> + <string name="bad_extension_error">El archivo debe ser .conf o .zip</string> + <string name="error_no_qr_found">Código QR no encontrado en la imagen</string> + <string name="error_qr_checksum">Falló la verificación de la suma de comprobación del código QR</string> + <string name="cancel">Cancelar</string> + <string name="config_delete_error">No se puede eliminar el archivo de configuración %s</string> + <string name="config_exists_error">La configuración para “%s” ya existe</string> + <string name="config_file_exists_error">El archivo de configuración “%s” ya existe</string> + <string name="config_not_found_error">Archivo de configuración “%s” no encontrado</string> + <string name="config_rename_error">No se puede renombrar el archivo de configuración “%s”</string> + <string name="config_save_error">No se puede guardar la configuración para “%1$s”: %2$s</string> + <string name="config_save_success">Configuración guardada correctamente para “%s”</string> + <string name="create_activity_title">Crear túnel WireGuard</string> + <string name="create_bin_dir_error">No se puede crear el directorio binario local</string> + <string name="create_downloads_file_error">No se puede crear archivo en el directorio de descargas</string> + <string name="create_empty">Crear de cero</string> + <string name="create_from_file">Importar desde archivo</string> + <string name="create_from_qr_code">Escanear desde código QR</string> + <string name="create_output_dir_error">No se puede crear el directorio de salida</string> + <string name="create_temp_dir_error">No se puede crear la carpeta temporal</string> + <string name="create_tunnel">Crear túnel</string> + <string name="copied_to_clipboard">%s copiado al portapapeles</string> + <string name="dark_theme_summary_off">Actualmente usando tema claro (día)</string> + <string name="dark_theme_summary_on">Actualmente usando tema oscuro (noche)</string> + <string name="dark_theme_title">Usar tema oscuro</string> + <string name="delete">Eliminar</string> + <string name="tv_delete">Seleccione el túnel para eliminar</string> + <string name="tv_select_a_storage_drive">Selecciones un dispositivo de almacenamiento</string> + <string name="tv_no_file_picker">Por favor, instale una herramienta de gestión de archivos para navegar por archivos</string> + <string name="tv_add_tunnel_get_started">Agregue un túnel para empezar</string> + <string name="donate_title">♥ Donar al Proyecto WireGuard</string> + <string name="donate_summary">Todas las contribuciones ayudan</string> + <string name="donate_google_play_disappointment">¡Gracias por apoyar el proyecto WireGuard!\n\nLamentablemente, debido a las políticas de Google, no estamos autorizados a enlazar a la parte de la página web del proyecto donde puedes hacer una donación. ¡Esperemos que puedas averiguar esto!\n\nGracias de nuevo por tu contribución.</string> + <string name="disable_config_export_title">Inhabilitar la exportación de configuración</string> + <string name="disable_config_export_description">Desactivar la exportación de configuración hace que las claves privadas sean menos accesibles</string> + <string name="dns_servers">Servidores DNS</string> + <string name="dns_search_domains">Buscar dominios</string> + <string name="edit">Editar</string> + <string name="endpoint">Endpoint</string> + <string name="error_down">Error al bajar el túnel: %s</string> + <string name="error_fetching_apps">Error al obtener la lista de aplicaciones: %s</string> + <string name="error_root">Por favor, obtén acceso root y vuelve a intentarlo</string> + <string name="error_prepare">Error al preparar el túnel: %s</string> + <string name="error_up">Error al abrir el túnel: %s</string> + <string name="exclude_private_ips">Excluir direcciones privadas</string> + <string name="generate_new_private_key">Generar nueva clave privada</string> + <string name="generic_error">Error desconocido “%s”</string> + <string name="hint_automatic">(auto)</string> + <string name="hint_generated">(generado)</string> + <string name="hint_optional">(opcional)</string> + <string name="hint_optional_discouraged">(opcional, no recomendado)</string> + <string name="hint_random">(aleatorio)</string> + <string name="illegal_filename_error">Nombre de archivo no válido “%s”</string> + <string name="import_error">No se puede importar túnel: %s</string> + <string name="import_from_qr_code">Importar túnel desde código QR</string> + <string name="import_success">Importado “%s”</string> + <string name="interface_title">Interfaz</string> + <string name="key_contents_error">Caracteres incorrectos en la clave</string> + <string name="key_length_error">Longitud de clave incorrecta</string> + <string name="key_length_explanation_base64">Las claves base64 de WireGuard deben tener 44 caracteres (32 bytes)</string> + <string name="key_length_explanation_binary">: Las claves WireGuard deben tener 32 bytes</string> + <string name="key_length_explanation_hex">: Las claves hexadecimales de Wirex deben tener 64 caracteres (32 bytes)</string> + <string name="latest_handshake">Última comunicación</string> + <string name="latest_handshake_ago">hace %s</string> + <string name="listen_port">Puerto de escucha</string> + <string name="log_export_error">No se pudo exportar el registro: %s</string> + <string name="log_export_subject">Archivo de registro WireGuard Android</string> + <string name="log_export_success">Guardado en “%s”</string> + <string name="log_export_title">Exportar archivo de registro</string> + <string name="log_saver_activity_label">Guardar registro</string> + <string name="log_viewer_pref_summary">Los registros pueden ayudar con la depuración</string> + <string name="log_viewer_pref_title">Ver registro de la aplicación</string> + <string name="log_viewer_title">Registro</string> + <string name="logcat_error">No se puede ejecutar logcat: </string> + <string name="module_enabler_disabled_summary">El módulo experimental del kernel puede mejorar el rendimiento</string> + <string name="module_enabler_disabled_title">Habilitar backend del módulo del kernel</string> + <string name="module_enabler_enabled_summary">El backend más lento del espacio de usuario puede mejorar la estabilidad</string> + <string name="module_enabler_enabled_title">Desactivar backend del módulo del kernel</string> + <string name="module_installer_error">Ocurrió un error. Intente de nuevo</string> + <string name="module_installer_initial">El módulo experimental del kernel puede mejorar el rendimiento</string> + <string name="module_installer_not_found">No hay módulos disponibles para tu dispositivo</string> + <string name="module_installer_title">Descargar e instalar el módulo del kernel</string> + <string name="module_installer_working">Descargando e instalando…</string> + <string name="module_version_error">No se puede determinar la versión del módulo del kernel</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Activar un túnel apagará los demás</string> + <string name="multiple_tunnels_summary_on">Múltiples túneles pueden ser activados simultáneamente</string> + <string name="multiple_tunnels_title">Permitir múltiples túneles simultáneos</string> + <string name="name">Nombre</string> + <string name="no_config_error">Intentando abrir un túnel sin configuración</string> + <string name="no_configs_error">No se encontraron configuraciones</string> + <string name="no_tunnels_error">No existen túneles</string> + <string name="parse_error_generic">cadena</string> + <string name="parse_error_inet_address">Dirección IP</string> + <string name="parse_error_inet_endpoint">Endpoint</string> + <string name="parse_error_inet_network">Red IP</string> + <string name="parse_error_integer">número</string> + <string name="parse_error_reason">No se puede analizar %1$s “%2$s”</string> + <string name="peer">Pares</string> + <string name="permission_description">controlar túneles de WireGuard, habilitando y desactivando túneles a su antojo, lo que podría conducir mal al tráfico de Internet</string> + <string name="permission_label">controlar túneles de WireGuard</string> + <string name="persistent_keepalive">Keepalive persistente</string> + <string name="pre_shared_key">Clave precompartida</string> + <string name="pre_shared_key_enabled">activado</string> + <string name="private_key">Clave privada</string> + <string name="public_key">Clave pública</string> + <string name="qr_code_hint">Consejo: generar con `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="restore_on_boot_summary_off">No mostrará túneles habilitados al arrancar</string> + <string name="restore_on_boot_summary_on">Mostrará túneles habilitados al arrancar</string> + <string name="restore_on_boot_title">Restaurar al arrancar</string> + <string name="save">Guardar</string> + <string name="select_all">Seleccionar todo</string> + <string name="settings">Preferencias</string> + <string name="shell_exit_status_read_error">Shell no puede leer el estado de salida</string> + <string name="shell_marker_count_error">Shell esperaba 4 marcadores, recibió %d</string> + <string name="shell_start_error">No se pudo iniciar Shell: %d</string> + <string name="success_application_will_restart">Éxito. La aplicación se reiniciará ahora…</string> + <string name="toggle_all">Cambiar Todos</string> + <string name="toggle_error">Error al cambiar el túnel WireGuard: %s</string> + <string name="tools_installer_already">wg y wg-quick ya están instalados</string> + <string name="tools_installer_failure">No se puede instalar herramientas de línea de comandos (sin root?)</string> + <string name="tools_installer_initial">Instalar herramientas opcionales para el scripting</string> + <string name="tools_installer_initial_magisk">Instalar herramientas opcionales para el scripting como módulo Magisk</string> + <string name="tools_installer_initial_system">Instalar herramientas opcionales para el scripting en la partición del sistema</string> + <string name="tools_installer_success_magisk">wg y wg-quick instalados como un módulo Magisk (requiere reinicio)</string> + <string name="tools_installer_success_system">wg y wg-quick instalados en la partición del sistema</string> + <string name="tools_installer_title">Instalar herramientas de línea de comandos</string> + <string name="tools_installer_working">Instalando wg y wg-quick</string> + <string name="tools_unavailable_error">Herramientas requeridas no disponibles</string> + <string name="transfer">Transferir</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">No se puede crear el dispositivo túnel</string> + <string name="tunnel_config_error">No se puede configurar el túnel (wg-quick devuelto %d)</string> + <string name="tunnel_create_error">No se puede crear el dispositivo túnel: %s</string> + <string name="tunnel_create_success">Túnel creado con éxito “%s”</string> + <string name="tunnel_error_already_exists">Túnel “%s” ya existe</string> + <string name="tunnel_error_invalid_name">Nombre inválido</string> + <string name="tunnel_list_placeholder">Añadir un túnel usando el botón azul de abajo</string> + <string name="tunnel_name">Nombre del túnel</string> + <string name="tunnel_on_error">No se puede activar el túnel (wgTurnOn devolvió %d)</string> + <string name="tunnel_dns_failure">No se puede resolver el nombre de host DNS: “%s”</string> + <string name="tunnel_rename_error">No se puede renombrar túnel: %s</string> + <string name="tunnel_rename_success">Túnel renombrado con éxito a “%s”</string> + <string name="type_name_go_userspace">Ir al espacio de usuario</string> + <string name="type_name_kernel_module">Módulo Kernel</string> + <string name="unknown_error">Error desconocido</string> + <string name="version_summary">%1$s backend %2$s</string> + <string name="version_summary_checking">Comprobando versión de backend %s</string> + <string name="version_summary_unknown">Versión %s desconocida</string> + <string name="version_title">WireGuard para Android -%s</string> + <string name="vpn_not_authorized_error">Servicio VPN no autorizado por el usuario</string> + <string name="vpn_start_error">No se puede iniciar el servicio VPN Android</string> + <string name="zip_export_error">No se pueden exportar túneles: %s</string> + <string name="zip_export_success">Guardado en “%s”</string> + <string name="zip_export_summary">El archivo Zip se guardará en la carpeta de descargas</string> + <string name="zip_export_title">Exportar túneles a archivo zip</string> + <string name="biometric_prompt_zip_exporter_title">Autenticar para exportar túneles</string> + <string name="biometric_prompt_private_key_title">Autenticar para ver la clave privada</string> + <string name="biometric_auth_error">Error de autenticación</string> + <string name="biometric_auth_error_reason">Error de autenticación: %s</string> +</resources> diff --git a/ui/src/main/res/values-et-rEE/strings.xml b/ui/src/main/res/values-et-rEE/strings.xml new file mode 100644 index 00000000..9beaafd9 --- /dev/null +++ b/ui/src/main/res/values-et-rEE/strings.xml @@ -0,0 +1,257 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">%d tunnelit ei saa kustutada: %s</item> + <item quantity="other">%d tunnelit ei saa kustutada: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">%d tunnel kustutatud</item> + <item quantity="other">%d tunnelit kustutatud</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d tunnel valitud</item> + <item quantity="other">%d tunnelit valitud</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Imporditud %1$d tunnel %2$d-st</item> + <item quantity="other">Imporditud %1$d tunnelit %2$d-st</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">Imporditud %d tunnel</item> + <item quantity="other">Imporditud %d tunnelit</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d välistatud rakendus</item> + <item quantity="other">%d välistatud rakendust</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d kaasatud rakendus</item> + <item quantity="other">%d kaasatud rakendust</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d välistatud</item> + <item quantity="other">%d välistatud</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d kaasatud</item> + <item quantity="other">%d kaasatud</item> + </plurals> + <string name="all_applications">Kõik rakendused</string> + <string name="exclude_from_tunnel">Välista</string> + <string name="include_in_tunnel">Kaasa ainult</string> + <plurals name="include_n_applications"> + <item quantity="one">Kaasa %d rakendus</item> + <item quantity="other">Kaasa %d rakendust</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Välista %d rakendus</item> + <item quantity="other">Välista %d rakendust</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">iga sekund</item> + <item quantity="other">iga %d sekundi järel</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">sekund</item> + <item quantity="other">sekundit</item> + </plurals> + <string name="use_all_applications">Kasuta kõiki rakendusi</string> + <string name="add_peer">Lisa partner</string> + <string name="addresses">Aadressid</string> + <string name="applications">Rakendused</string> + <string name="allow_remote_control_intents_summary_off">Välised rakendused ei saa tunneleid lülitada (soovituslik)</string> + <string name="allow_remote_control_intents_summary_on">Välised rakendused saavad tunneleid lülitada (edasijõudnud)</string> + <string name="allow_remote_control_intents_title">Luba kaugjuhtimise rakendused</string> + <string name="allowed_ips">Lubatud IP\'d</string> + <string name="bad_config_context">sektsiooni %1$s asukohas %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s asukohas %2$s</string> + <string name="bad_config_explanation_pka">: Peab olema positiivne ja mitte suurem kui 65535</string> + <string name="bad_config_explanation_positive_number">: Peab olema positiivne</string> + <string name="bad_config_explanation_udp_port">: Peab olema korrektne UDP pordi number</string> + <string name="bad_config_reason_invalid_key">Vigane võti</string> + <string name="bad_config_reason_invalid_number">Vigane arv</string> + <string name="bad_config_reason_invalid_value">Vigane väärtus</string> + <string name="bad_config_reason_missing_attribute">Puudub atribuut</string> + <string name="bad_config_reason_missing_section">Puudub sektsioon</string> + <string name="bad_config_reason_syntax_error">Süntaksiviga</string> + <string name="bad_config_reason_unknown_attribute">Tundmatu atribuut</string> + <string name="bad_config_reason_unknown_section">Tundmatu sektsioon</string> + <string name="bad_config_reason_value_out_of_range">Väärtus lubatud vahemikust väljas</string> + <string name="bad_extension_error">Faililaiend peab olema .conf või .zip</string> + <string name="error_no_qr_found">QR-koodi ei leitud pildilt</string> + <string name="error_qr_checksum">QR-koodi kontrollsumma verifitseerimine ebaõnnestus</string> + <string name="cancel">Tühista</string> + <string name="config_delete_error">Seadistusfaili %s kustutamine ebaõnnestus</string> + <string name="config_exists_error">\"%s\" seadistus on juba olemas</string> + <string name="config_file_exists_error">Seadistusfail \"%s\" on juba olemas</string> + <string name="config_not_found_error">Seadistusfaili \"%s\" ei leitud</string> + <string name="config_rename_error">Seadistusfaili \"%s\" ümbernimetamine ebaõnnestus</string> + <string name="config_save_error">\"%1$s\" seadistuse salvestamine ebaõnnestus: %2$s</string> + <string name="config_save_success">\"%s\" seadistus salvestatud</string> + <string name="create_activity_title">Loo WireGuard tunnel</string> + <string name="create_bin_dir_error">Lokaalse programmfaili kataloogi tekitamine ebaõnnestus</string> + <string name="create_downloads_file_error">Faili loomine allalaadimiste kataloogis ebaõnnestus</string> + <string name="create_empty">Sisesta käsitsi</string> + <string name="create_from_file">Impordi failist või arhiivist</string> + <string name="create_from_qr_code">Skaneeri QR-koodist</string> + <string name="create_output_dir_error">Väljundkataloogi tekitamine ebaõnnestus</string> + <string name="create_temp_dir_error">Ajutise kataloogi tekitamine ebaõnnestus</string> + <string name="create_tunnel">Loo uus tunnel</string> + <string name="copied_to_clipboard">%s kopeeritud lõikelauale</string> + <string name="dark_theme_summary_off">Hetkel kasutusel hele (päevane) teema</string> + <string name="dark_theme_summary_on">Hetkel kasutusel tume (öine) teema</string> + <string name="dark_theme_title">Kasuta tumedat teemat</string> + <string name="delete">Kustuta</string> + <string name="tv_delete">Vali tunnel, mida kustutada</string> + <string name="tv_select_a_storage_drive">Vali salvestusseade</string> + <string name="tv_no_file_picker">Failide vaatamiseks paigalda failide haldusvahend</string> + <string name="tv_add_tunnel_get_started">Alustamiseks lisa uus tunnel</string> + <string name="donate_title">♥ Anneta WireGuard\'i projektile</string> + <string name="donate_summary">Iga panus aitab</string> + <string name="donate_google_play_disappointment">Aitäh, et toetad WireGuard\'i projekti!\n\nKahjuks ei saa me Google\'i eeskirjade tõttu linkida projekti veebilehele, kus saab annetusi teha. Loodetavasti leiad selle ise!\n\n +Aitäh veelkord sinu panuse eest.</string> + <string name="disable_config_export_title">Keela seadistuste eksportimine</string> + <string name="disable_config_export_description">Seadistuste eksportimise keelamine teeb privaatvõtmetele ligipääsu keerulisemaks</string> + <string name="dns_servers">DNS-serverid</string> + <string name="dns_search_domains">DNS-i otsingudomeenid</string> + <string name="edit">Muuda</string> + <string name="endpoint">Lõpp-punkt</string> + <string name="error_down">Viga tunneli väljalülitamisel: %s</string> + <string name="error_fetching_apps">Viga rakenduste nimekirja pärimisel: %s</string> + <string name="error_root">Hangi juurkasutaja õigused ja proovi uuesti</string> + <string name="error_prepare">Viga tunneli ettevalmistamisel: %s</string> + <string name="error_up">Viga tunneli sisselülitamisel: %s</string> + <string name="exclude_private_ips">Keela privaatsed IP\'d</string> + <string name="generate_new_private_key">Tekita uus privaatvõti</string> + <string name="generic_error">Tundmatu \"%s\" viga</string> + <string name="hint_automatic">(automaatne)</string> + <string name="hint_generated">(genereeritud)</string> + <string name="hint_optional">(valikuline)</string> + <string name="hint_optional_discouraged">(valikuline, mittesoovituslik)</string> + <string name="hint_random">(juhuslik)</string> + <string name="illegal_filename_error">Lubamatu failinimi \"%s\"</string> + <string name="import_error">Tunneli importimine ebaõnnestus: %s</string> + <string name="import_from_qr_code">Impordi tunnel QR-koodist</string> + <string name="import_success">Imporditud \"%s\"</string> + <string name="interface_title">Liides</string> + <string name="key_contents_error">Lubamatud sümbolid võtmes</string> + <string name="key_length_error">Sobimatu võtme pikkus</string> + <string name="key_length_explanation_base64">: WireGuard base64 võti peab olema 44 sümbolit (32 baiti) pikk</string> + <string name="key_length_explanation_binary">: WireGuard võtmed peavad olema 32 baiti</string> + <string name="key_length_explanation_hex">: WireGuard hex võti peab olema 64 sümbolit (32 baiti) pikk</string> + <string name="latest_handshake">Viimane kätlus</string> + <string name="latest_handshake_ago">%s tagasi</string> + <string name="listen_port">Kuulamisport</string> + <string name="log_export_error">Logifaili eksportimine ebaõnnestus: %s</string> + <string name="log_export_subject">WireGuard Android logifail</string> + <string name="log_export_success">Salvestatud faili \"%s\"</string> + <string name="log_export_title">Ekspordi logifail</string> + <string name="log_saver_activity_label">Salvesta logi</string> + <string name="log_viewer_pref_summary">Logid võivad aidata vigade uurimisel</string> + <string name="log_viewer_pref_title">Vaata rakenduse logi</string> + <string name="log_viewer_title">Logi</string> + <string name="logcat_error">Viga logcat käivitamisel: </string> + <string name="module_enabler_disabled_summary">Eksperimentaalne tuumamoodul võib jõudlust parandada</string> + <string name="module_enabler_disabled_title">Luba tuumamooduli kasutamine</string> + <string name="module_enabler_enabled_summary">Aeglasem kasutajamaa moodul võib stabiilsust parandada</string> + <string name="module_enabler_enabled_title">Keela tuumamooduli kasutamine</string> + <string name="module_installer_error">Midagi läks valesti. Palun proovi uuesti</string> + <string name="module_installer_initial">Eksperimentaalne tuumamoodul võib jõudlust parandada</string> + <string name="module_installer_not_found">Sinu seadme jaoks ei ole mooduleid saadaval</string> + <string name="module_installer_title">Laadi alla ja paigalda tuumamoodul</string> + <string name="module_installer_working">Allalaadimine ja paigaldamine…</string> + <string name="module_version_error">Tuumamooduli versiooni tuvastamine ebaõnnestus</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Ühe tunneli sisselülitamine lülitab ülejäänud välja</string> + <string name="multiple_tunnels_summary_on">Mitu tunnelit saavad olla samaaegselt sisselülitatud</string> + <string name="multiple_tunnels_title">Luba mitu samaaegset tunnelit</string> + <string name="name">Nimi</string> + <string name="no_config_error">Üritan käivitada tunnelit ilma konfiguratsioonita</string> + <string name="no_configs_error">Seadistusi ei leitud</string> + <string name="no_tunnels_error">Tunneleid ei ole</string> + <string name="parse_error_generic">string</string> + <string name="parse_error_inet_address">IP-aadress</string> + <string name="parse_error_inet_endpoint">lõpp-punkt</string> + <string name="parse_error_inet_network">IP võrk</string> + <string name="parse_error_integer">number</string> + <string name="parse_error_reason">Ei saa töödelda %1$s “%2$s”</string> + <string name="peer">Partner</string> + <string name="permission_description">kontrollida WireGuard tunneleid, neid sisse ja välja lülitades, potentsiaalselt võrguliiklust kõrvale juhtides</string> + <string name="permission_label">kontrollida WireGuard tunneleid</string> + <string name="persistent_keepalive">Püsiv ühendushoidik</string> + <string name="pre_shared_key">Eeljagatud võti</string> + <string name="pre_shared_key_enabled">lubatud</string> + <string name="private_key">Privaatvõti</string> + <string name="public_key">Avalik võti</string> + <string name="qr_code_hint">Vihje: tekita käsuga `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="quick_settings_tile_action">Lülita tunnel</string> + <string name="restore_on_boot_summary_off">Ei lülita seadme käivitumisel lubatud tunneleid sisse</string> + <string name="restore_on_boot_summary_on">Lülitab seadme käivitumisel lubatud tunnelid sisse</string> + <string name="restore_on_boot_title">Taasta seadme käivitumisel</string> + <string name="save">Salvesta</string> + <string name="select_all">Vali kõik</string> + <string name="settings">Seaded</string> + <string name="shell_exit_status_read_error">Kest ei saa lugeda väljundstaatust</string> + <string name="shell_marker_count_error">Kest ootas 4 markerit, saadi %d</string> + <string name="shell_start_error">Kesta käivitumine ebaõnnestus: %d</string> + <string name="success_application_will_restart">Tegevus õnnestus. Rakendus taaskäivitub…</string> + <string name="toggle_all">Vaheta kõik</string> + <string name="toggle_error">WireGuard tunneli lülitamine ebaõnnestus: %s</string> + <string name="tools_installer_already">wg ja wg-quick on juba paigaldatud</string> + <string name="tools_installer_failure">Käsurea tööriistade paigaldamine ebaõnnestus (juurkasutaja õigused puuduvad?)</string> + <string name="tools_installer_initial">Paigalda täiendavad tööriistad skriptimiseks</string> + <string name="tools_installer_initial_magisk">Paigalda täiendavad tööriistad skriptimiseks Magisk moodulina</string> + <string name="tools_installer_initial_system">Paigalda täiendavad tööriistad skriptimiseks süsteemipartitsioonile</string> + <string name="tools_installer_success_magisk">wg ja wg-quick paigaldatud Magisk moodulina (vajalik taaskäivitus)</string> + <string name="tools_installer_success_system">wg ja wg-quick paigaldatud süsteemipartitsioonile</string> + <string name="tools_installer_title">Paigalda käsurea tööriistad</string> + <string name="tools_installer_working">Paigaldatakse wg ja wg-quick</string> + <string name="tools_unavailable_error">Vajalikud tööriistad ei ole saadaval</string> + <string name="transfer">Andmemaht</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">sisse: %1$s, välja: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Tunnelit ei saa luua</string> + <string name="tunnel_config_error">Tunneli seadistamine ebaõnnestus (wg-quick tagastas %d)</string> + <string name="tunnel_create_error">Tunneli loomine ebaõnnestus: %s</string> + <string name="tunnel_create_success">Tunnel \"%s\" lisatud</string> + <string name="tunnel_error_already_exists">Tunnel \"%s\" on juba olemas</string> + <string name="tunnel_error_invalid_name">Sobimatu nimi</string> + <string name="tunnel_list_placeholder">Lisa tunnel alloleva nupu abil</string> + <string name="tunnel_name">Tunneli nimi</string> + <string name="tunnel_on_error">Tunneli sisselülitamine ebaõnnestus (wgTurnOn tagastas %d)</string> + <string name="tunnel_dns_failure">Ei saa lahendada DNS hostinime: \"%s\"</string> + <string name="tunnel_rename_error">Tunneli ümbernimetamine ebaõnnestus: %s</string> + <string name="tunnel_rename_success">Tunnel edukalt ümbernimetatud \"%s\" -iks</string> + <string name="type_name_go_userspace">Go kasutajamaa</string> + <string name="type_name_kernel_module">Tuumamoodul</string> + <string name="unknown_error">Tundmatu viga</string> + <string name="updater_avalable">Rakenduse uuendus on saadaval. Palun uuenda nüüd.</string> + <string name="updater_action">Laadi alla ja uuenda</string> + <string name="updater_rechecking">Uuenduse andmete laadimine…</string> + <string name="updater_download_progress">Uuenduse allalaadimine: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Uuenduse allalaadimine: %s</string> + <string name="updater_installing">Uuenduse paigaldamine…</string> + <string name="updater_failure">Uuendamine ebaõnnestus: %s. Uus katse hetke pärast…</string> + <string name="updater_corrupt_title">Rakendus rikutud</string> + <string name="updater_corrupt_message">See rakendus on rikutud. Palun laadi APK uuesti allpool lingitud veebilehelt. Pärast seda desinstalli rakendus ja installi allalaaditud APK uuesti.</string> + <string name="updater_corrupt_navigate">Ava veebileht</string> + <string name="version_summary">%1$s taustsüsteem %2$s</string> + <string name="version_summary_checking">Kontrollin %s taustsüsteemi versiooni</string> + <string name="version_summary_unknown">Tundmatu %s versioon</string> + <string name="version_title">WireGuard Androidile v%s</string> + <string name="vpn_not_authorized_error">Kasutaja ei lubanud VPN teenust</string> + <string name="vpn_start_error">Androidi VPN teenuse käivitamine ebaõnnestus</string> + <string name="zip_export_error">Tunnelite eksportimine ebaõnnestus: %s</string> + <string name="zip_export_success">Salvestatud faili \"%s\"</string> + <string name="zip_export_summary">Zip fail salvestatakse allalaadimiste kausta</string> + <string name="zip_export_title">Ekspordi tunnelid zip-faili</string> + <string name="biometric_prompt_zip_exporter_title">Autendi tunnelite eksportimiseks</string> + <string name="biometric_prompt_private_key_title">Autendi privaatvõtme vaatamiseks</string> + <string name="biometric_auth_error">Autentimine ebaõnnestus</string> + <string name="biometric_auth_error_reason">Autentimine ebaõnnestus: %s</string> +</resources> diff --git a/ui/src/main/res/values-fa-rIR/strings.xml b/ui/src/main/res/values-fa-rIR/strings.xml new file mode 100644 index 00000000..e9000214 --- /dev/null +++ b/ui/src/main/res/values-fa-rIR/strings.xml @@ -0,0 +1,240 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">حذف %d تونل امکانپذیر نیست: %s</item> + <item quantity="other">حذف %d تونلها امکانپذیر نیست: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">%d تونل با موقیت حذف شد</item> + <item quantity="other">%d تونل با موفقیت حذف شد</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d تونل انتخاب شد</item> + <item quantity="other">%d تونلها انتخاب شدند</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">%1$d از %2$d تونل اضافه شد</item> + <item quantity="other">%1$d از %2$d تونل اضافه شد</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">%d تونل اضافه شد</item> + <item quantity="other">%d از تونل اضافه شد</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d برنامه استثنا</item> + <item quantity="other">%d برنامههای استثنا</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d برنامه مشمول</item> + <item quantity="other">%d برنامههای مشمول</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d استثنا</item> + <item quantity="other">%d استثناها</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">شامل %d</item> + <item quantity="other">شامل %d</item> + </plurals> + <string name="all_applications">همه برنامهها</string> + <string name="exclude_from_tunnel">جدا کردن</string> + <string name="include_in_tunnel">تنها شامل</string> + <plurals name="include_n_applications"> + <item quantity="one">شامل %d برنامه</item> + <item quantity="other">شامل %d برنامه</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">جداکردن %d برنامه</item> + <item quantity="other">جداکردن %d برنامه</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">هر ثانیه</item> + <item quantity="other">هر %d ثانیه</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">ثانیه</item> + <item quantity="other">ثانیه</item> + </plurals> + <string name="use_all_applications">از همه برنامهها استفاده کن</string> + <string name="add_peer">افزودن همتا</string> + <string name="addresses">نشانیها</string> + <string name="applications">برنامهها</string> + <string name="allow_remote_control_intents_summary_off">برنامههای بیرونی تونل ها را عوض نکنند +(توصیه میشود)</string> + <string name="allow_remote_control_intents_summary_on">برنامههای بیرونی تونلها را عوض کنند (پیشرفته)</string> + <string name="allow_remote_control_intents_title">اجازه به برنامههای کنترل از راهدور</string> + <string name="allowed_ips">IPهای مجاز</string> + <string name="bad_config_context">%1$s\'s %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s در %2$s</string> + <string name="bad_config_explanation_pka">: باید مثبت و بیشتر از ۶۵۵۳۵ نباشد</string> + <string name="bad_config_explanation_positive_number">: باید مثبت باشد</string> + <string name="bad_config_explanation_udp_port">: باید یک شماره پورت UDP معتبر باشد</string> + <string name="bad_config_reason_invalid_key">کلید نامعتبر است</string> + <string name="bad_config_reason_invalid_number">شماره نامعتبر است</string> + <string name="bad_config_reason_invalid_value">مقدار نامعتبر است</string> + <string name="bad_config_reason_missing_attribute">مشخصه موجود نیست</string> + <string name="bad_config_reason_missing_section">بخش موجود نیست</string> + <string name="bad_config_reason_syntax_error">خطای نحوی</string> + <string name="bad_config_reason_unknown_attribute">مشخصهٔ نامعلوم</string> + <string name="bad_config_reason_unknown_section">بخش نامعلوم</string> + <string name="bad_config_reason_value_out_of_range">مقدار خارج از محدوده</string> + <string name="bad_extension_error">پرونده باید .conf یا .zip باشد</string> + <string name="error_no_qr_found">کد QR در تصویر یافت نشد</string> + <string name="error_qr_checksum">بررسی checksum کد QR ناموفق بود</string> + <string name="cancel">لغو</string> + <string name="config_delete_error">نمیتوان پرونده پیکربندی %s را حذف کرد</string> + <string name="config_exists_error">پیکربندی برای ”%s” در حال حاضر وجود دارد</string> + <string name="config_file_exists_error">فایل پیکربندی ”%s” در حال حاضر وجود دارد</string> + <string name="config_not_found_error">پرونده پیکربندی “%s” یافت نشد</string> + <string name="config_rename_error">نمیتوان نام پرونده پیکربندی “%s” را تغییر داد</string> + <string name="config_save_error">نمیتوان پیکربندی برای “%1$s”: %2$s را ذخیره کرد</string> + <string name="config_save_success">پیکربندی برای “%s” با موفقیت ذخیره شد</string> + <string name="create_activity_title">ساخت تونل WireGuard</string> + <string name="create_bin_dir_error">نمیتوان دایرکتوری باینری محلی را ایجاد کرد</string> + <string name="create_downloads_file_error">نمیتوان در مسیر بارگیری پروندهای ساخت</string> + <string name="create_empty">ساختن از ابتدا</string> + <string name="create_from_file">واردکردن از طریق پرونده یا آرشیو</string> + <string name="create_from_qr_code">اسکن از کد QR</string> + <string name="create_output_dir_error">نمیتوان دایرکتوری خروجی را ایجاد کرد</string> + <string name="create_temp_dir_error">نمیتوان دایرکتوری موقت محلی را ساخت</string> + <string name="create_tunnel">ساختن تونل</string> + <string name="copied_to_clipboard">%s در کلیپبورد کپی شد</string> + <string name="dark_theme_summary_off">اکنون از پوسته روشن(روز) استفاده میشود</string> + <string name="dark_theme_summary_on">اکنون از پوسته تاریک(شب) استفاده میشود</string> + <string name="dark_theme_title">استفاده از پوسته تاریک</string> + <string name="delete">حذف</string> + <string name="tv_delete">موارد را برای حذف انتخاب کنید</string> + <string name="tv_select_a_storage_drive">حافظه ذخیره سازی موردنظر را انتخاب کنید</string> + <string name="tv_no_file_picker">برای مدیریت پوشه های حافظه، یک برنامه مدیریت فایل نصب کنید</string> + <string name="tv_add_tunnel_get_started">یک پروفایل تونل برای شروع انتخاب کنید</string> + <string name="disable_config_export_title">غیرفعال سازی خروجی گرفتن از کانفیگ ها</string> + <string name="disable_config_export_description">غیرفعال سازی خروجی گرفتن، دسترسی کلیدهای خصوصی را کم می کند</string> + <string name="dns_servers">سرورهای DNS</string> + <string name="dns_search_domains">جستوجوی دامنهها</string> + <string name="edit">ویرایش</string> + <string name="endpoint">نقطه پایان</string> + <string name="error_down">خطا هنگام بستن تونل: %s</string> + <string name="error_fetching_apps">خطا هنگام واکشی فهرست برنامهها: %s</string> + <string name="error_root">لطفا دسترسی روت را فراهمکرده و دوباره تلاش کنید</string> + <string name="error_up">خطا هنگام راهاندازی تونل: %s</string> + <string name="exclude_private_ips">مستثنی کردن IPهای خصوصی</string> + <string name="generate_new_private_key">تولید کلید خصوصی جدید</string> + <string name="generic_error">خطای “%s” ناشناخته</string> + <string name="hint_automatic">(خودکار)</string> + <string name="hint_generated">(تولید شده)</string> + <string name="hint_optional">(دلخواه)</string> + <string name="hint_optional_discouraged">(اختیاری، پیشنهاد نمیشود)</string> + <string name="hint_random">(تصادفی)</string> + <string name="illegal_filename_error">نام پرونده “%s” غیرمجاز است</string> + <string name="import_error">نمیتوان تونل را وارد کرد: %s</string> + <string name="import_from_qr_code">وارد کردن تونل از کد QR</string> + <string name="import_success">“%s” وارد شد</string> + <string name="interface_title">رابط</string> + <string name="key_contents_error">در کلید نویسههای بد وجود دارد</string> + <string name="key_length_error">طول کلید نادرست است</string> + <string name="key_length_explanation_base64">: کلیدهای WireGuard base64 باید دارای ۴۴ نویسه باشند ( ۳۲ بایت)</string> + <string name="key_length_explanation_binary">: کلیدهای WireGuard باید ۳۲ بایت باشند</string> + <string name="key_length_explanation_hex">: کلیدهای هگز WireGuard باید دارای ۶۴ نویسه باشند ( ۳۲ بایت)</string> + <string name="listen_port">شنود پورت</string> + <string name="log_export_error">نمیتوان گزارش رویداد را برونبرد: %s</string> + <string name="log_export_subject">پرونده گزارش رویداد WireGuard اندروید</string> + <string name="log_export_success">ذخیره شد در “%s”</string> + <string name="log_export_title">برونبرد پرونده گزارش رویداد</string> + <string name="log_saver_activity_label">ذخیره گزارش رویداد</string> + <string name="log_viewer_pref_summary">گزارش رویداد شاید به اشکال زدایی کمک کند</string> + <string name="log_viewer_pref_title">نمایش گزارش رویداد برنامه</string> + <string name="log_viewer_title">گزارش رویداد</string> + <string name="logcat_error">نمیتوان logcat را اجرا کرد: </string> + <string name="module_enabler_disabled_summary">ماژول آزمایشیِ کرنل می تواند کارایی را افزایش دهد</string> + <string name="module_enabler_disabled_title">فعالسازی ماژول کرنل ِبک اند</string> + <string name="module_enabler_enabled_summary">فضای کاربری کند ممکن است پایداری را بهبود ببخشد</string> + <string name="module_enabler_enabled_title">غیرفعالسازی پسزمینه واحد هسته</string> + <string name="module_installer_error">مشکلی پیش آمد. لطفا دوباره تلاش کنید</string> + <string name="module_installer_initial">ماژول آزمایشیِ کرنل می تواند کارایی را افزایش دهد</string> + <string name="module_installer_not_found">هیچ واحدی برای دستگاه شما در دسترس نیست</string> + <string name="module_installer_title">واحد هسته را بارگیری و نصب کن</string> + <string name="module_installer_working">در حال بارگیری و نصب…</string> + <string name="module_version_error">نمیتوان نگارش واحد هسته را مشخص کرد</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">روشن کردن یک تونل ، تونل های دیگر را خاموش خواهد کرد</string> + <string name="multiple_tunnels_summary_on">تونل های چندتایی ممکن است استفاده همزمان را فعال کند</string> + <string name="multiple_tunnels_title">تونل چندگانه همزمان</string> + <string name="name">نام</string> + <string name="no_config_error">تلاش برای فعالسازی تونل بدون تنظیمات</string> + <string name="no_configs_error">هیچ پیکربندی یافت نشد</string> + <string name="no_tunnels_error">هیچ تونلی وجود ندارد</string> + <string name="parse_error_generic">رشته</string> + <string name="parse_error_inet_address">نشانی IP</string> + <string name="parse_error_inet_endpoint">نقطه پایان</string> + <string name="parse_error_inet_network">شبکه IP</string> + <string name="parse_error_integer">شماره</string> + <string name="parse_error_reason">نمیتوان %1$s “%2$s” تجزیه کرد</string> + <string name="peer">همتا</string> + <string name="permission_description">کنترل تونل های وایرگارد، فعال و غیرفعال کردن تونل ها، و حتی تغییر مسیر ترافیک اینترنت</string> + <string name="permission_label">کنترل تونلهای WireGuard</string> + <string name="persistent_keepalive">زنده نگهداشتن پیوسته</string> + <string name="pre_shared_key">کلید از پیش تقسیم شده</string> + <string name="pre_shared_key_enabled">فعال شده</string> + <string name="private_key">کلید خصوصی</string> + <string name="public_key">کلید عمومی</string> + <string name="qr_code_hint">نکته: با `qrencode -t ansiutf8 < tunnel.conf` تولید کنید.</string> + <string name="restore_on_boot_summary_off">تونل های فعال در لحظه بالا آمدن سیستم، روشن نخواهند شد</string> + <string name="restore_on_boot_summary_on">تونل های فعال در لحظه بالا آمدن سیستم، روشن خواهند شد</string> + <string name="restore_on_boot_title">بازگردانی در بوت</string> + <string name="save">ذخیره</string> + <string name="select_all">انتخاب همه</string> + <string name="settings">تنظیمات</string> + <string name="shell_exit_status_read_error">پوسته نمی تواند وضعیت خروجی را بخواند</string> + <string name="shell_marker_count_error">شل انتظار داشت 4 نشانگر دریافت شود %d</string> + <string name="shell_start_error">آغاز پوسته شکست خورد: %d</string> + <string name="success_application_will_restart">موفقیت. برنامه اکنون دوباره راهاندازی خواهد شد…</string> + <string name="toggle_all">معکوس کردن همه</string> + <string name="toggle_error">خطا در ضامن تونل WireGuard: %s</string> + <string name="tools_installer_already">wg و wg-quick قبلاً نصب شده اند</string> + <string name="tools_installer_failure">ابزارهای خط-فرمان نصب نمیشود (روت نیستید؟)</string> + <string name="tools_installer_initial">ابزارهای اختیاری را برای اسکریپت نویسی نصب کنید</string> + <string name="tools_installer_initial_magisk">ابزار اختیاری را برای اسکریپت نویسی به عنوان ماژول Magisk نصب کنید</string> + <string name="tools_installer_initial_system">ابزارهای اختیاری را برای اسکریپت نویسی در پارتیشن سیستم نصب کنید</string> + <string name="tools_installer_success_magisk">wg و wg-quick به عنوان پودمان Magisk نصب شدند +( نیاز به راهاندازی دوباره)</string> + <string name="tools_installer_success_system">wg و wg-fast در پارتیشن سیستم نصب شده است</string> + <string name="tools_installer_title">ابزارهای خط فرمان را نصب کنید</string> + <string name="tools_installer_working">در حال نصب wg و wg-quick</string> + <string name="tools_unavailable_error">ابزارهای لازم در دسترس نیست</string> + <string name="transfer">انتقال</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">نمیتوان تونل را ساخت</string> + <string name="tunnel_config_error">ناتوان در کانفیگ و ساخت تونل (wg-quick returned %d)</string> + <string name="tunnel_create_error">نمیتوان تونل را ساخت: %s</string> + <string name="tunnel_create_success">تونل “%s” با موفقیت ساخته شد</string> + <string name="tunnel_error_already_exists">تونل “%s” از قبل وجود دارد</string> + <string name="tunnel_error_invalid_name">نام نامعتبر</string> + <string name="tunnel_name">نام تونل</string> + <string name="tunnel_on_error">روشن کردن تونل امکان پذیر نیست (wgTurnOn برگشت %d )</string> + <string name="tunnel_dns_failure">ناتوان در یافتن DNS نام میزبان: \"%s\"</string> + <string name="tunnel_rename_error">ناتوان در تغییر نام تونل: %s</string> + <string name="tunnel_rename_success">نام تونل با موفقیت تغییر یافت به “%s”</string> + <string name="type_name_go_userspace">رفتن به فضای کاربر</string> + <string name="type_name_kernel_module">واحد هسته</string> + <string name="unknown_error">خطای نامشخص</string> + <string name="version_summary">%1$s بک اند %2$s</string> + <string name="version_summary_checking">در حال بررسی نگارش پسزمینه %s</string> + <string name="version_summary_unknown">نگارش %s ناشناخته</string> + <string name="version_title">WireGuard برای اندروید نگارش %s</string> + <string name="vpn_not_authorized_error">کاربر به سرویس VPN اجازه نداد</string> + <string name="vpn_start_error">نمیتوان سرویس VPN اندروید را آغاز کرد</string> + <string name="zip_export_error">نمیتوان تونلها را برونبرد: %s</string> + <string name="zip_export_success">ذخیره شد در “%s”</string> + <string name="zip_export_summary">پرونده زیپ در پوشه بارگیریها ذخیره خواهد شد</string> + <string name="zip_export_title">برونبری تونلها در پرونده زیپ</string> + <string name="biometric_prompt_zip_exporter_title">برای برونبری تونلها، هویت خود را تایید کنید</string> + <string name="biometric_prompt_private_key_title">برای دیدن کلید خصوصی، هویت خود را تایید کنید</string> + <string name="biometric_auth_error">شکست در تایید هویت</string> + <string name="biometric_auth_error_reason">شکست در تایید هویت: %s</string> +</resources> diff --git a/ui/src/main/res/values-fi-rFI/strings.xml b/ui/src/main/res/values-fi-rFI/strings.xml new file mode 100644 index 00000000..d1a714e5 --- /dev/null +++ b/ui/src/main/res/values-fi-rFI/strings.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="import_total_success"> + <item quantity="one">Tuotiin %d tunneli</item> + <item quantity="other">Tuotiin %d tunnelia</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">joka sekunti</item> + <item quantity="other">%d sekunnin välein</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">sekunti</item> + <item quantity="other">sekuntia</item> + </plurals> + <string name="use_all_applications">Käytä kaikkia sovelluksia</string> + <string name="add_peer">Lisää toinen osapuoli</string> + <string name="addresses">Osoitteet</string> + <string name="applications">Sovellukset</string> + <string name="allowed_ips">Sallitut IP-osoitteet</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_explanation_pka">: Oltava positiivinen ja enintään 65535</string> + <string name="bad_config_explanation_positive_number">: Oltava positiivinen</string> + <string name="bad_config_explanation_udp_port">: Oltava kelvollinen UDP portin numero</string> + <string name="bad_config_reason_invalid_key">Virheellinen avain</string> + <string name="bad_config_reason_invalid_number">Virheellinen luku</string> + <string name="bad_config_reason_invalid_value">Virheellinen arvo</string> + <string name="bad_config_reason_missing_attribute">Attribuutti puuttuu</string> + <string name="bad_config_reason_missing_section">Osio puuttuu</string> + <string name="bad_config_reason_syntax_error">Syntaksivirhe</string> + <string name="bad_config_reason_unknown_attribute">Tuntematon määrite</string> + <string name="bad_config_reason_unknown_section">Tuntematon osio</string> + <string name="bad_config_reason_value_out_of_range">Arvo alueen ulkopuolella</string> + <string name="bad_extension_error">Tiedoston on oltava .conf tai .zip</string> + <string name="cancel">Peruuta</string> + <string name="config_delete_error">Asetustiedostoa %s ei voi poistaa</string> + <string name="config_not_found_error">Asetustiedostoa “%s” ei löydy</string> + <string name="config_rename_error">Asetustiedostoa \"%s\" ei voi nimetä uudelleen</string> + <string name="config_save_success">Asetustiedosto \"%s\" tallennettu onnistuneesti</string> + <string name="create_activity_title">Luo WireGuard Tunnel</string> + <string name="dark_theme_title">Käytä tummaa teemaa</string> + <string name="delete">Poista</string> + <string name="tv_delete">Valitse poistettava tunneli</string> + <string name="dns_servers">DNS palvelimet</string> + <string name="dns_search_domains">Hakudomaini</string> + <string name="edit">Muokkaa</string> + <string name="endpoint">Päätepiste</string> + <string name="exclude_private_ips">Jätä pois yksityiset IP-osoitteet</string> + <string name="generate_new_private_key">Luo uusi yksityinen avain</string> + <string name="generic_error">Tuntematon ”%s” virhe</string> + <string name="hint_automatic">(oletus)</string> + <string name="hint_generated">(generoitu)</string> + <string name="hint_optional">(valinnainen)</string> + <string name="hint_optional_discouraged">(valinnainen, ei suositeltava)</string> + <string name="hint_random">(satunnainen)</string> + <string name="illegal_filename_error">Virheellinen tiedostonimi “%s”</string> + <string name="import_error">Tunnelia \"%s\" ei voitu tuoda</string> + <string name="import_from_qr_code">Tuo tunneli QR-koodista</string> + <string name="import_success">Tuotu ”%s”</string> + <string name="key_contents_error">Virheellinen merkki avaimessa</string> + <string name="key_length_error">Virheellinen avaimen pituus</string> + <string name="key_length_explanation_base64">: WireGuardin base64-avainten pituus on oltava 44 merkkiä (32 tavua)</string> + <string name="key_length_explanation_binary">: WireGuard-avainten on oltava 32 tavua</string> + <string name="key_length_explanation_hex">: WireGuardin base64-avainten pituus on oltava 64 merkkiä (32 tavua)</string> + <string name="listen_port">Kuuntele porttia</string> + <string name="log_viewer_title">Loki</string> + <string name="module_installer_error">Jokin meni pieleen. Yritä uudelleen</string> + <string name="mtu">MTU</string> + <string name="name">Nimi</string> + <string name="no_configs_error">Asetuksia ei löydy</string> + <string name="no_tunnels_error">Tunneleita ei ole</string> + <string name="parse_error_generic">merkkijono</string> + <string name="parse_error_inet_address">IP-osoite</string> + <string name="parse_error_inet_network">IP-verkko</string> + <string name="peer">Osapuoli</string> + <string name="pre_shared_key_enabled">käytössä</string> + <string name="private_key">Yksityinen avain</string> + <string name="public_key">Julkinen avain</string> + <string name="save">Tallenna</string> + <string name="settings">Asetukset</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tunnel_name">Tunnelin nimi</string> + <string name="version_summary_unknown">Tuntematon %s versio</string> + <string name="biometric_auth_error">Varmennusvirhe</string> + <string name="biometric_auth_error_reason">Varmennusvirhe: %s</string> +</resources> diff --git a/ui/src/main/res/values-fr/strings.xml b/ui/src/main/res/values-fr/strings.xml new file mode 100644 index 00000000..d4d4b95f --- /dev/null +++ b/ui/src/main/res/values-fr/strings.xml @@ -0,0 +1,259 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Impossible de supprimer %d tunnel : %s</item> + <item quantity="other">Impossible de supprimer %d tunnels : %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">Suppression réussie du tunnel %d</item> + <item quantity="other">%d tunnels supprimés avec succès</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d tunnel sélectionné</item> + <item quantity="other">%d tunnels sélectionnés</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">%1$d de %2$d tunnels importés</item> + <item quantity="other">%1$d de %2$d tunnels importés</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">%d tunnel importé</item> + <item quantity="other">%d tunnels importés</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d application exclue</item> + <item quantity="other">%d applications exclues</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d application incluse</item> + <item quantity="other">%d applications incluses</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d exclue</item> + <item quantity="other">%d exclues</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d incluse</item> + <item quantity="other">%d incluses</item> + </plurals> + <string name="all_applications">Toutes les Applications</string> + <string name="exclude_from_tunnel">Exclure</string> + <string name="include_in_tunnel">Inclure uniquement</string> + <plurals name="include_n_applications"> + <item quantity="one">Inclure %d application</item> + <item quantity="other">Inclure %d applications</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Exclure %d application</item> + <item quantity="other">Exclure %d applications</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">chaque seconde</item> + <item quantity="other">tous les %d secondes</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">seconde</item> + <item quantity="other">secondes</item> + </plurals> + <string name="use_all_applications">Utiliser toutes les applications</string> + <string name="add_peer">Ajouter un pair</string> + <string name="addresses">Adresses</string> + <string name="applications">Applications</string> + <string name="allow_remote_control_intents_summary_off">Les applications externes ne peuvent pas activer les tunnels (recommandé)</string> + <string name="allow_remote_control_intents_summary_on">Les applications externes peuvent activer les tunnels (avancés)</string> + <string name="allow_remote_control_intents_title">Autoriser les applications de contrôle à distance</string> + <string name="allowed_ips">Adresses IP autorisées</string> + <string name="bad_config_context">%1$s de %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s dans %2$s</string> + <string name="bad_config_explanation_pka">: Doit être positif et ne pas dépasser 65535</string> + <string name="bad_config_explanation_positive_number">: Doit être positif</string> + <string name="bad_config_explanation_udp_port">: Doit être un numéro de port UDP valide</string> + <string name="bad_config_reason_invalid_key">Clef invalide</string> + <string name="bad_config_reason_invalid_number">Numéro invalide</string> + <string name="bad_config_reason_invalid_value">Valeur invalide</string> + <string name="bad_config_reason_missing_attribute">Attribut manquant</string> + <string name="bad_config_reason_missing_section">Section manquante</string> + <string name="bad_config_reason_syntax_error">Erreur de syntaxe</string> + <string name="bad_config_reason_unknown_attribute">Attribut inconnu</string> + <string name="bad_config_reason_unknown_section">Section inconnue</string> + <string name="bad_config_reason_value_out_of_range">Valeur hors limite</string> + <string name="bad_extension_error">Le fichier doit être .conf ou .zip</string> + <string name="error_no_qr_found">Le code QR est introuvable dans l’image</string> + <string name="error_qr_checksum">La vérification de la somme de contrôle du QR code a échoué</string> + <string name="cancel">Annuler</string> + <string name="config_delete_error">Impossible de supprimer le fichier de configuration %s</string> + <string name="config_exists_error">La configuration de « %s » existe déjà</string> + <string name="config_file_exists_error">Le fichier de configuration « %s » existe déjà</string> + <string name="config_not_found_error">Fichier de configuration « %s » introuvable</string> + <string name="config_rename_error">Impossible de renommer le fichier de configuration « %s »</string> + <string name="config_save_error">Impossible d’enregistrer la configuration pour « %1$s » : %2$s</string> + <string name="config_save_success">Configuration enregistrée avec succès pour « %s »</string> + <string name="create_activity_title">Créer un tunnel WireGuard</string> + <string name="create_bin_dir_error">Impossible de créer le répertoire binaire local</string> + <string name="create_downloads_file_error">Impossible de créer le fichier dans le répertoire des téléchargements</string> + <string name="create_empty">Créer à partir de zéro</string> + <string name="create_from_file">Importer depuis un fichier ou une archive</string> + <string name="create_from_qr_code">Importer depuis un QR code</string> + <string name="create_output_dir_error">Impossible de créer le répertoire de sortie</string> + <string name="create_temp_dir_error">Impossible de créer le répertoire temporaire local</string> + <string name="create_tunnel">Créer un tunnel</string> + <string name="copied_to_clipboard">%s copié dans le presse-papier</string> + <string name="dark_theme_summary_off">Utilisation en cours du thème clair (jour)</string> + <string name="dark_theme_summary_on">Utilisation en cours du thème sombre (nuit)</string> + <string name="dark_theme_title">Utilisez le thème sombre</string> + <string name="delete">Supprimer</string> + <string name="tv_delete">Sélectionner le tunnel à supprimer</string> + <string name="tv_select_a_storage_drive">Sélectionner un disque de stockage</string> + <string name="tv_no_file_picker">Veuillez installer un utilitaire de gestion de fichiers pour parcourir les fichiers</string> + <string name="tv_add_tunnel_get_started">Ajouter un tunnel pour commencer</string> + <string name="donate_title">♥ Faire un don au projet WireGuard</string> + <string name="donate_summary">Chaque contribution aide</string> + <string name="donate_google_play_disappointment">Merci de votre soutien au projet WireGuard !\n\nMalheureusement, en raisons des politiques de Google, nous ne pouvons pas vous rediriger vers la page vous permettant de faire un don. Heureusement, vous pouvez le trouver par vous-même !\n\nMerci encore pour votre soutien.</string> + <string name="disable_config_export_title">Désactiver l\'export de configuration</string> + <string name="disable_config_export_description">La désactivation de l\'export de configuration rend les clés privées moins accessibles</string> + <string name="dns_servers">Serveurs DNS</string> + <string name="dns_search_domains">Domaines de recherche DNS</string> + <string name="edit">Modifier</string> + <string name="endpoint">Point de terminaison</string> + <string name="error_down">Erreur lors de la désactivation du tunnel : %s</string> + <string name="error_fetching_apps">Erreur lors de la récupération de la liste d\'applications : %s</string> + <string name="error_root">Veuillez obtenir l\'accès root et essayez à nouveau</string> + <string name="error_prepare">Erreur lors de la préparation du tunnel : %s</string> + <string name="error_up">Erreur lors de la mise en place du tunnel : %s</string> + <string name="exclude_private_ips">Exclure les IPs privées</string> + <string name="generate_new_private_key">Générer une nouvelle clé privée</string> + <string name="generic_error">Erreur inconnue « %s »</string> + <string name="hint_automatic">(auto)</string> + <string name="hint_generated">(généré)</string> + <string name="hint_optional">(facultatif)</string> + <string name="hint_optional_discouraged">(facultatif, non recommandé)</string> + <string name="hint_random">(aléatoire)</string> + <string name="illegal_filename_error">Nom de fichier invalide “%s”</string> + <string name="import_error">Impossible d\'importer le tunnel : %s</string> + <string name="import_from_qr_code">Importer un tunnel depuis un QR-code</string> + <string name="import_success">Importé «%s »</string> + <string name="interface_title">Interface</string> + <string name="key_contents_error">Mauvais caractères dans la clé</string> + <string name="key_length_error">Longueur de la clé incorrecte</string> + <string name="key_length_explanation_base64">: Les clés base64 WireGuard doivent comporter 44 caractères (32 octets)</string> + <string name="key_length_explanation_binary">: Les clés WireGuard doivent comporter 32 octets</string> + <string name="key_length_explanation_hex">: Les clés hexadécimales WireGuard doivent comporter 64 caractères (32 octets)</string> + <string name="latest_handshake">Dernière liaison</string> + <string name="latest_handshake_ago">Il y a %s</string> + <string name="listen_port">Port d\'écoute</string> + <string name="log_export_error">Impossible d\'exporter le journal : %s</string> + <string name="log_export_subject">Fichier journal d\'Android WireGuard</string> + <string name="log_export_success">Enregistré dans « %s »</string> + <string name="log_export_title">Exporter le fichier journal</string> + <string name="log_saver_activity_label">Enregistrer le journal</string> + <string name="log_viewer_pref_summary">Les journaux peuvent aider au débogage</string> + <string name="log_viewer_pref_title">Afficher le journal de l\'application</string> + <string name="log_viewer_title">Journal</string> + <string name="logcat_error">Impossible d\'exécuter logcat : </string> + <string name="module_enabler_disabled_summary">Le module expérimental du noyau peut améliorer les performances</string> + <string name="module_enabler_disabled_title">Activer le backend du module du noyau</string> + <string name="module_enabler_enabled_summary">Le backend plus lent de l\'espace utilisateur peut améliorer la stabilité</string> + <string name="module_enabler_enabled_title">Désactiver le backend du module du noyau</string> + <string name="module_installer_error">Une erreur est survenue. Veuillez réessayer</string> + <string name="module_installer_initial">Le module expérimental du noyau peut améliorer les performances</string> + <string name="module_installer_not_found">Aucun module n\'est disponible pour votre appareil</string> + <string name="module_installer_title">Télécharger et installer le module du noyau</string> + <string name="module_installer_working">Téléchargement et installation en cours…</string> + <string name="module_version_error">Impossible de déterminer la version du module noyau</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Activer un tunnel éteindra les autres</string> + <string name="multiple_tunnels_summary_on">Plusieurs tunnels peuvent être activés simultanément</string> + <string name="multiple_tunnels_title">Autoriser plusieurs tunnels simultanés</string> + <string name="name">Nom</string> + <string name="no_config_error">Tentative d\'établir un tunnel sans configuration</string> + <string name="no_configs_error">Aucune configuration trouvée</string> + <string name="no_tunnels_error">Aucun tunnel existant</string> + <string name="parse_error_generic">chaîne de caractères</string> + <string name="parse_error_inet_address">Adresse IP</string> + <string name="parse_error_inet_endpoint">point de terminaison</string> + <string name="parse_error_inet_network">Réseau IP</string> + <string name="parse_error_integer">nombre</string> + <string name="parse_error_reason">Impossible d\'analyser %1$s “%2$s”</string> + <string name="peer">Pair</string> + <string name="permission_description">contrôler les tunnels WireGuard, activer et désactiver les tunnels à volonté, potentiellement détourner le trafic Internet</string> + <string name="permission_label">contrôler les tunnels WireGuard</string> + <string name="persistent_keepalive">Maintien de connexion permanente</string> + <string name="pre_shared_key">Clé pré-partagée</string> + <string name="pre_shared_key_enabled">activée</string> + <string name="private_key">Clé privée</string> + <string name="public_key">Clé publique</string> + <string name="qr_code_hint">Astuce : générez avec \"qrencode -t ansiutf8 < tunnel.conf\".</string> + <string name="quick_settings_tile_add_title">Ajouter une bascule au volet des paramètres</string> + <string name="quick_settings_tile_add_summary">Cette bascule active le dernier tunnel utilisé</string> + <string name="quick_settings_tile_add_failure">Impossible d\'ajouter la bascule : erreur %d</string> + <string name="quick_settings_tile_action">Activer le tunnel</string> + <string name="restore_on_boot_summary_off">N\'affichera pas les tunnels activés au démarrage</string> + <string name="restore_on_boot_summary_on">Les tunnels activés seront affichés au démarrage</string> + <string name="restore_on_boot_title">Restaurer au démarrage</string> + <string name="save">Enregistrer</string> + <string name="select_all">Tout sélectionner</string> + <string name="settings">Paramètres</string> + <string name="shell_exit_status_read_error">L\'interpréteur de commande ne peut pas lire l\'état de sortie</string> + <string name="shell_marker_count_error">L\'interpréteur de commandes attendait 4 marqueurs, %d reçus</string> + <string name="shell_start_error">L\'interpréteur de commande n\'a pas pu démarrer : %d</string> + <string name="success_application_will_restart">Succès. L\'application va redémarrer maintenant…</string> + <string name="toggle_all">Tout basculer</string> + <string name="toggle_error">Erreur lors de l\'activation du tunnel WireGuard : %s</string> + <string name="tools_installer_already">wg et wg-quick sont déjà installés</string> + <string name="tools_installer_failure">Impossible d\'installer les outils en ligne de commande (pas de root?)</string> + <string name="tools_installer_initial">Installer les outils optionnels pour le script</string> + <string name="tools_installer_initial_magisk">Installer les outils optionnels pour le script en tant que module Magisk</string> + <string name="tools_installer_initial_system">Installer les outils optionnels pour le script dans la partition système</string> + <string name="tools_installer_success_magisk">wg et wg-quick installés en tant que module Magisk (redémarrage requis)</string> + <string name="tools_installer_success_system">wg et wg-quick installés dans la partition système</string> + <string name="tools_installer_title">Installer les outils de ligne de commande</string> + <string name="tools_installer_working">Installation de wg et wg-quick</string> + <string name="tools_unavailable_error">Outils requis indisponibles</string> + <string name="transfer">Données transférées</string> + <string name="transfer_bytes">%d Octets</string> + <string name="transfer_gibibytes">%.2f Go</string> + <string name="transfer_kibibytes">%.2f Ko</string> + <string name="transfer_mibibytes">%.2f Mo</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f To</string> + <string name="tun_create_error">Impossible de créer le périphérique tun</string> + <string name="tunnel_config_error">Impossible de configurer le tunnel (wg-quick a retourné %d)</string> + <string name="tunnel_create_error">Impossible de créer le tunnel : %s</string> + <string name="tunnel_create_success">Tunnel «%s » créé avec succès</string> + <string name="tunnel_error_already_exists">Le tunnel « %s » existe déjà</string> + <string name="tunnel_error_invalid_name">Nom invalide</string> + <string name="tunnel_list_placeholder">Ajoutez un tunnel en utilisant le bouton ci-dessous</string> + <string name="tunnel_name">Nom du tunnel</string> + <string name="tunnel_on_error">Impossible d\'activer le tunnel (wgTurnOn a retourné %d)</string> + <string name="tunnel_dns_failure">Impossible de résoudre le nom d\'hôte DNS: “%s”</string> + <string name="tunnel_rename_error">Impossible de renommer le tunnel : %s</string> + <string name="tunnel_rename_success">Tunnel renommé avec succès en «%s »</string> + <string name="type_name_go_userspace">Implémentation Go en espace utilisateur</string> + <string name="type_name_kernel_module">Module noyau</string> + <string name="unknown_error">Erreur inconnue</string> + <string name="updater_avalable">Une mise à jour est disponible. Veuillez mettre l\'application à jour.</string> + <string name="updater_action">Télécharger & Mettre à jour</string> + <string name="updater_rechecking">Récupération des métadonnées de la mise à jour…</string> + <string name="updater_download_progress">Téléchargement de la mise à jour : %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Téléchargement de la mise à jour : %s</string> + <string name="updater_installing">Installation de la mise à jour…</string> + <string name="updater_failure">Erreur lors de la mise à jour : %s. Nous réessaierons dans un instant…</string> + <string name="updater_corrupt_title">Application corrompue</string> + <string name="updater_corrupt_message">Cette application est corrompue. Veuillez réinstaller le fichier APK depuis le site ci-dessous. Ensuite, désinstallez cette application puis réinstallez-la à l\'aide du fichier APK téléchargé.</string> + <string name="updater_corrupt_navigate">Accéder au site internet</string> + <string name="version_summary">%1$s backend %2$s</string> + <string name="version_summary_checking">Vérification de la version %s du backend</string> + <string name="version_summary_unknown">Version %s inconnue</string> + <string name="version_title">WireGuard pour Android v%s</string> + <string name="vpn_not_authorized_error">Service VPN non autorisé par l\'utilisateur</string> + <string name="vpn_start_error">Impossible de démarrer le service VPN Android</string> + <string name="zip_export_error">Impossible d\'exporter les tunnels : %s</string> + <string name="zip_export_success">Enregistré dans « %s »</string> + <string name="zip_export_summary">L\'archive zip sera sauvegardée dans le dossier de téléchargement</string> + <string name="zip_export_title">Exporter les tunnels vers le fichier zip</string> + <string name="biometric_prompt_zip_exporter_title">S\'authentifier pour exporter des tunnels</string> + <string name="biometric_prompt_private_key_title">S\'authentifier pour voir la clé privée</string> + <string name="biometric_auth_error">Échec de l\'authentification</string> + <string name="biometric_auth_error_reason">Échec de l\'authentification : %s</string> +</resources> diff --git a/ui/src/main/res/values-hi-rIN/strings.xml b/ui/src/main/res/values-hi-rIN/strings.xml new file mode 100644 index 00000000..737f83a8 --- /dev/null +++ b/ui/src/main/res/values-hi-rIN/strings.xml @@ -0,0 +1,219 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">%d टनल हटाने में असमर्थ: %s</item> + <item quantity="other">%d टनलस को हटाने में असमर्थ: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">%d टनल को सफलतापूर्वक हटा दिया गया</item> + <item quantity="other">%d टनलस को सफलतापूर्वक हटा दिया गया</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d टनल चयनित</item> + <item quantity="other">%d टनलस का चयन किया गया</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">आयातित %d %d टनल</item> + <item quantity="other">आयातित %d %d टनलस</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">आयातित %d टनल</item> + <item quantity="other">आयातित %d टनलस</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d बहिष्कृत अनुप्रयोग</item> + <item quantity="other">%d बहिष्कृत अनुप्रयोग</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d ऐप्स शामिल</item> + <item quantity="other">%d ऐप्स शामिल किये गए</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d अपवर्जित</item> + <item quantity="other">%d अपवर्जित</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d शामिल</item> + <item quantity="other">%d शामिल</item> + </plurals> + <string name="all_applications">सभी एप्लीकेशन</string> + <string name="exclude_from_tunnel">वर्जित</string> + <string name="include_in_tunnel">केवल शामिल करें</string> + <plurals name="include_n_applications"> + <item quantity="one">%d ऐप शामिल करें</item> + <item quantity="other">%d ऐप्स शामिल करें</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">%d ऐप को बाहर करें</item> + <item quantity="other">%d ऐप्स को बाहर करें</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">हर सेकंड</item> + <item quantity="other">हर %d सेकंड्स</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">सेकंड</item> + <item quantity="other">सेकंड्स</item> + </plurals> + <string name="use_all_applications">सभी ऐप्स का उपयोग करें</string> + <string name="add_peer">पीयर जोड़ें</string> + <string name="addresses">एड्रेससैस</string> + <string name="applications">ऍप्लिकेशन्स</string> + <string name="allow_remote_control_intents_summary_off">बाहरी ऐप्स टनल्स को चालू नहीं कर सकते (अनुशंसित)</string> + <string name="allow_remote_control_intents_summary_on">बाहरी ऐप्स टनल्स को चालू कर सकते है (एडवांस्ड)</string> + <string name="allow_remote_control_intents_title">रिमोट कंट्रोल ऐप्स की अनुमति दें</string> + <string name="allowed_ips">अनुमत आईपी</string> + <string name="bad_config_explanation_pka">: सकारात्मक होना चाहिए और 65535 से अधिक नहीं होना चाहिए</string> + <string name="bad_config_explanation_positive_number">: सकारात्मक होना चाहिए</string> + <string name="bad_config_explanation_udp_port">: एक वैध यूडीपी पोर्ट नंबर होना चाहिए</string> + <string name="bad_config_reason_invalid_key">अमान्य चाबी</string> + <string name="bad_config_reason_invalid_number">अमान्य संख्या</string> + <string name="bad_config_reason_invalid_value">अमान्य मूल्य</string> + <string name="bad_config_reason_missing_attribute">गुम विशेषता</string> + <string name="bad_config_reason_missing_section">छूटा हुआ भाग</string> + <string name="bad_config_reason_syntax_error">वक्य रचना त्रुटि</string> + <string name="bad_config_reason_unknown_attribute">अज्ञात एट्रिब्यूट</string> + <string name="bad_config_reason_unknown_section">अज्ञात एट्रिब्यूट </string> + <string name="bad_config_reason_value_out_of_range">मूल्य सीमा से बाहर</string> + <string name="bad_extension_error">फ़ाइल .conf या .zip होनी चाहिए</string> + <string name="error_no_qr_found">छवि में क्यूआर कोड नहीं मिला</string> + <string name="cancel">रद्द</string> + <string name="config_delete_error">कॉन्फ़िगरेशन फ़ाइल %s को नहीं हटा सकता</string> + <string name="config_exists_error">“%s” के लिए कॉन्फ़िगरेशन पहले से मौजूद है</string> + <string name="config_file_exists_error">कॉन्फ़िगरेशन फ़ाइल “%s” पहले से मौजूद है</string> + <string name="config_not_found_error">कॉन्फ़िगरेशन फ़ाइल “%s” नहीं मिली</string> + <string name="config_rename_error">कॉन्फ़िगरेशन फ़ाइल “%s” का नाम नहीं बदल सकता</string> + <string name="config_save_error">“%1$s” के लिए कॉन्फ़िगरेशन को नहीं बचा सकता: %2$s</string> + <string name="config_save_success">“%s” के लिए सफलतापूर्वक सहेजा गया कॉन्फ़िगरेशन</string> + <string name="create_activity_title">वायरगार्ड टनल बनाएं</string> + <string name="create_bin_dir_error">स्थानीय बाइनरी निर्देशिका नहीं बना सकते</string> + <string name="create_downloads_file_error">डाउनलोड निर्देशिका में फ़ाइल नहीं बना सकते</string> + <string name="create_empty">शुरू से बनाएँ</string> + <string name="create_from_file">फ़ाइल या संग्रह से आयात करें</string> + <string name="create_from_qr_code">QR कोड स्कैन करें</string> + <string name="create_output_dir_error">आउटपुट निर्देशिका नहीं बना सकता</string> + <string name="create_temp_dir_error">स्थानीय अस्थायी निर्देशिका नहीं बना सकते</string> + <string name="create_tunnel">टनल बनाए</string> + <string name="dark_theme_summary_off">अभी प्रकाश (दिन) थीम का उपयोग कर रहे हैं</string> + <string name="dark_theme_summary_on">अभी डार्क (रात) थीम का उपयोग कर रहे हैं</string> + <string name="dark_theme_title">डार्क थीम का इस्तेमाल करें</string> + <string name="delete">हटाएं</string> + <string name="dns_servers">डीएनएस सर्वर</string> + <string name="edit">संपादित करें</string> + <string name="endpoint">अंतिम</string> + <string name="error_down">टनल को लाने में त्रुटि: %s</string> + <string name="error_fetching_apps">ऐप्स सूची लाने में त्रुटि: %s</string> + <string name="error_root">कृपया रूट एक्सेस प्राप्त करें और पुनः प्रयास करें</string> + <string name="error_up">टनल को लाने में त्रुटि: %s</string> + <string name="exclude_private_ips">निजी आईपी को छोड़ दें</string> + <string name="generate_new_private_key">नई प्राइवेट की उत्पन्न करें</string> + <string name="generic_error">अज्ञात “%s” त्रुटि</string> + <string name="hint_automatic">(ऑटो)</string> + <string name="hint_generated">(उत्पन्न)</string> + <string name="hint_optional">(ऐच्छिक)</string> + <string name="hint_optional_discouraged">(वैकल्पिक, अनुशंसित नहीं)</string> + <string name="hint_random">(क्रमरहित)</string> + <string name="illegal_filename_error">अवैध फ़ाइल नाम “%s”</string> + <string name="import_error">टनल को आयात करने में असमर्थ: %s</string> + <string name="import_from_qr_code">क्यूआर कोड से टनल को आयात करें</string> + <string name="import_success">आयातित “%s”</string> + <string name="interface_title">इंटरफेस</string> + <string name="key_contents_error">चाबी में खराब वर्ण</string> + <string name="key_length_error">चाबी की लम्बाई गलत </string> + <string name="key_length_explanation_base64">: वायरगार्ड बेस 64 कीज़ में 44 अक्षर (32 बाइट्स) होने चाहिए</string> + <string name="key_length_explanation_binary">: वायरगार्ड कीज 32 बाइट होनी चाहिए</string> + <string name="key_length_explanation_hex">: वायरगार्ड हेक्स कीज़ 64 अक्षरों की होनी चाहिए (32 बाइट्स)</string> + <string name="listen_port">पोर्ट सूने</string> + <string name="log_export_error">लॉग निर्यात करने में असमर्थ: %s</string> + <string name="log_export_subject">WireGuard एंड्राइड लॉग फ़ाइल</string> + <string name="log_export_success">“%s” में सहेजा गया</string> + <string name="log_export_title">लॉग फ़ाइल निर्यात करें</string> + <string name="log_saver_activity_label">लॉग सहेजे</string> + <string name="log_viewer_pref_summary">लॉग डीबगिंग में सहायता कर सकते हैं</string> + <string name="log_viewer_pref_title">एप्लिकेशन लॉग देखें</string> + <string name="log_viewer_title">लॉग</string> + <string name="logcat_error">लॉगकैट चलाने में असमर्थ: </string> + <string name="module_enabler_disabled_summary">प्रयोगात्मक कर्नेल मॉड्यूल प्रदर्शन में सुधार कर सकता है</string> + <string name="module_enabler_disabled_title">कर्नेल मॉड्यूल बैकएंड सक्षम करें</string> + <string name="module_enabler_enabled_summary">धीमे यूजरस्पेस बैकएंड में स्थिरता में सुधार हो सकता है</string> + <string name="module_enabler_enabled_title">कर्नेल मॉड्यूल बैकएंड को अक्षम करें</string> + <string name="module_installer_error">कुछ गलत हो गया। कृपया पुन: प्रयास करें</string> + <string name="module_installer_initial">प्रयोगात्मक कर्नेल मॉड्यूल प्रदर्शन में सुधार कर सकता है</string> + <string name="module_installer_not_found">आपके डिवाइस के लिए कोई मॉड्यूल उपलब्ध नहीं हैं</string> + <string name="module_installer_title">कर्नेल मॉड्यूल डाउनलोड और इंस्टॉल करें</string> + <string name="module_installer_working">डाउनलोड कर रहा है और स्थापित कर रहा है…</string> + <string name="module_version_error">कर्नेल मॉड्यूल संस्करण निर्धारित करने में असमर्थ</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">एक टनल को चालू करने से अन्य बंद हो जाएंगे</string> + <string name="multiple_tunnels_summary_on">एक साथ कई टनलस को चालू किया जा सकता है</string> + <string name="multiple_tunnels_title">एक साथ कई टनलस को अनुमति दें</string> + <string name="name">नाम</string> + <string name="no_config_error">बिना किसी कॉन्फ़िगरेशन के एक टनल को लाने की कोशिश करना</string> + <string name="no_configs_error">कोई कॉन्फ़िगरेशन नहीं मिला</string> + <string name="no_tunnels_error">कोई टनल मौजूद नहीं है</string> + <string name="parse_error_generic">पाठ</string> + <string name="parse_error_inet_address">आईपी पता</string> + <string name="parse_error_inet_endpoint">समाप्त</string> + <string name="parse_error_inet_network">आईपी नेटवर्क</string> + <string name="parse_error_integer">संख्या</string> + <string name="parse_error_reason">%1$s “%2$s” को पार्स नहीं कर सकता</string> + <string name="peer">पीयर</string> + <string name="permission_description">वायरगार्ड टनल्स को नियंत्रित करना, टनल्स को सक्षम और अक्षम करना, संभवतः इंटरनेट ट्रैफ़िक को गलत तरीके से अक्षम करना है</string> + <string name="permission_label">वायरगार्ड टनलस को नियंत्रित करें</string> + <string name="persistent_keepalive">लगातार जिंदा रहो</string> + <string name="pre_shared_key">प्री-शेयर्ड कीस</string> + <string name="pre_shared_key_enabled">सक्षम</string> + <string name="private_key">निजी कीस</string> + <string name="public_key">सार्वजनिक कीस</string> + <string name="qr_code_hint">सुझाव: `qrencode -t ansiutf8 < tunnel.conf` के साथ उत्पन्न करो</string> + <string name="restore_on_boot_summary_off">बूट पर सक्षम टनलस को नहीं लाएगा</string> + <string name="restore_on_boot_summary_on">बूट पर सक्षम टनलस को लाएगा</string> + <string name="restore_on_boot_title">बूट पर पुनर्स्थापित करें</string> + <string name="save">सहेजें</string> + <string name="select_all">सभी का चयन करे</string> + <string name="settings">सेटिंग्स</string> + <string name="shell_exit_status_read_error">शेल बाहर निकलने की स्थिति नहीं पढ़ सकता</string> + <string name="shell_marker_count_error">शेल ने 4 मार्करों की अपेक्षा की, %d प्राप्त किया</string> + <string name="shell_start_error">शेल शुरू करने में विफल: %d</string> + <string name="success_application_will_restart">सफलता। एप्लीकेशन अब पुनः आरंभ होगा…</string> + <string name="toggle_all">सबको स्विच करे</string> + <string name="toggle_error">वायरगार्ड टनल टॉगल करने में त्रुटि: %s</string> + <string name="tools_installer_already">wg और wg-quick पहले से इंस्टॉल हैं</string> + <string name="tools_installer_failure">कमांड-लाइन टूल स्थापित करने में असमर्थ (कोई रूट नहीं)</string> + <string name="tools_installer_initial">स्क्रिप्टिंग के लिए वैकल्पिक उपकरण स्थापित करें</string> + <string name="tools_installer_initial_magisk">Magisk मॉड्यूल के रूप में स्क्रिप्टिंग के लिए वैकल्पिक उपकरण स्थापित करें</string> + <string name="tools_installer_initial_system">सिस्टम विभाजन में स्क्रिप्टिंग के लिए वैकल्पिक उपकरण स्थापित करें</string> + <string name="tools_installer_success_magisk">wg और wg-quick को मैजिक मॉड्यूल के रूप में स्थापित किया गया है (रिबूट आवश्यक)</string> + <string name="tools_installer_success_system">wg और wg-quick सिस्टम विभाजन में स्थापित है</string> + <string name="tools_installer_title">कमांड लाइन उपकरण स्थापित करें</string> + <string name="tools_installer_working">Wg और wg-quick इंस्टॉल करना</string> + <string name="tools_unavailable_error">आवश्यक उपकरण अनुपलब्ध हैं</string> + <string name="transfer">स्थानांतरण</string> + <string name="tun_create_error">ट्यून डिवाइस बनाने में असमर्थ</string> + <string name="tunnel_config_error">टनल को कॉन्फ़िगर करने में असमर्थ (wg-quick लौटा %d)</string> + <string name="tunnel_create_error">टनल बनाने में असमर्थ: %s</string> + <string name="tunnel_create_success">सफलतापूर्वक बनाया गया टनल “%s”</string> + <string name="tunnel_error_already_exists">टनल “%s” पहले से मौजूद है</string> + <string name="tunnel_error_invalid_name">गलत नाम</string> + <string name="tunnel_name">टनल का नाम</string> + <string name="tunnel_on_error">टनल चालू करने में असमर्थ (wgTurnOn लौटा %d)</string> + <string name="tunnel_rename_error">टनल का नाम बदलने में असमर्थ: %s</string> + <string name="tunnel_rename_success">सफलतापूर्वक टनल का नाम बदलकर “%s” कर दिया गया</string> + <string name="type_name_go_userspace">userspace पे जाए </string> + <string name="type_name_kernel_module">कर्नेल मॉड्यूल</string> + <string name="unknown_error">अज्ञात त्रुटि</string> + <string name="version_summary">%1$s बैकएंड %2$s</string> + <string name="version_summary_checking">%s बैकएंड संस्करण की जाँच कर रहा है</string> + <string name="version_summary_unknown">अज्ञात %s संस्करण</string> + <string name="version_title">WireGuard for Android v%s</string> + <string name="vpn_not_authorized_error">वीपीएन सेवा उपयोगकर्ता द्वारा अधिकृत नहीं है</string> + <string name="vpn_start_error">एंड्रॉयड वीपीएन सेवा प्रारंभ करने में असमर्थ</string> + <string name="zip_export_error">टनल का निर्यात करने में असमर्थ: %s</string> + <string name="zip_export_success">“%s” पर सहेजा गया</string> + <string name="zip_export_summary">ज़िप फ़ाइल को डाउनलोड फ़ोल्डर में सहेजा जाएगा</string> + <string name="zip_export_title">जिप फाइल के लिए टनल को एक्सपोर्ट करें</string> + <string name="biometric_prompt_zip_exporter_title">टनल्स के निर्यात के लिए प्रमाणित करें</string> + <string name="biometric_prompt_private_key_title">प्राइवेट की देखने के लिए प्रमाणित करें</string> + <string name="biometric_auth_error">प्रमाणीकरण विफलता</string> + <string name="biometric_auth_error_reason">प्रमाणीकरण विफल: %s</string> +</resources> diff --git a/ui/src/main/res/values-hi/strings.xml b/ui/src/main/res/values-hi/strings.xml index fa65c119..1566d7a0 100644 --- a/ui/src/main/res/values-hi/strings.xml +++ b/ui/src/main/res/values-hi/strings.xml @@ -96,10 +96,10 @@ <string name="module_installer_title">कर्नेल मॉड्यूल डाउनलोड और इंस्टॉल करें</string> <string name="module_installer_working">डाउनलोड कर रहा है और स्थापित कर रहा है…</string> <string name="module_installer_error">कुछ गलत हो गया। कृपया पुन: प्रयास करें</string> - <string name="module_disabler_disabled_title">कर्नेल मॉड्यूल बैकएंड सक्षम करें</string> - <string name="module_disabler_disabled_summary">प्रयोगात्मक कर्नेल मॉड्यूल प्रदर्शन में सुधार कर सकता है</string> - <string name="module_disabler_enabled_title">कर्नेल मॉड्यूल बैकएंड को अक्षम करें</string> - <string name="module_disabler_enabled_summary">धीमे यूजरस्पेस बैकएंड में स्थिरता में सुधार हो सकता है</string> + <string name="module_enabler_disabled_title">कर्नेल मॉड्यूल बैकएंड सक्षम करें</string> + <string name="module_enabler_disabled_summary">प्रयोगात्मक कर्नेल मॉड्यूल प्रदर्शन में सुधार कर सकता है</string> + <string name="module_enabler_enabled_title">कर्नेल मॉड्यूल बैकएंड को अक्षम करें</string> + <string name="module_enabler_enabled_summary">धीमे यूजरस्पेस बैकएंड में स्थिरता में सुधार हो सकता है</string> <string name="mtu">MTU</string> <string name="multiple_tunnels_title">एक साथ कई टनलस को अनुमति दें</string> <string name="multiple_tunnels_summary_on">एक साथ कई टनलस को चालू किया जा सकता है</string> @@ -154,7 +154,6 @@ <string name="tunnel_create_success">सफलतापूर्वक बनाया गया टनल “%s”</string> <string name="tunnel_error_already_exists">टनल “%s” पहले से मौजूद है</string> <string name="tunnel_error_invalid_name">गलत नाम</string> - <string name="tunnel_list_placeholder">नीले बटन का उपयोग करके एक टनल को जोड़ें</string> <string name="tunnel_name">टनल का नाम</string> <string name="tunnel_on_error">टनल चालू करने में असमर्थ (wgTurnOn लौटा %d)</string> <string name="tunnel_rename_error">टनल का नाम बदलने में असमर्थ: %s</string> @@ -162,7 +161,7 @@ <string name="type_name_go_userspace">userspace पे जाए </string> <string name="type_name_kernel_module">कर्नेल मॉड्यूल</string> <string name="unknown_error">अज्ञात त्रुटि</string> - <string name="version_summary">%1$s बैकएंड v%2$s</string> + <string name="version_summary">%1$s बैकएंड %2$s</string> <string name="version_summary_checking">%s बैकएंड संस्करण की जाँच कर रहा है</string> <string name="version_summary_unknown">अज्ञात %s संस्करण</string> <string name="version_title">WireGuard for Android v%s</string> diff --git a/ui/src/main/res/values-hu-rHU/strings.xml b/ui/src/main/res/values-hu-rHU/strings.xml new file mode 100644 index 00000000..bdc19fe3 --- /dev/null +++ b/ui/src/main/res/values-hu-rHU/strings.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="all_applications">Minden alkalmazás</string> + <string name="exclude_from_tunnel">Kizárás</string> + <string name="addresses">Címek</string> + <string name="applications">Alkalmazások</string> + <string name="allowed_ips">Engedélyezett IP-k</string> + <string name="bad_config_reason_invalid_key">Érvénytelen kulcs</string> + <string name="bad_config_reason_invalid_value">Helytelen érték</string> + <string name="bad_config_reason_syntax_error">Szintaktikai hiba</string> + <string name="bad_config_reason_unknown_section">Ismeretlen szekció</string> + <string name="bad_config_reason_value_out_of_range">Az érték a megengedett tartományon kívül van</string> + <string name="bad_extension_error">A fájl .conf vagy .zip legyen</string> + <string name="config_not_found_error">Konfigurációs állomány \"%s\" nem található meg</string> + <string name="dns_servers">DNS szerverek</string> + <string name="dns_search_domains">Domain keresés</string> + <string name="edit">Szerkesztés</string> + <string name="endpoint">Végpont</string> + <string name="log_saver_activity_label">Log mentése</string> + <string name="log_viewer_pref_title">Alkalmazás log megtekintése</string> + <string name="name">Név</string> + <string name="parse_error_inet_address">IP cím</string> + <string name="parse_error_inet_network">IP hálózat</string> + <string name="parse_error_integer">szám</string> + <string name="pre_shared_key_enabled">engedélyezve</string> + <string name="public_key">Nyilvános kulcs</string> + <string name="quick_settings_tile_action">Csatorna átkapcsolása</string> + <string name="save">Mentés</string> + <string name="select_all">Összes kijelölése</string> + <string name="settings">Beállítások</string> + <string name="toggle_all">Összes átkapcsolása</string> + <string name="tunnel_name">Csatorna neve</string> + <string name="type_name_kernel_module">Kernel modul</string> + <string name="unknown_error">Ismeretlen hiba</string> + <string name="updater_corrupt_navigate">Weboldal megnyitása</string> +</resources> diff --git a/ui/src/main/res/values-id/strings.xml b/ui/src/main/res/values-in/strings.xml index 866e7ed4..d7dd3d1a 100644 --- a/ui/src/main/res/values-id/strings.xml +++ b/ui/src/main/res/values-in/strings.xml @@ -18,13 +18,38 @@ <plurals name="set_excluded_applications"> <item quantity="other">%d Aplikasi Dikecualikan</item> </plurals> + <plurals name="set_included_applications"> + <item quantity="other">%d Aplikasi Disertakan</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="other">%d dikecualikan</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="other">%d termasuk</item> + </plurals> + <string name="all_applications">Semua aplikasi</string> + <string name="exclude_from_tunnel">Kecualikan</string> + <string name="include_in_tunnel">Berlaku hanya untuk</string> + <plurals name="include_n_applications"> + <item quantity="other">Aplikasi %d yang disertakan</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="other">Aplikasi %d yang disertakan</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="other">setiap 10 detik</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="other">detik</item> + </plurals> + <string name="use_all_applications">Gunakan semua aplikasi</string> <string name="add_peer">Tambahkan rekan</string> <string name="addresses">Alamat</string> - <string name="allow_remote_control_intents_summary_off">Apl eksternal tidak dapat mengalihkan terowongan (disarankan)</string> - <string name="allow_remote_control_intents_summary_on">Apl eksternal dapat mengalihkan terowongan (lanjutan)</string> - <string name="allow_remote_control_intents_title">Izinkan apl kendali jarak jauh</string> + <string name="applications">Aplikasi</string> + <string name="allow_remote_control_intents_summary_off">Aplikasi eksternal tidak dapat mengalihkan tunnel (disarankan)</string> + <string name="allow_remote_control_intents_summary_on">Apl eksternal dapat mengalihkan tunnel (lanjutan)</string> + <string name="allow_remote_control_intents_title">Izinkan kendali jarak jauh</string> <string name="allowed_ips">IP diizinkan</string> - <string name="app_name">WireGuard</string> <string name="bad_config_context">%1$s %2$s</string> <string name="bad_config_context_top_level">%s</string> <string name="bad_config_error">%1$s di %2$s</string> @@ -41,6 +66,8 @@ <string name="bad_config_reason_unknown_section">Bagian tak diketahui</string> <string name="bad_config_reason_value_out_of_range">Nilai di luar rentang</string> <string name="bad_extension_error">Berkas harus .conf atau .zip</string> + <string name="error_no_qr_found">Kode QR tidak ditemukan dalam gambar</string> + <string name="error_qr_checksum">Verifikasi ceksum kode QR gagal</string> <string name="cancel">Batalkan</string> <string name="config_delete_error">Tidak dapat menghapus berkas konfigurasi %s</string> <string name="config_exists_error">Sudah ada konfigurasi untuk “%s”</string> @@ -58,17 +85,25 @@ <string name="create_output_dir_error">Tidak dapat membuat direktori keluaran</string> <string name="create_temp_dir_error">Tidak dapat membuat direktori lokal sementara</string> <string name="create_tunnel">Buat tunel</string> + <string name="copied_to_clipboard">%s Disalin ke Clipboard</string> <string name="dark_theme_summary_off">Saat ini menggunakan tema terang (siang)</string> <string name="dark_theme_summary_on">Saat ini menggunakan tema gelap (malam)</string> <string name="dark_theme_title">Gunakan tema gelap</string> <string name="delete">Hapus</string> + <string name="tv_delete">Pilih tunnel yang akan dihapus</string> + <string name="tv_select_a_storage_drive">Pilih lokasi penyimpanan</string> + <string name="tv_no_file_picker">Silakan instal aplikasi file manajer untuk memilih file</string> + <string name="tv_add_tunnel_get_started">Tambahkan tunnel untuk memulai</string> + <string name="disable_config_export_title">Nonaktifkan ekspor konfigurasi</string> + <string name="disable_config_export_description">Menonaktifkan ekspor konfigurasi akan membuat kunci pribadi sulit diakses</string> <string name="dns_servers">Server DNS</string> + <string name="dns_search_domains">Cari domain</string> <string name="edit">Edit</string> - <string name="endpoint">Titik akhir</string> - <string name="error_down">Kesalahan mengurangi tunel: %s</string> + <string name="endpoint">Endpoint</string> + <string name="error_down">Kesalahan pada tunel: %s</string> <string name="error_fetching_apps">Kesalahan mengambil daftar aplikasi: %s</string> <string name="error_root">Izinkan akses root dan coba lagi</string> - <string name="error_up">Kesalahan menambahkan tunel: %s</string> + <string name="error_up">Kesalahan pada tunel: %s</string> <string name="exclude_private_ips">Kecualikan IP pribadi</string> <string name="generate_new_private_key">Buat kunci privat baru</string> <string name="generic_error">Eror “%s” Tidak diketahui</string> @@ -97,10 +132,10 @@ <string name="log_viewer_pref_title">Lihat log aplikasi</string> <string name="log_viewer_title">Log</string> <string name="logcat_error">Tidak bisa menjalankan logcat: </string> - <string name="module_disabler_disabled_summary">Modul kernel eksperimental dapat meningkatkan kinerja</string> - <string name="module_disabler_disabled_title">Aktifkan backend modul kernel</string> - <string name="module_disabler_enabled_summary">Backend userspace yang lebih lambat dapat meningkatkan stabilitas</string> - <string name="module_disabler_enabled_title">Nonaktifkan backend modul kernel</string> + <string name="module_enabler_disabled_summary">Modul kernel eksperimental dapat meningkatkan kinerja</string> + <string name="module_enabler_disabled_title">Aktifkan backend modul kernel</string> + <string name="module_enabler_enabled_summary">Backend userspace yang lebih lambat dapat meningkatkan stabilitas</string> + <string name="module_enabler_enabled_title">Nonaktifkan backend modul kernel</string> <string name="module_installer_error">Ada yang salah. Silakan coba lagi</string> <string name="module_installer_initial">Modul kernel eksperimental dapat meningkatkan kinerja</string> <string name="module_installer_not_found">Tidak tersedia modul untuk perangkat anda</string> @@ -126,6 +161,7 @@ <string name="permission_label">Kontrol tunel WireGuard</string> <string name="persistent_keepalive">Keepalive persisten</string> <string name="pre_shared_key">Kunci Pra-bersama</string> + <string name="pre_shared_key_enabled">diaktifkan</string> <string name="private_key">Kunci pribadi</string> <string name="public_key">Kunci publik</string> <string name="qr_code_hint">Tips: generate dengan `qrencode -t ansiutf8 < tunnel.conf`.</string> @@ -164,15 +200,15 @@ <string name="tunnel_create_success">Tunel “%s” Berhasil dibuat</string> <string name="tunnel_error_already_exists">Tunel “%s” sudah ada</string> <string name="tunnel_error_invalid_name">Nama tidak valid</string> - <string name="tunnel_list_placeholder">Tambahkan tunel menggunakan tombol +</string> <string name="tunnel_name">Nama tunel</string> <string name="tunnel_on_error">Tidak dapat mengaktifkan tunel (wgTurnOn %d dikembalikan)</string> + <string name="tunnel_dns_failure">Tidak bisa mencari nama host DNS \"%s\"</string> <string name="tunnel_rename_error">Nama tunel %s tidak bisa diganti</string> <string name="tunnel_rename_success">Berhasil mengganti nama tunnel ke “%s”</string> <string name="type_name_go_userspace">Ke userspace</string> <string name="type_name_kernel_module">Modul kernel</string> <string name="unknown_error">Eror tidak diketahui</string> - <string name="version_summary">%1$s backend v%2$s</string> + <string name="version_summary">%1$s dengan v%2$s</string> <string name="version_summary_checking">Mengecek versi backend %s</string> <string name="version_summary_unknown">Versi %s Tidak diketahui</string> <string name="version_title">WireGuard untuk Android v%s</string> diff --git a/ui/src/main/res/values-it/strings.xml b/ui/src/main/res/values-it/strings.xml index 61e6186a..8fba2592 100644 --- a/ui/src/main/res/values-it/strings.xml +++ b/ui/src/main/res/values-it/strings.xml @@ -24,13 +24,45 @@ <item quantity="one">%d applicazione esclusa</item> <item quantity="other">%d applicazioni escluse</item> </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d applicazione inclusa</item> + <item quantity="other">%d applicazioni incluse</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d escluse</item> + <item quantity="other">%d escluse</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d inclusa</item> + <item quantity="other">%d incluse</item> + </plurals> + <string name="all_applications">Tutte le applicazioni</string> + <string name="exclude_from_tunnel">Escludi</string> + <string name="include_in_tunnel">Includi solo</string> + <plurals name="include_n_applications"> + <item quantity="one">Includi %d applicazione</item> + <item quantity="other">Includi %d applicazioni</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Escludi %d applicazione</item> + <item quantity="other">Escludi %d applicazioni</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">ogni secondo</item> + <item quantity="other">ogni %d secondi</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">secondo</item> + <item quantity="other">secondi</item> + </plurals> + <string name="use_all_applications">Utilizza tutte le applicazioni</string> <string name="add_peer">Aggiungi peer</string> <string name="addresses">Indirizzi</string> - <string name="allow_remote_control_intents_summary_off">Le applicazioni esterne non possono attivare tunnel (consigliato)</string> - <string name="allow_remote_control_intents_summary_on">Le applicazioni esterne possono attivare tunnel (avanzato)</string> - <string name="allow_remote_control_intents_title">Consenti applicazioni di controllo remoto</string> + <string name="applications">Applicazioni</string> + <string name="allow_remote_control_intents_summary_off">Le app esterne non possono attivare tunnel (consigliato)</string> + <string name="allow_remote_control_intents_summary_on">Le app esterne possono attivare tunnel (avanzato)</string> + <string name="allow_remote_control_intents_title">Consenti app di controllo remoto</string> <string name="allowed_ips">IP consentiti</string> - <string name="app_name">WireGuard</string> <string name="bad_config_context">%2$s di %1$s</string> <string name="bad_config_context_top_level">%s</string> <string name="bad_config_error">%1$s in %2$s</string> @@ -47,6 +79,8 @@ <string name="bad_config_reason_unknown_section">Sezione sconosciuta</string> <string name="bad_config_reason_value_out_of_range">Valore fuori scala</string> <string name="bad_extension_error">Il file deve essere .conf o .zip</string> + <string name="error_no_qr_found">Codice QR non trovato nell\'immagine</string> + <string name="error_qr_checksum">Verifica checksum del codice QR fallita</string> <string name="cancel">Annulla</string> <string name="config_delete_error">Impossibile eliminare il file di configurazione %s</string> <string name="config_exists_error">La configurazione per “%s” esiste già</string> @@ -60,27 +94,39 @@ <string name="create_downloads_file_error">Impossibile creare il file nella cartella di download</string> <string name="create_empty">Crea da zero</string> <string name="create_from_file">Importa da file o archivio</string> - <string name="create_from_qr_code">Scansione da codice QR</string> + <string name="create_from_qr_code">Scansiona da codice QR</string> <string name="create_output_dir_error">Impossibile creare la cartella di output</string> <string name="create_temp_dir_error">Impossibile creare la cartella locale temporanea</string> <string name="create_tunnel">Crea tunnel</string> + <string name="copied_to_clipboard">%s copiato negli appunti</string> <string name="dark_theme_summary_off">Stai usando il tema chiaro (giorno)</string> <string name="dark_theme_summary_on">Stai usando il tema scuro (notte)</string> <string name="dark_theme_title">Usa tema scuro</string> <string name="delete">Elimina</string> + <string name="tv_delete">Seleziona il tunnel da eliminare</string> + <string name="tv_select_a_storage_drive">Seleziona un\'unità di archiviazione</string> + <string name="tv_no_file_picker">Installa un\'utilità di gestione file per sfogliare i file</string> + <string name="tv_add_tunnel_get_started">Aggiungi un tunnel per iniziare</string> + <string name="donate_title">♥ Dona al progetto WireGuard</string> + <string name="donate_summary">Ogni contributo aiuta</string> + <string name="donate_google_play_disappointment">Grazie per il sostegno al progetto WireGuard!\n\nPurtroppo, a causa delle politiche di Google, non siamo autorizzati a linkare la pagina del progetto dove puoi fare una donazione. Speriamo che la troverai!\n\nGrazie ancora per il tuo contributo.</string> + <string name="disable_config_export_title">Disattiva esportazione config</string> + <string name="disable_config_export_description">Disabilitare l\'esportazione della configurazione rende le chiavi private meno accessibili</string> <string name="dns_servers">Server DNS</string> + <string name="dns_search_domains">Domini di ricerca DNS</string> <string name="edit">Modifica</string> <string name="endpoint">Endpoint</string> <string name="error_down">Errore di disattivazione del tunnel: %s</string> <string name="error_fetching_apps">Errore di recupero dell\'elenco applicazioni: %s</string> <string name="error_root">Accedi come root e riprova</string> + <string name="error_prepare">Errore di preparazione del tunnel: %s</string> <string name="error_up">Errore di attivazione del tunnel: %s</string> <string name="exclude_private_ips">Escludi IP privati</string> <string name="generate_new_private_key">Genera nuova chiave privata</string> <string name="generic_error">Errore “%s” sconosciuto</string> <string name="hint_automatic">(auto)</string> - <string name="hint_generated">(generato)</string> - <string name="hint_optional">(facoltativo)</string> + <string name="hint_generated">(generata)</string> + <string name="hint_optional">(facoltativa)</string> <string name="hint_optional_discouraged">(facoltativo, non consigliato)</string> <string name="hint_random">(casuale)</string> <string name="illegal_filename_error">Nome file “%s” non valido</string> @@ -93,6 +139,8 @@ <string name="key_length_explanation_base64">: le chiavi base64 di WireGuard devono essere di 44 caratteri (32 byte)</string> <string name="key_length_explanation_binary">: le chiavi di WireGuard devono essere di 32 byte</string> <string name="key_length_explanation_hex">: le chiavi esadecimali di WireGuard devono essere di 64 caratteri (32 byte)</string> + <string name="latest_handshake">Ultima negoziazione</string> + <string name="latest_handshake_ago">%s fa</string> <string name="listen_port">Porta in ascolto</string> <string name="log_export_error">Impossibile esportare il log: %s</string> <string name="log_export_subject">File di log WireGuard Android</string> @@ -103,10 +151,10 @@ <string name="log_viewer_pref_title">Visualizza log dell\'applicazione</string> <string name="log_viewer_title">Log</string> <string name="logcat_error">Impossibile eseguire logcat: </string> - <string name="module_disabler_disabled_summary">Il modulo sperimentale del kernel può migliorare le prestazioni</string> - <string name="module_disabler_disabled_title">Abilita il backend del modulo del kernel</string> - <string name="module_disabler_enabled_summary">Il backend in userspace più lento potrebbe migliorare la stabilità</string> - <string name="module_disabler_enabled_title">Disabilita il backend del modulo del kernel</string> + <string name="module_enabler_disabled_summary">Il modulo sperimentale del kernel può migliorare le prestazioni</string> + <string name="module_enabler_disabled_title">Abilita il backend del modulo del kernel</string> + <string name="module_enabler_enabled_summary">Il backend in userspace più lento potrebbe migliorare la stabilità</string> + <string name="module_enabler_enabled_title">Disabilita il backend del modulo del kernel</string> <string name="module_installer_error">Qualcosa non ha funzionato. Riprova</string> <string name="module_installer_initial">Il modulo sperimentale del kernel può migliorare le prestazioni</string> <string name="module_installer_not_found">Nessun modulo disponibile per il tuo dispositivo</string> @@ -132,9 +180,14 @@ <string name="permission_label">controlla tunnel WireGuard</string> <string name="persistent_keepalive">Tieni sempre attivo</string> <string name="pre_shared_key">Chiave condivisa (PSK)</string> + <string name="pre_shared_key_enabled">abilitata</string> <string name="private_key">Chiave privata</string> <string name="public_key">Chiave pubblica</string> <string name="qr_code_hint">Suggerimento: genera con `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="quick_settings_tile_add_title">Aggiungi riquadro ale impostazioni rapide</string> + <string name="quick_settings_tile_add_summary">La scorciatoia attiva/disattiva il tunnel più recente</string> + <string name="quick_settings_tile_add_failure">Impossibile aggiungere la scorciatoia: errore %d</string> + <string name="quick_settings_tile_action">Attiva/disattiva tunnel</string> <string name="restore_on_boot_summary_off">Non attiverà i tunnel configurati all\'avvio</string> <string name="restore_on_boot_summary_on">Attiverà i tunnel configurati all\'avvio</string> <string name="restore_on_boot_title">Ripristina all\'avvio</string> @@ -170,15 +223,26 @@ <string name="tunnel_create_success">Tunnel “%s” creato correttamente</string> <string name="tunnel_error_already_exists">Il tunnel “%s” esiste già</string> <string name="tunnel_error_invalid_name">Nome non valido</string> - <string name="tunnel_list_placeholder">Aggiungi un tunnel usando il pulsante blu</string> + <string name="tunnel_list_placeholder">Aggiungi un tunnel usando il pulsante sotto</string> <string name="tunnel_name">Nome tunnel</string> <string name="tunnel_on_error">Impossibile attivare il tunnel (wgTurnOn ha risposto %d)</string> + <string name="tunnel_dns_failure">Impossibile risolve il nome di domino: \"%s\"</string> <string name="tunnel_rename_error">Impossibile rinominare il tunnel: %s</string> <string name="tunnel_rename_success">Tunnel rinominato correttamente in “%s”</string> <string name="type_name_go_userspace">Spazio utente Go</string> <string name="type_name_kernel_module">Modulo kernel</string> <string name="unknown_error">Errore sconosciuto</string> - <string name="version_summary">Backend %1$s v%2$s</string> + <string name="updater_avalable">È disponibile un aggiornamento dell\'app. Si prega di aggiornare ora.</string> + <string name="updater_action">Scarica e aggiorna</string> + <string name="updater_rechecking">Recupero metadati aggiornamento…</string> + <string name="updater_download_progress">Scaricamento aggiornamento: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Scaricamento aggiornamento: %s</string> + <string name="updater_installing">Installazione aggiornamento…</string> + <string name="updater_failure">Aggiornamento fallito: %s. Riprovo momentaneamente…</string> + <string name="updater_corrupt_title">Applicazione danneggiata</string> + <string name="updater_corrupt_message">Questa applicazione è danneggiata. Riscarica l\'APK dal sito collegato qui sotto. Dopo, disinstalla questa applicazione e reinstallala dall\'APK scaricato.</string> + <string name="updater_corrupt_navigate">Apri sito web</string> + <string name="version_summary">Backend %1$s %2$s</string> <string name="version_summary_checking">Controllo versione backend %s</string> <string name="version_summary_unknown">Versione %s sconosciuta</string> <string name="version_title">WireGuard per Android v%s</string> diff --git a/ui/src/main/res/values-ja/strings.xml b/ui/src/main/res/values-ja/strings.xml index fff388f7..26e99af3 100644 --- a/ui/src/main/res/values-ja/strings.xml +++ b/ui/src/main/res/values-ja/strings.xml @@ -18,13 +18,38 @@ <plurals name="set_excluded_applications"> <item quantity="other">除外アプリ %d 個</item> </plurals> + <plurals name="set_included_applications"> + <item quantity="other">トンネリング対象アプリ %d 個</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="other">対象外アプリ %d 個</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="other">トンネル対象アプリ %d 個</item> + </plurals> + <string name="all_applications">すべてのアプリがトンネル対象</string> + <string name="exclude_from_tunnel">トンネルしない</string> + <string name="include_in_tunnel">トンネルする</string> + <plurals name="include_n_applications"> + <item quantity="other">%d アプリが対象</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="other">%d アプリを除外</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="other">%d 秒ごと</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="other">秒</item> + </plurals> + <string name="use_all_applications">全アプリをトンネル対象にする</string> <string name="add_peer">ピアを追加する</string> <string name="addresses">アドレス</string> + <string name="applications">アプリ</string> <string name="allow_remote_control_intents_summary_off">外部アプリはトンネルを制御できない(推奨)</string> <string name="allow_remote_control_intents_summary_on">外部アプリにトンネルの制御を許可(上級者向け)</string> <string name="allow_remote_control_intents_title">外部アプリからの制御</string> <string name="allowed_ips">Allowed IPs</string> - <string name="app_name">WireGuard</string> <string name="bad_config_context">%1$s の %2$s</string> <string name="bad_config_context_top_level">%s</string> <string name="bad_config_error">%2$s 中の %1$s</string> @@ -41,6 +66,8 @@ <string name="bad_config_reason_unknown_section">未知のセクション</string> <string name="bad_config_reason_value_out_of_range">範囲外の値</string> <string name="bad_extension_error">ファイルの拡張子は .conf か .zip です</string> + <string name="error_no_qr_found">QRコードが見つかりません</string> + <string name="error_qr_checksum">QRコードのチェックサムの確認に失敗しました</string> <string name="cancel">キャンセル</string> <string name="config_delete_error">設定ファイル %s を削除できません</string> <string name="config_exists_error">\"%s\" の定義はすでに存在します</string> @@ -58,16 +85,28 @@ <string name="create_output_dir_error">出力ディレクトリを作成できません</string> <string name="create_temp_dir_error">ローカルに一時ディレクトリを作成できません</string> <string name="create_tunnel">トンネルを作成</string> + <string name="copied_to_clipboard">%s をクリップボードにコピーしました</string> <string name="dark_theme_summary_off">ライトテーマを使用中</string> <string name="dark_theme_summary_on">ダークテーマを使用中</string> <string name="dark_theme_title">ダークテーマを使用する</string> <string name="delete">削除</string> + <string name="tv_delete">削除するトンネルを選択</string> + <string name="tv_select_a_storage_drive">ストレージを選択</string> + <string name="tv_no_file_picker">ファイルを参照するにはファイル管理アプリをインストールしてください</string> + <string name="tv_add_tunnel_get_started">トンネルを追加して開始する</string> + <string name="donate_title">♥ WireGuard プロジェクトに寄付する</string> + <string name="donate_summary">すべての貢献が役立ちます</string> + <string name="donate_google_play_disappointment">WireGuard プロジェクトを支援していただきありがとうございます！\n\n残念ながら、Google のポリシーの影響で寄付のページへのリンクを記載することができません。見つけていただけることを願っています。\n\nもう一度、あなたの貢献に深く感謝します。</string> + <string name="disable_config_export_title">設定のエクスポートを無効にする</string> + <string name="disable_config_export_description">設定のエクスポートを無効にすると、秘密鍵にアクセスされにくくなります</string> <string name="dns_servers">DNS サーバ</string> + <string name="dns_search_domains">サーチドメイン</string> <string name="edit">編集</string> <string name="endpoint">エンドポイント</string> <string name="error_down">トンネル停止時エラー: %s</string> <string name="error_fetching_apps">アプリ一覧取得エラー: %s</string> <string name="error_root">root 権限を取得して再試行してください</string> + <string name="error_prepare">トンネル準備中エラー: %s</string> <string name="error_up">トンネル起動時エラー: %s</string> <string name="exclude_private_ips">プライベート IP アドレスを除外</string> <string name="generate_new_private_key">新しい秘密鍵を生成する</string> @@ -79,7 +118,7 @@ <string name="hint_random">(ランダム)</string> <string name="illegal_filename_error">不正なファイル名 “%s”</string> <string name="import_error">トンネル設定をインポートできません: %s</string> - <string name="import_from_qr_code">QR コードからトンネル設定をインポートできません</string> + <string name="import_from_qr_code">QR コードからトンネル設定をインポートします</string> <string name="import_success">“%s” をインポートしました</string> <string name="interface_title">インターフェース</string> <string name="key_contents_error">鍵に不正な文字があります</string> @@ -87,6 +126,8 @@ <string name="key_length_explanation_base64">: WireGuard base64 鍵は44文字 (32バイト) でなければなりません</string> <string name="key_length_explanation_binary">: WireGuard 鍵は32バイトでなければなりません</string> <string name="key_length_explanation_hex">: WireGuard hex 鍵は64文字 (32バイト) でなければなりません</string> + <string name="latest_handshake">直近のハンドシェイク</string> + <string name="latest_handshake_ago">%s 前</string> <string name="listen_port">Listen ポート</string> <string name="log_export_error">ログをエクスポートできません: %s</string> <string name="log_export_subject">WireGuard Android ログファイル</string> @@ -97,10 +138,10 @@ <string name="log_viewer_pref_title">アプリケーションログを表示</string> <string name="log_viewer_title">ログ</string> <string name="logcat_error">logcat を実行できません: </string> - <string name="module_disabler_disabled_summary">カーネルモジュールは実験的ですがパフォーマンスが向上する可能性があります。</string> - <string name="module_disabler_disabled_title">カーネルモジュールバックエンドの有効化</string> - <string name="module_disabler_enabled_summary">ユーザースペースバックエンドは低速ですが安定しています。</string> - <string name="module_disabler_enabled_title">カーネルモジュールバックエンドの無効化</string> + <string name="module_enabler_disabled_summary">カーネルモジュールは実験的ですがパフォーマンスが向上する可能性があります。</string> + <string name="module_enabler_disabled_title">カーネルモジュールバックエンドの有効化</string> + <string name="module_enabler_enabled_summary">ユーザースペースバックエンドは低速ですが安定しています。</string> + <string name="module_enabler_enabled_title">カーネルモジュールバックエンドの無効化</string> <string name="module_installer_error">失敗しました. 再度実行してみてください</string> <string name="module_installer_initial">実験的カーネルモジュールはパフォーマンスが向上する場合があります</string> <string name="module_installer_not_found">このデバイス用のモジュールは利用できません</string> @@ -126,9 +167,14 @@ <string name="permission_label">WireGuard トンネルの制御</string> <string name="persistent_keepalive">持続的キープアライブ</string> <string name="pre_shared_key">事前共有鍵</string> + <string name="pre_shared_key_enabled">有効</string> <string name="private_key">秘密鍵</string> <string name="public_key">公開鍵</string> <string name="qr_code_hint">Tip: `qrencode -t ansiutf8 < tunnel.conf` で生成できます</string> + <string name="quick_settings_tile_add_title">クイック設定パネルを追加</string> + <string name="quick_settings_tile_add_summary">ショートカットタイルを使用すると、最新のトンネルに切り替わります</string> + <string name="quick_settings_tile_add_failure">ショートカットタイルを追加できません: エラー %d</string> + <string name="quick_settings_tile_action">トンネルを切り替え</string> <string name="restore_on_boot_summary_off">起動時にトンネルを有効化しない</string> <string name="restore_on_boot_summary_on">起動時に、前回有効だったトンネルを有効化する</string> <string name="restore_on_boot_title">起動時に復元</string> @@ -139,7 +185,7 @@ <string name="shell_marker_count_error">シェルは 4 マーカーを期待していますが、 %d マーカーを受け取りました</string> <string name="shell_start_error">シェルの起動に失敗しました: %d</string> <string name="success_application_will_restart">成功。アプリケーションは再起動します…</string> - <string name="toggle_all">すべてのトンネルの状態を切り替え</string> + <string name="toggle_all">すべての状態を切り替え</string> <string name="toggle_error">WireGuard トンネルの状態切り替え時にエラー: %s</string> <string name="tools_installer_already">wg および wg-quick はインストール済みです</string> <string name="tools_installer_failure">コマンドラインツールをインストールできません(root権限がない？)</string> @@ -164,15 +210,26 @@ <string name="tunnel_create_success">トンネル \"%s\" を作成しました</string> <string name="tunnel_error_already_exists">トンネル “%s” はすでに存在します</string> <string name="tunnel_error_invalid_name">不正な名前</string> - <string name="tunnel_list_placeholder">青ボタンでトンネルを追加</string> + <string name="tunnel_list_placeholder">下のボタンを使用してトンネルを追加</string> <string name="tunnel_name">トンネル名</string> <string name="tunnel_on_error">トンネルを有効にできません (wgTurnOn が %d を返却)</string> + <string name="tunnel_dns_failure">DNSホスト名を解決できませんでした: “%s”</string> <string name="tunnel_rename_error">トンネル名を変更できません: %s</string> <string name="tunnel_rename_success">トンネル名を “%s” に変更しました</string> <string name="type_name_go_userspace">Go ユーザースペース</string> <string name="type_name_kernel_module">カーネルモジュール</string> <string name="unknown_error">未知のエラー</string> - <string name="version_summary">%1$s backend v%2$s</string> + <string name="updater_avalable">アプリを更新できます。今すぐ更新してください。</string> + <string name="updater_action">ダウンロードして更新</string> + <string name="updater_rechecking">更新のメタデータを取得しています…</string> + <string name="updater_download_progress">更新のダウンロード中: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">更新のダウンロード中: %s</string> + <string name="updater_installing">更新をインストール中…</string> + <string name="updater_failure">更新に失敗しました: %s. 一定時間後に再試行します…</string> + <string name="updater_corrupt_title">アプリケーションが破損しています</string> + <string name="updater_corrupt_message">このアプリケーションは破損しています。下記のリンク先のウェブサイトから APK を再ダウンロードしてください。その後、このアプリケーションをアンインストールし、ダウンロードした APK を再インストールしてください。</string> + <string name="updater_corrupt_navigate">ウェブサイトを開く</string> + <string name="version_summary">%1$s バックエンド %2$s</string> <string name="version_summary_checking">%s バックエンドのバージョンを確認中</string> <string name="version_summary_unknown">未知の %s バージョン</string> <string name="version_title">WireGuard for Android v%s</string> diff --git a/ui/src/main/res/values-ko-rKR/strings.xml b/ui/src/main/res/values-ko-rKR/strings.xml new file mode 100644 index 00000000..0f42c7a8 --- /dev/null +++ b/ui/src/main/res/values-ko-rKR/strings.xml @@ -0,0 +1,223 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="other">%d개의 터널을 삭제할 수 없습니다: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="other">%d개의 터널을 성공적으로 삭제했습니다</item> + </plurals> + <plurals name="delete_title"> + <item quantity="other">%d개의 터널이 선택되었습니다</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="other">%2$d개의 터널 중에서 %1$d개를 가져왔습니다</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="other">%d개의 터널을 가져왔습니다</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="other">%d개의 앱이 제외됨</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="other">%d개의 앱이 포함됨</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="other">%d개 제외됨</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="other">%d개 포함됨</item> + </plurals> + <string name="all_applications">모든 앱</string> + <string name="exclude_from_tunnel">제외</string> + <string name="include_in_tunnel">이것만 포함</string> + <plurals name="include_n_applications"> + <item quantity="other">%d개의 앱을 포함함</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="other">%d개의 앱을 제외함</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="other">%d초 마다</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="other">초</item> + </plurals> + <string name="use_all_applications">모든 앱을 사용</string> + <string name="add_peer">피어 추가</string> + <string name="addresses">주소</string> + <string name="applications">앱</string> + <string name="allow_remote_control_intents_summary_off">다른 앱이 터널을 조작할 수 없음 (권장)</string> + <string name="allow_remote_control_intents_summary_on">다른 앱이 터널을 조작할 수 있음 (상급자용)</string> + <string name="allow_remote_control_intents_title">앱을 원격으로 조정할 수 있음</string> + <string name="allowed_ips">허용된 IP</string> + <string name="bad_config_context">%1$s의 %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%2$s의 %1$s</string> + <string name="bad_config_explanation_pka">: 65535 이하의 양수여야 합니다</string> + <string name="bad_config_explanation_positive_number">: 양수여야 합니다</string> + <string name="bad_config_explanation_udp_port">: 올바른 UDP 포트가 아닙니다</string> + <string name="bad_config_reason_invalid_key">잘못된 키</string> + <string name="bad_config_reason_invalid_number">잘못된 숫자</string> + <string name="bad_config_reason_invalid_value">잘못된 값</string> + <string name="bad_config_reason_missing_attribute">누락된 특성</string> + <string name="bad_config_reason_missing_section">누락된 섹션</string> + <string name="bad_config_reason_syntax_error">구문 오류</string> + <string name="bad_config_reason_unknown_attribute">알 수 없는 속성</string> + <string name="bad_config_reason_unknown_section">알수 없는 섹션</string> + <string name="bad_config_reason_value_out_of_range">범위를 벗어난 값</string> + <string name="bad_extension_error">.conf 또는 .zip 파일이어야 함</string> + <string name="error_no_qr_found">이미지에서 QR 코드를 찾을 수 없습니다</string> + <string name="error_qr_checksum">QR 코드 체크섬 검증 실패</string> + <string name="cancel">취소</string> + <string name="config_delete_error">설정파일 %s를 삭제할 수 없음</string> + <string name="config_exists_error">\"%s\"에 대한 설정이 이미 존재함</string> + <string name="config_file_exists_error">\"%s\" 설정 파일이 이미 존재함</string> + <string name="config_not_found_error">설정파일 \"%s\"를 찾을 수 없음</string> + <string name="config_rename_error">설정파일 \"%s\"의 이름을 변경할 수 없음</string> + <string name="config_save_error">\"%1$s\"에 대한 설정을 저장할 수 없음: %2$s</string> + <string name="config_save_success">\"%s\"에 대한 설정을 성공적으로 저장했습니다</string> + <string name="create_activity_title">WireGuard 터널 만들기</string> + <string name="create_bin_dir_error">로컬 바이너리 디렉터리를 만들 수 없음</string> + <string name="create_downloads_file_error">다운로드 디렉토리에 파일을 만들 수 없음</string> + <string name="create_empty">직접 만들기</string> + <string name="create_from_file">파일 또는 압축파일에서 불러오기</string> + <string name="create_from_qr_code">QR코드 스캔</string> + <string name="create_output_dir_error">출력 디렉토리를 만들 수 없음</string> + <string name="create_temp_dir_error">로컬 임시 디렉토리를 만들 수 없음</string> + <string name="create_tunnel">터널 만들기</string> + <string name="copied_to_clipboard">%s가 클립보드에 복사됨</string> + <string name="dark_theme_summary_off">밝은(주간) 테마 사용 중</string> + <string name="dark_theme_summary_on">다크(야간) 테마 사용 중</string> + <string name="dark_theme_title">다크 테마 사용하기</string> + <string name="delete">삭제</string> + <string name="tv_delete">삭제할 터널을 선택</string> + <string name="tv_select_a_storage_drive">저장소를 선택</string> + <string name="tv_no_file_picker">파일을 찾는 데 사용할 파일 관리자를 설치하시오</string> + <string name="tv_add_tunnel_get_started">시작하려면 터널을 추가하시오</string> + <string name="disable_config_export_title">설정 내보내기 기능을 중지</string> + <string name="disable_config_export_description">설정 내보내기 기능을 중지하면 개인키 유출을 줄일 수 있음</string> + <string name="dns_servers">DNS 서버</string> + <string name="dns_search_domains">Dns 도메인 검색</string> + <string name="edit"> 수정</string> + <string name="endpoint">엔드포인트</string> + <string name="error_down">터널 중단 시 오류 발생: %s</string> + <string name="error_fetching_apps">앱 목록을 받는 도중 오류 발생: %s</string> + <string name="error_root">관리자 권한이 필요함</string> + <string name="error_up">터널을 시작 시 오류 발생: %s</string> + <string name="exclude_private_ips">사설 IP 제외</string> + <string name="generate_new_private_key">새로운 개인 키 만들기</string> + <string name="generic_error">알려지지 않은 오류: “%s”</string> + <string name="hint_automatic">(자동)</string> + <string name="hint_generated">(생성됨)</string> + <string name="hint_optional">(선택사항)</string> + <string name="hint_optional_discouraged">(선택사항, 권장되지 않음)</string> + <string name="hint_random">(무작위)</string> + <string name="illegal_filename_error">잘못된 파일 이름: \"%s\"</string> + <string name="import_error">터널을 불러올 수 없음: %s</string> + <string name="import_from_qr_code">QR코드에서 터널 불러오기</string> + <string name="import_success">\"%s\" 불러옴</string> + <string name="interface_title">인터페이스</string> + <string name="key_contents_error">키에서 잘못된 글자 발견</string> + <string name="key_length_error">잘못된 키 길이</string> + <string name="key_length_explanation_base64">: WireGuard의 base64 키는 반드시 44 글자(32 바이트)임</string> + <string name="key_length_explanation_binary">: WireGuard의 키는 반드시 32 바이트임</string> + <string name="key_length_explanation_hex">: WireGuard의 16진수 키는 반드시 64 글자(32 바이트)임</string> + <string name="listen_port">수신 대기 포트</string> + <string name="log_export_error">로그를 내보낼 수 없음: %s</string> + <string name="log_export_subject">WireGuard 안드로이드 로그 파일</string> + <string name="log_export_success">“%s”에 저장됨</string> + <string name="log_export_title">로그 파일 내보내기</string> + <string name="log_saver_activity_label">로그를 저장하기</string> + <string name="log_viewer_pref_summary">로그는 디버깅에 활용됨</string> + <string name="log_viewer_pref_title">앱 로그 보기</string> + <string name="log_viewer_title">로그</string> + <string name="logcat_error">logcat을 실행할 수 없음: </string> + <string name="module_enabler_disabled_summary">아직 실험중이 커널 모듈을 사용하면 성능이 향상될 수 있음</string> + <string name="module_enabler_disabled_title">커널 모듈 백엔드 활성화하기</string> + <string name="module_enabler_enabled_summary">사용자공간 백엔드를 사용하면 느리지만 안정성이 좋아짐</string> + <string name="module_enabler_enabled_title">커널 모듈 백엔드를 비활성화하기</string> + <string name="module_installer_error">문제가 발생했습니다. 다시 시도하십시오</string> + <string name="module_installer_initial">아직 실험중이 커널 모듈을 사용하면 성능이 향상될 수 있음</string> + <string name="module_installer_not_found">이 기기에서 사용가능한 모듈이 없음</string> + <string name="module_installer_title">커널 모듈을 다운로드하고 설치하기</string> + <string name="module_installer_working">다운로드 및 설치 중…</string> + <string name="module_version_error">커널 모듈 버전을 인식할 수 없음</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">한 터널을 켜면 다른 터널은 꺼짐</string> + <string name="multiple_tunnels_summary_on">여러 터널이 동시에 켜질 수 있음</string> + <string name="multiple_tunnels_title">여러 터널을 동시에 사용하기</string> + <string name="name">이름</string> + <string name="no_config_error">아무 설정 없이 터널을 시작할 수 없음</string> + <string name="no_configs_error">설정을 찾을 수 없음</string> + <string name="no_tunnels_error">터널이 존재하지 않음</string> + <string name="parse_error_generic">문자열</string> + <string name="parse_error_inet_address">IP 주소</string> + <string name="parse_error_inet_endpoint">엔드포인트</string> + <string name="parse_error_inet_network">IP 네트워크</string> + <string name="parse_error_integer">횟수</string> + <string name="parse_error_reason">%1$s을 파싱할 수 없음: “%2$s”</string> + <string name="peer">피어</string> + <string name="permission_description">마음대로 터널을 활성화 및 비활성화하는 등 WireGuard 터널을 제어하면, 인터넷 트래픽을 잘못 전달할 위험이 있음</string> + <string name="permission_label">WireGuard 터널 제어</string> + <string name="persistent_keepalive">Persistent keepalive</string> + <string name="pre_shared_key">사전 공유 키</string> + <string name="pre_shared_key_enabled">활성화됨</string> + <string name="private_key">개인 키</string> + <string name="public_key">공개 키</string> + <string name="qr_code_hint">팁: `qrencode -t ansiutf8 < tunnel.conf` 로 생성가능함.</string> + <string name="restore_on_boot_summary_off">부팅 시 활성화된 터널들을 켜지 않음</string> + <string name="restore_on_boot_summary_on">부팅 시 활성화된 터널들을 켬</string> + <string name="restore_on_boot_title">부트 후 복구</string> + <string name="save">저장</string> + <string name="select_all">모두 선택</string> + <string name="settings">설정</string> + <string name="shell_exit_status_read_error">쉘은 종료 상태를 읽을 수 없음</string> + <string name="shell_marker_count_error">쉘은 4 개의 마커를 받아야 하지만 %d 개만 받음</string> + <string name="shell_start_error">쉘이 실행 실패함: %d</string> + <string name="success_application_will_restart">성공. 앱이 곧 재시작됨…</string> + <string name="toggle_all">모두 반전</string> + <string name="toggle_error">WireGuard 터널 토글링 오류: %s</string> + <string name="tools_installer_already">wg와 wg-quick 모두 이미 설치되었음</string> + <string name="tools_installer_failure">커맨드라인 도구 설치 불가 (루트 권한 필요)</string> + <string name="tools_installer_initial">스크립팅에 필요한 선택적 도구 설치하기</string> + <string name="tools_installer_initial_magisk">Magisk 모듈로 설치할 때의 스크립팅에 필요한 선택적 도구 설치하기</string> + <string name="tools_installer_initial_system">시스템 파티션에 설치할 때의 스크립팅에 필요한 선택적 도구 설치하기</string> + <string name="tools_installer_success_magisk">wg와 wg-quick가 Magisk 모듈로 설치됨 (재부팅 필요)</string> + <string name="tools_installer_success_system">wg와 wg-quick가 시스템 파티션에 설치됨</string> + <string name="tools_installer_title">커맨드라인 도구 설치하기</string> + <string name="tools_installer_working">wg와 wg-quick 설치하는 중</string> + <string name="tools_unavailable_error">필요한 도구를 사용할 수 없음</string> + <string name="transfer">전송</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">수신: %1$s, 송신: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">tun 장치를 만들 수 없음</string> + <string name="tunnel_config_error">터널을 설정할 수 없음 (wg-quick가 %d을 반환함)</string> + <string name="tunnel_create_error">터널을 생성할 수 없음: %s</string> + <string name="tunnel_create_success">터널 \"%s\"을 성공적으로 생성함</string> + <string name="tunnel_error_already_exists">터널 \"%s\"가 이미 존재함</string> + <string name="tunnel_error_invalid_name">잘못된 이름</string> + <string name="tunnel_name">터널 이름</string> + <string name="tunnel_on_error">터널을 켤 수 없음 (wgTurnOn이 %d를 반환함)</string> + <string name="tunnel_rename_error">터널 이름을 바꿀 수 없음: %s</string> + <string name="tunnel_rename_success">터널 이름을 \"%s\"로 변경 성공</string> + <string name="type_name_go_userspace">Go userspace</string> + <string name="type_name_kernel_module">커널 모듈</string> + <string name="unknown_error">알 수 없는 오류</string> + <string name="version_summary_checking">%s 백엔드 버전 확인 중</string> + <string name="version_summary_unknown">알 수 없는 버전: %s</string> + <string name="version_title">WireGuard for 안드로이드 v%s</string> + <string name="vpn_not_authorized_error">VPN 서비스는 사용자에 의해 승인되지 않았음</string> + <string name="vpn_start_error">안드로이드 VPN 서비스를 시작할 수 없음</string> + <string name="zip_export_error">터널을 내보낼 수 없음: %s</string> + <string name="zip_export_success">“%s”에 저장됨</string> + <string name="zip_export_summary">Zip 파일은 다운로드 폴더에 저장됨</string> + <string name="zip_export_title">터널들을 Zip 파일에 내보내기</string> + <string name="biometric_prompt_zip_exporter_title">터널들을 내보내기 위한 인증과정</string> + <string name="biometric_prompt_private_key_title">개인 키를 보기 위한 인증과정</string> + <string name="biometric_auth_error">인증 실패</string> + <string name="biometric_auth_error_reason">인증 실패: %s</string> +</resources> diff --git a/ui/src/main/res/values-night/colors.xml b/ui/src/main/res/values-night/colors.xml deleted file mode 100644 index e1015da8..00000000 --- a/ui/src/main/res/values-night/colors.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <!-- Base palette --> - <color name="primary_color">#ff212121</color> - <color name="primary_light_color">#ff484848</color> - <color name="primary_dark_color">#ff000000</color> - <color name="secondary_color">#ff4285f4</color> - <color name="secondary_light_color">#ff80b4ff</color> - <color name="secondary_dark_color">#ff0059c1</color> - <color name="primary_text_color">#ffffffff</color> - <color name="secondary_text_color">#ffffffff</color> - - <!-- Theme variables --> - <color name="list_multiselect_background">#1aeeeeee</color> - <color name="status_bar_color">#21242424</color> - <color name="navigation_bar_color">#aa242424</color> - - <!-- Log viewer tag colors --> - <color name="debug_tag_color">#aaaaaa</color> - <color name="error_tag_color">#ff0000</color> - <color name="info_tag_color">#00ff00</color> - <color name="warning_tag_color">#ffff00</color> -</resources> diff --git a/ui/src/main/res/values-night/logviewer_colors.xml b/ui/src/main/res/values-night/logviewer_colors.xml new file mode 100644 index 00000000..a87312b4 --- /dev/null +++ b/ui/src/main/res/values-night/logviewer_colors.xml @@ -0,0 +1,6 @@ +<resources> + <color name="debug_tag_color">#aaaaaa</color> + <color name="error_tag_color">#ff0000</color> + <color name="info_tag_color">#00ff00</color> + <color name="warning_tag_color">#ffff00</color> +</resources> diff --git a/ui/src/main/res/values-night/themes.xml b/ui/src/main/res/values-night/themes.xml new file mode 100644 index 00000000..e074cb92 --- /dev/null +++ b/ui/src/main/res/values-night/themes.xml @@ -0,0 +1,31 @@ +<resources> + + <style name="WireGuardTheme" parent="Theme.Material3.Dark"> + <item name="colorPrimary">@color/md_theme_dark_primary</item> + <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item> + <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item> + <item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item> + <item name="colorSecondary">@color/md_theme_dark_secondary</item> + <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item> + <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item> + <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item> + <item name="colorTertiary">@color/md_theme_dark_tertiary</item> + <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item> + <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item> + <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item> + <item name="colorError">@color/md_theme_dark_error</item> + <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item> + <item name="colorOnError">@color/md_theme_dark_onError</item> + <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item> + <item name="android:colorBackground">@color/md_theme_dark_background</item> + <item name="colorOnBackground">@color/md_theme_dark_onBackground</item> + <item name="colorSurface">@color/md_theme_dark_surface</item> + <item name="colorOnSurface">@color/md_theme_dark_onSurface</item> + <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item> + <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item> + <item name="colorOutline">@color/md_theme_dark_outline</item> + <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item> + <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item> + <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item> + </style> +</resources> diff --git a/ui/src/main/res/values-nl-rNL/strings.xml b/ui/src/main/res/values-nl-rNL/strings.xml new file mode 100644 index 00000000..50317fe0 --- /dev/null +++ b/ui/src/main/res/values-nl-rNL/strings.xml @@ -0,0 +1,240 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Kan %d tunnel niet verwijderen: %s</item> + <item quantity="other">Kan %d tunnels niet verwijderen: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">%d tunnel succesvol verwijderd</item> + <item quantity="other">%d tunnels succesvol verwijderd</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d tunnel geselecteerd</item> + <item quantity="other">%d tunnels geselecteerd</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">%1$d van %2$d tunnels geïmporteerd</item> + <item quantity="other">%1$d van de %2$d tunnels geïmporteerd</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">%d tunnel geïmporteerd</item> + <item quantity="other">%d tunnels geïmporteerd</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d uitgesloten applicatie(s)</item> + <item quantity="other">%d uitgesloten applicaties</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d inbegrepen applicatie</item> + <item quantity="other">%d inbegrepen applicaties</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d uitgesloten</item> + <item quantity="other">%d uitgesloten</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d inbegrepen</item> + <item quantity="other">%d inbegrepen</item> + </plurals> + <string name="all_applications">Alle applicaties</string> + <string name="exclude_from_tunnel">Uitsluiten</string> + <string name="include_in_tunnel">Alleen opnemen</string> + <plurals name="include_n_applications"> + <item quantity="one">Neem %d app op</item> + <item quantity="other">Voeg %d apps toe</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">%d app uitsluiten</item> + <item quantity="other">%d apps uitsluiten</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">iedere seconde</item> + <item quantity="other">iedere %d seconden</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">seconde</item> + <item quantity="other">seconden</item> + </plurals> + <string name="use_all_applications">Gebruik alle applicaties</string> + <string name="add_peer">Peer toevoegen</string> + <string name="addresses">Adressen</string> + <string name="applications">Applicaties</string> + <string name="allow_remote_control_intents_summary_off">Externe apps kunnen mogelijk geen tunnels in-/uitschakelen (aanbevolen)</string> + <string name="allow_remote_control_intents_summary_on">Externe apps kunnen tunnels in-/uitschakelen (geavanceerd)</string> + <string name="allow_remote_control_intents_title">Controle door externe besturingsapps toestaan</string> + <string name="allowed_ips">Toegestane IP-adressen</string> + <string name="bad_config_context">%1$s\'s %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s in %2$s</string> + <string name="bad_config_explanation_pka">: moet positief zijn en niet meer dan 65535</string> + <string name="bad_config_explanation_positive_number">: Moet positief zijn</string> + <string name="bad_config_explanation_udp_port">: Moet een geldig UDP poortnummer zijn</string> + <string name="bad_config_reason_invalid_key">Ongeldige sleutel</string> + <string name="bad_config_reason_invalid_number">Ongeldig nummer</string> + <string name="bad_config_reason_invalid_value">Ongeldige waarde</string> + <string name="bad_config_reason_missing_attribute">Attribuut ontbreekt</string> + <string name="bad_config_reason_missing_section">Ontbrekende sectie</string> + <string name="bad_config_reason_syntax_error">Syntaxfout</string> + <string name="bad_config_reason_unknown_attribute">Onbekend attribuut</string> + <string name="bad_config_reason_unknown_section">Onbekende sectie</string> + <string name="bad_config_reason_value_out_of_range">Waarde buiten bereik</string> + <string name="bad_extension_error">Bestand moet .conf of .zip zijn</string> + <string name="error_no_qr_found">QR-code niet gevonden in afbeelding</string> + <string name="error_qr_checksum">QR-code checksum verificatie mislukt</string> + <string name="cancel">Annuleren</string> + <string name="config_delete_error">Kan configuratiebestand %s niet verwijderen</string> + <string name="config_exists_error">Configuratie voor \"%s\" bestaat al</string> + <string name="config_file_exists_error">Configuratiebestand \"%s\" bestaat al</string> + <string name="config_not_found_error">Configuratiebestand \"%s\" niet gevonden</string> + <string name="config_rename_error">Kan configuratiebestand \"%s\" \" niet hernoemen</string> + <string name="config_save_error">Kan de configuratie voor \"%1$s\" niet opslaan: %2$s</string> + <string name="config_save_success">Configuratie succesvol opgeslagen voor \"%s\"</string> + <string name="create_activity_title">WireGuard tunnel aanmaken</string> + <string name="create_bin_dir_error">Kan geen lokale \'bin\' map aanmaken</string> + <string name="create_downloads_file_error">Kan bestand niet maken in downloadmap</string> + <string name="create_empty">Begin met lege configuratie</string> + <string name="create_from_file">Importeren uit bestand of archief</string> + <string name="create_from_qr_code">Scan van QR code</string> + <string name="create_output_dir_error">Kan de output map niet aanmaken</string> + <string name="create_temp_dir_error">Kan geen tijdelijke map aanmaken</string> + <string name="create_tunnel">Maak nieuwe tunnel</string> + <string name="copied_to_clipboard">%s gekopieerd naar klembord</string> + <string name="dark_theme_summary_off">Momenteel wordt licht (dag) thema gebruikt</string> + <string name="dark_theme_summary_on">Momenteel wordt donker (nacht) thema gebruikt</string> + <string name="dark_theme_title">Gebruik donker thema</string> + <string name="delete">Verwijder</string> + <string name="tv_delete">Selecteer tunnel om te verwijderen</string> + <string name="tv_select_a_storage_drive">Selecteer een opslaglocatie</string> + <string name="tv_no_file_picker">Installeer een bestandsbeheer applicatie</string> + <string name="tv_add_tunnel_get_started">Voeg een tunnel toe om te beginnen</string> + <string name="donate_title">♥️ Doneer aan het WireGuard Project</string> + <string name="donate_summary">Elke bijdrage helpt</string> + <string name="donate_google_play_disappointment">Bedankt voor het steunen van het WireGuard Project!\n\nHelaas, als gevolg van Google beleid, We mogen niet linken naar de webpagina van het project waar u een donatie kunt doen. Hopelijk kunt u deze zelf wel vinden!\n\nNogmaals bedankt voor uw bijdrage.</string> + <string name="disable_config_export_title">Config export uitschakelen</string> + <string name="disable_config_export_description">Het uitschakelen van configuratie export maakt privésleutels minder toegankelijk</string> + <string name="dns_servers">DNS-servers</string> + <string name="dns_search_domains">DNS-zoekdomeinen</string> + <string name="edit">Bewerken</string> + <string name="endpoint">Eindpunt</string> + <string name="error_down">Fout bij stoppen tunnel: %s</string> + <string name="error_fetching_apps">Fout bij ophalen van apps-lijst: %s</string> + <string name="error_root">Verkrijg root toegang en probeer het opnieuw</string> + <string name="error_prepare">Fout bij voorbereiden tunnel: %s</string> + <string name="error_up">Fout bij het starten van tunnel: %s</string> + <string name="exclude_private_ips">Privé-IP\'s uitsluiten</string> + <string name="generate_new_private_key">Nieuwe privésleutel genereren</string> + <string name="generic_error">Onbekend fout: \"%s\"</string> + <string name="hint_automatic">(auto)</string> + <string name="hint_generated">(gegenereerd)</string> + <string name="hint_optional">(optioneel)</string> + <string name="hint_optional_discouraged">(optioneel, niet aanbevolen)</string> + <string name="hint_random">(willekeurig)</string> + <string name="illegal_filename_error">Ongeldige bestandsnaam \"%s\" \"</string> + <string name="import_error">Kan tunnel niet importeren: %s</string> + <string name="import_from_qr_code">Importeer Tunnel uit QR Code</string> + <string name="import_success">Geïmporteerd \"%s\"</string> + <string name="interface_title">Interface</string> + <string name="key_contents_error">Slechte tekens in de veld</string> + <string name="key_length_error">Onjuiste sleutellengte</string> + <string name="key_length_explanation_base64">: WireGuard base64 sleutels moeten 44 tekens zijn (32 bytes)</string> + <string name="key_length_explanation_binary">: WireGuard sleutels moeten 32 bytes zijn</string> + <string name="key_length_explanation_hex">: WireGuard hex sleutels moeten 64 tekens zijn (32 bytes)</string> + <string name="latest_handshake">Recentste uitwisseling</string> + <string name="latest_handshake_ago">%s geleden</string> + <string name="listen_port">Luister op poort</string> + <string name="log_export_error">Kan logboek niet exporteren: %s</string> + <string name="log_export_subject">WireGuard Android logbestand</string> + <string name="log_export_success">Opgeslagen in \"%s\"</string> + <string name="log_export_title">Exporteer logboek naar bestand</string> + <string name="log_saver_activity_label">Logboek opslaan</string> + <string name="log_viewer_pref_summary">Logboeken kunnen helpen bij het debuggen</string> + <string name="log_viewer_pref_title">Bekijk applicatielogboek</string> + <string name="log_viewer_title">Log</string> + <string name="logcat_error">Kan logcat niet uitvoeren: </string> + <string name="module_enabler_disabled_summary">De experimentele kernel module kan de prestaties verbeteren</string> + <string name="module_enabler_disabled_title">Kernel module backend inschakelen</string> + <string name="module_enabler_enabled_summary">De langzamere userspace backend kan de stabiliteit verbeteren</string> + <string name="module_enabler_enabled_title">Uitschakelen kernel module backend</string> + <string name="module_installer_error">Er ging iets mis. Probeer het nog eens</string> + <string name="module_installer_initial">De experimentele kernel module kan de prestaties verbeteren</string> + <string name="module_installer_not_found">Er zijn geen modules beschikbaar voor uw apparaat</string> + <string name="module_installer_title">Download en installeer kernel module</string> + <string name="module_installer_working">Downloaden en installeren…</string> + <string name="module_version_error">Niet in staat om kernel module versie te bepalen</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Het inschakelen van één tunnel zal anderen uitzetten</string> + <string name="multiple_tunnels_summary_on">Meerdere tunnels kunnen tegelijkertijd actief zijn</string> + <string name="multiple_tunnels_title">Meerdere gelijktijdige tunnels toestaan</string> + <string name="name">Naam</string> + <string name="no_config_error">Probeer een tunnel zonder configuratie te starten</string> + <string name="no_configs_error">Geen configuraties gevonden</string> + <string name="no_tunnels_error">Geen tunnels gedefinieerd</string> + <string name="parse_error_generic">string</string> + <string name="parse_error_inet_address">IP-adres</string> + <string name="parse_error_inet_endpoint">eindpunt</string> + <string name="parse_error_inet_network">IP netwerk</string> + <string name="parse_error_integer">nummer</string> + <string name="parse_error_reason">Kan %1$s%2$s niet parsen</string> + <string name="peer">Peer</string> + <string name="permission_description">beheer WireGuard tunnels, zet tunnels naar keuze aan en uit, en misleid mogelijk het Internetverkeer</string> + <string name="permission_label">WireGuard tunnels beheren</string> + <string name="persistent_keepalive">Voortdurende verbindingstest</string> + <string name="pre_shared_key">Gedeelde sleutel</string> + <string name="pre_shared_key_enabled">ingeschakeld</string> + <string name="private_key">Privésleutel</string> + <string name="public_key">Publieke sleutel</string> + <string name="qr_code_hint">Tip: genereer met `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="quick_settings_tile_add_title">Voeg tegel toe aan snelle instellingen</string> + <string name="quick_settings_tile_add_summary">De sneltoets schakelt de meest recente tunnel aan</string> + <string name="quick_settings_tile_add_failure">Kan geen sneltoets toevoegen: fout %d</string> + <string name="quick_settings_tile_action">tunnel in-/uitschakelen</string> + <string name="restore_on_boot_summary_off">Zal ingeschakelde tunnels niet aanzetten bij opstarten</string> + <string name="restore_on_boot_summary_on">Zal ingeschakelde tunnels aanzetten bij opstarten</string> + <string name="restore_on_boot_title">Tunnel starten bij herstart</string> + <string name="save">Opslaan</string> + <string name="select_all">Selecteer alles</string> + <string name="settings">Instellingen</string> + <string name="shell_exit_status_read_error">Shell kan de exitstatus niet lezen</string> + <string name="shell_marker_count_error">Shell verwachtte 4 markeringen, ontving er %d</string> + <string name="shell_start_error">Shell kon niet starten: %d</string> + <string name="success_application_will_restart">Succes. De toepassing zal nu herstarten…</string> + <string name="toggle_all">Alles wisselen</string> + <string name="toggle_error">Fout bij omschakelen Wireguard tunnel: %s</string> + <string name="tools_installer_already">wg and wg-quick zijn al geïnstalleerd</string> + <string name="tools_installer_failure">Kan de command-line tools niet installeren (geen root?)</string> + <string name="tools_installer_initial">Optionele tools voor scripts installeren</string> + <string name="tools_installer_title">Installeer command line tools</string> + <string name="tools_installer_working">Installeren van wg en wg-quick</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Kan tun apparaat niet aanmaken</string> + <string name="tunnel_error_already_exists">Tunnel \"%s\" bestaat al</string> + <string name="tunnel_error_invalid_name">Ongeldige naam</string> + <string name="tunnel_list_placeholder">Voeg een tunnel toe met de knop hieronder</string> + <string name="tunnel_name">Tunnelnaam</string> + <string name="tunnel_rename_error">Kan tunnel niet hernoemen: %s</string> + <string name="tunnel_rename_success">Tunnel succesvol hernoemd naar \"%s\"</string> + <string name="type_name_go_userspace">Go userspace</string> + <string name="type_name_kernel_module">Kernel module</string> + <string name="unknown_error">Onbekende fout</string> + <string name="updater_avalable">Er is een nieuwe versie beschikbaar. Werk het programma s.v.p. bij.</string> + <string name="updater_action">Download & installeer updates</string> + <string name="updater_rechecking">Update metadata downloaden…</string> + <string name="updater_download_progress">Ophalen nieuwe versie: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Updates downloaden: %s</string> + <string name="updater_installing">Update wordt geïnstalleerd…</string> + <string name="updater_failure">Bijwerken mislukt: %s. Zal het zo opnieuw proberen…</string> + <string name="updater_corrupt_title">Toepassing beschadigd</string> + <string name="updater_corrupt_message">De toepassing is beschadigd. Download de APK opnieuw van de onderstaande website. De-installeer daarna het programma, en herinstalleer het met de gedownloade APK.</string> + <string name="updater_corrupt_navigate">Open website</string> + <string name="version_title">WireGuard voor Android v%s</string> + <string name="zip_export_summary">Zip-bestand wordt opgeslagen in de downloadmap</string> + <string name="zip_export_title">Exporteer tunnels naar zip-bestand</string> + <string name="biometric_prompt_zip_exporter_title">Authenticeer om de tunnel configuratie te exporteren</string> + <string name="biometric_prompt_private_key_title">Authenticeer om de persoonlijke sleutel te bekijken</string> + <string name="biometric_auth_error">Authenticatiefout</string> + <string name="biometric_auth_error_reason">Authenticatiefout: %s</string> +</resources> diff --git a/ui/src/main/res/values-no-rNO/strings.xml b/ui/src/main/res/values-no-rNO/strings.xml new file mode 100644 index 00000000..ca51975e --- /dev/null +++ b/ui/src/main/res/values-no-rNO/strings.xml @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Kan ikke slette %d tunnel %s</item> + <item quantity="other">Kan ikke slette %d tunneler %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">Slettet %d tunnel</item> + <item quantity="other">Slettet %d tunneler</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d tunnel valgt</item> + <item quantity="other">%d tunneler valgt</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Importerte %1$d av %2$d tunneler</item> + <item quantity="other">Importerte %1$d av %2$d tunneler</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">Importerte %d tunnel</item> + <item quantity="other">Importerte %d tunneler</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d ekskludert app</item> + <item quantity="other">%d ekskluderte apper</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d inkludert app</item> + <item quantity="other">%d inkluderte apper</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d ekskludert</item> + <item quantity="other">%d ekskluderte</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d inkludert</item> + <item quantity="other">%d inkluderte</item> + </plurals> + <string name="all_applications">Alle applikasjoner</string> + <string name="exclude_from_tunnel">Ekskluder</string> + <string name="include_in_tunnel">Inkluder kun</string> + <plurals name="include_n_applications"> + <item quantity="one">Inkluder %d app</item> + <item quantity="other">Inkluder %d apper</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Ekskluder %d app</item> + <item quantity="other">Ekskluder %d apper</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">hvert %d sekund</item> + <item quantity="other">hvert %d sekund</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">sekund</item> + <item quantity="other">sekunder</item> + </plurals> + <string name="use_all_applications">Bruk alle apper</string> + <string name="add_peer">Legg til peer</string> + <string name="addresses">Adresser</string> + <string name="applications">Applikasjoner</string> + <string name="allow_remote_control_intents_summary_off">Fjernstyrte apper kan ikke toggle tunneler (anbefalt)</string> + <string name="allow_remote_control_intents_summary_on">Fjernstyrte apper toggle tunneler (avansert)</string> + <string name="allow_remote_control_intents_title">Tillat fjernstyrte apper</string> + <string name="allowed_ips">Tillatte IP-adresser</string> + <string name="bad_config_context">%1$s sin %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s i %2$s</string> + <string name="bad_config_explanation_pka">: Må være positiv og ikke mer enn 65535</string> + <string name="bad_config_explanation_positive_number">: Må være positiv</string> + <string name="bad_config_explanation_udp_port">: Må være et gyldig UDP portnummer</string> + <string name="bad_config_reason_invalid_key">Ugyldig tegn</string> + <string name="bad_config_reason_invalid_number">Ugyldig tall</string> + <string name="bad_config_reason_invalid_value">Ugyldig verdi</string> + <string name="bad_config_reason_missing_attribute">Manglende attributt</string> + <string name="bad_config_reason_missing_section">Manglende seksjon</string> + <string name="bad_config_reason_syntax_error">Syntaksfeil</string> + <string name="bad_config_reason_unknown_attribute">Ukjent attributt</string> + <string name="bad_config_reason_unknown_section">Ukjent seksjon</string> + <string name="bad_config_reason_value_out_of_range">Verdien er utenfor gyldig område</string> + <string name="bad_extension_error">Filen må være .conf eller .zip</string> + <string name="error_no_qr_found">Ingen QR-kode funnet i bildet</string> + <string name="error_qr_checksum">Feil ved sjekksumverifisering av QR-kode</string> + <string name="cancel">Avbryt</string> + <string name="config_delete_error">Kan ikke slette konfigurasjonsfilen %s</string> + <string name="config_exists_error">Konfigurasjon for «%s» finnes allerede</string> + <string name="config_file_exists_error">Konfigurasjonsfil «%s» finnes allerede</string> + <string name="config_not_found_error">Konfigurasjonsfil «%s» ble ikke funnet</string> + <string name="config_rename_error">Kan ikke endre navn på konfigurasjonsfilen «%s»</string> + <string name="config_save_error">Kan ikke lagre konfigurasjonen for “%1$s”: %2$s</string> + <string name="config_save_success">Vellykket lagring av konfigurasjon for «%s»</string> + <string name="create_activity_title">Opprett WireGuard tunnel</string> + <string name="create_bin_dir_error">Kan ikke opprette lokal binærmappe</string> + <string name="create_downloads_file_error">Kan ikke opprette fil i nedlastingsmappen</string> + <string name="create_empty">Lag fra begynnelsen</string> + <string name="create_from_file">Importer fra fil eller arkiv</string> + <string name="create_from_qr_code">Skann QR-kode</string> + <string name="create_output_dir_error">Kan ikke opprette utdata-katalog</string> + <string name="create_temp_dir_error">Kan ikke opprette lokal, midlertidig mappe</string> + <string name="create_tunnel">Opprett tunnel</string> + <string name="copied_to_clipboard">%s kopiert til utklippstavlen</string> + <string name="dark_theme_summary_off">Bruker nå lyst (dag) tema</string> + <string name="dark_theme_summary_on">Bruker nå mørkt (natt) tema</string> + <string name="dark_theme_title">Bruk mørkt tema</string> + <string name="delete">Slett</string> + <string name="tv_delete">Velg tunnel som skal slettes</string> + <string name="tv_select_a_storage_drive">Velg en lagringsenhet</string> + <string name="tv_no_file_picker">Vennligst installer et filhåndteringsverktøy for å bla i filer</string> + <string name="tv_add_tunnel_get_started">Opprett en ny tunnel for å komme i gang</string> + <string name="donate_title">♥ Donér til WireGuard-prosjektet</string> + <string name="donate_summary">Hvert bidrag hjelper</string> + <string name="donate_google_play_disappointment">Takk for at du støtter WireGuard-prosjektet!\n\nPå grunn av Googles retningslinjer, kan vi dessverre ikke linke til den delen av prosjektets nettside der du kan donere. Forhåpentligvis klarer du å finne denne selv!\n\nVi takker igjen for ditt bidrag.</string> + <string name="disable_config_export_title">Deaktiver eksport av konfigurasjon</string> + <string name="disable_config_export_description">Deaktivering av konfigurasjonseksport gjør private nøkler mindre tilgjengelig</string> + <string name="dns_servers">DNS tjenere</string> + <string name="dns_search_domains">Søk gjennom domener</string> + <string name="edit">Rediger</string> + <string name="endpoint">Endepunkt</string> + <string name="error_down">Feil når tunnel skulle tas ned: %s</string> + <string name="error_fetching_apps">Feil ved henting av applikasjonsliste: %s</string> + <string name="error_root">Vennligst få root-tilgang og prøv igjen</string> + <string name="error_prepare">Feil ved klargjøring av tunnel: %s</string> + <string name="error_up">Feil når tunnel skulle tas opp: %s</string> + <string name="exclude_private_ips">Utelukk private IP-adresser</string> + <string name="generate_new_private_key">Lag ny privat nøkkel</string> + <string name="generic_error">Ukjent «%s» feil</string> + <string name="hint_automatic">(automatisk)</string> + <string name="hint_generated">(generert)</string> + <string name="hint_optional">(valgfritt)</string> + <string name="hint_optional_discouraged">(valgfritt, anbefales ikke)</string> + <string name="hint_random">(tilfeldig)</string> + <string name="illegal_filename_error">Ugyldig filnavn «%s»</string> + <string name="import_error">Kan ikke importere tunnel: %s</string> + <string name="import_from_qr_code">Importer tunnel fra QR-kode</string> + <string name="import_success">Importerte «%s»</string> + <string name="interface_title">Grensesnitt</string> + <string name="key_contents_error">Ugyldig tegn i nøkkel</string> + <string name="key_length_error">Ugyldig nøkkellengde</string> + <string name="key_length_explanation_base64">: WireGuard base64-nøkler må være 44 tegn (32 byte)</string> + <string name="key_length_explanation_binary">: WireGuard nøkler må være 32 byte</string> + <string name="key_length_explanation_hex">: WireGuard hex-nøkler må være 64 tegn (32 byte)</string> + <string name="listen_port">Lytt på port</string> + <string name="log_export_error">Kan ikke eksportere logg: %s</string> + <string name="log_export_subject">WireGuard Android loggfil</string> + <string name="log_export_success">Lagret til «%s»</string> + <string name="log_export_title">Eksporter loggfil</string> + <string name="log_saver_activity_label">Lagre logg</string> + <string name="log_viewer_pref_summary">Logger kan være til hjelp med feilsøking</string> + <string name="log_viewer_pref_title">Vis programlogg</string> + <string name="log_viewer_title">Logg</string> + <string name="logcat_error">Kan ikke kjøre logcat: </string> + <string name="module_enabler_disabled_summary">Den eksperimentelle kjernemodulen kan gi bedre ytelse</string> + <string name="module_enabler_disabled_title">Aktiver backend for kjerne-modul</string> + <string name="module_enabler_enabled_summary">Backend i userspace er litt tregere men kan gi bedre stabilitet</string> + <string name="module_enabler_enabled_title">Deaktiver backend for kjerne-modul</string> + <string name="module_installer_error">Noe gikk galt. Vennligst prøv igjen</string> + <string name="module_installer_initial">Den eksperimentelle kjernemodulen kan gi bedre ytelse</string> + <string name="module_installer_not_found">Ingen moduler er tilgjengelige for din enhet</string> + <string name="module_installer_title">Last ned og installer kjernelenmodul</string> + <string name="module_installer_working">Laster ned og installerer…</string> + <string name="module_version_error">Kunne ikke finne versjon av kjerne-modulen</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Når en tunnel slås på vil andre slås av</string> + <string name="multiple_tunnels_summary_on">Flere tunneler kan være aktivert samtidig</string> + <string name="multiple_tunnels_title">Tillat flere samtidige tunneler</string> + <string name="name">Navn</string> + <string name="no_config_error">Prøver å få opp en tunnel uten konfigurasjon</string> + <string name="no_configs_error">Ingen konfigurasjoner funnet</string> + <string name="no_tunnels_error">Ingen tunneler er opprettet</string> + <string name="parse_error_generic">streng</string> + <string name="parse_error_inet_address">IP-adresse</string> + <string name="parse_error_inet_endpoint">endepunkt</string> + <string name="parse_error_inet_network">IP nettverk</string> + <string name="parse_error_integer">nummer</string> + <string name="parse_error_reason">Kan ikke tolke %1$s “%2$s”</string> + <string name="peer">Partner</string> + <string name="permission_description">kontroller WireGuard-tunneler, aktiver og deaktiver dem. Kan potensielt ta ned internett-tilgangen</string> + <string name="permission_label">kontroller WireGuard-tunneler</string> + <string name="persistent_keepalive">Send keepalive-pakker</string> + <string name="pre_shared_key">Forhåndsdelt nøkkel</string> + <string name="pre_shared_key_enabled">aktivert</string> + <string name="private_key">Privat Nøkkel</string> + <string name="public_key">Offentlig nøkkel</string> + <string name="qr_code_hint">Tips: generer med `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="restore_on_boot_summary_off">Vil ikke ta opp aktive tunneler ved oppstart</string> + <string name="restore_on_boot_summary_on">Vil ta opp aktive tunneler ved oppstart</string> + <string name="restore_on_boot_title">Gjenopprett ved oppstart</string> + <string name="save">Lagre</string> + <string name="select_all">Velg alle</string> + <string name="settings">Innstillinger</string> + <string name="shell_exit_status_read_error">Skallet kan ikke lese avslutningsstatus</string> + <string name="shell_marker_count_error">Skallet forventet 4 markører, mottok %d</string> + <string name="shell_start_error">Skallet klarte ikke å starte: %d</string> + <string name="success_application_will_restart">Suksess. Programmet vil nå starte på nytt…</string> + <string name="toggle_all">Toggle alle</string> + <string name="toggle_error">Feil under toggling av WireGuard tunnel: %s</string> + <string name="tools_installer_already">wg og wg-quick er allerede installert</string> + <string name="tools_installer_failure">Kunne ikke installere kommandolinjeverktøy (ingen root-tilgang?)</string> + <string name="tools_installer_initial">Installer valgfrie verktøy for skripting</string> + <string name="tools_installer_initial_magisk">Installer valgfrie verktøy for skripting som Magisk modul</string> + <string name="tools_installer_initial_system">Installer valgfrie verktøy for skripting på systempartisjonen</string> + <string name="tools_installer_success_magisk">wg og wg-quick installert som en Magisk modul (omstart kreves)</string> + <string name="tools_installer_success_system">wg og wg-quick installert på systempartisjonen</string> + <string name="tools_installer_title">Installer kommandolinjeverktøy</string> + <string name="tools_installer_working">Installerer wg og wg-quick</string> + <string name="tools_unavailable_error">Påkrevde verktøy er ikke tilgjengelig</string> + <string name="transfer">Overfør</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Kan ikke opprette tun enhetsfil</string> + <string name="tunnel_config_error">Kunne ikke konfigurere tunnel (wg-quick returnerte %d)</string> + <string name="tunnel_create_error">Kan ikke opprette tunnel: %s</string> + <string name="tunnel_create_success">Opprettet tunnelen «%s»</string> + <string name="tunnel_error_already_exists">Tunnel «%s» finnes allerede</string> + <string name="tunnel_error_invalid_name">Ugyldig navn</string> + <string name="tunnel_list_placeholder">Legg til en tunnel ved å bruke knappen under</string> + <string name="tunnel_name">Tunnelnavn</string> + <string name="tunnel_on_error">Kan ikke slå på tunnel (wgTurnOn returnerte %d)</string> + <string name="tunnel_dns_failure">Kan ikke slå opp DNS-vertsnavn: “%s\"</string> + <string name="tunnel_rename_error">Kan ikke endre navn på tunnel: %s</string> + <string name="tunnel_rename_success">Endret navn på tunnelen til «%s»</string> + <string name="type_name_go_userspace">Bruk userspace</string> + <string name="type_name_kernel_module">Kjernemodul</string> + <string name="unknown_error">Ukjent feil</string> + <string name="version_summary">%1$s backend %2$s</string> + <string name="version_summary_checking">Sjekker %s backend versjon</string> + <string name="version_summary_unknown">Ukjent %s versjon</string> + <string name="version_title">WireGuard for Android v%s</string> + <string name="vpn_not_authorized_error">VPN-tjeneste er ikke autorisert av bruker</string> + <string name="vpn_start_error">Kan ikke starte Android VPN-tjenesten</string> + <string name="zip_export_error">Kan ikke eksportere tunneler: %s</string> + <string name="zip_export_success">Lagret til «%s»</string> + <string name="zip_export_summary">Zip-filen vil bli lagret i nedlastingsmappen</string> + <string name="zip_export_title">Eksporter tunneler til zip-fil</string> + <string name="biometric_prompt_zip_exporter_title">Autentiser for å eksportere tunneler</string> + <string name="biometric_prompt_private_key_title">Autentiser for å vise privatnøkkel</string> + <string name="biometric_auth_error">Autentiseringsfeil</string> + <string name="biometric_auth_error_reason">Autentiseringsfeil: %s</string> +</resources> diff --git a/ui/src/main/res/values-pa-rIN/strings.xml b/ui/src/main/res/values-pa-rIN/strings.xml new file mode 100644 index 00000000..10de7d9e --- /dev/null +++ b/ui/src/main/res/values-pa-rIN/strings.xml @@ -0,0 +1,233 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">%d ਟਨਲ ਹਟਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s</item> + <item quantity="other">%d ਟਨਲਾਂ ਹਟਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">%d ਟਨਲ ਕਾਮਯਾਬੀ ਨਾਲ ਹਟਾਈ</item> + <item quantity="other">%d ਟਨਲਾਂ ਕਾਮਯਾਬੀ ਨਾਲ ਹਟਾਈਆਂ</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d ਟਨਲ ਚੁਣੀ</item> + <item quantity="other">%d ਟਨਲਾਂ ਚੁਣੀਆਂ</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">%2$d ਟਨਲਾਂ ਵਿੱਚੋਂ %1$d ਇੰਪੋਰਟ ਕੀਤੀ</item> + <item quantity="other">%2$d ਟਨਲਾਂ ਵਿੱਚੋਂ %1$d ਇੰਪੋਰਟ ਕੀਤੀਆਂ</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">%d ਟਨਲ ਇੰਪੋਰਟ ਕੀਤੀ</item> + <item quantity="other">%d ਟਨਲਾਂ ਇੰਪੋਰਟ ਕੀਤੀਆਂ</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d ਅਲਹਿਦਾ ਕੀਤੀ ਐਪਲੀਕੇਸ਼ਨ</item> + <item quantity="other">%d ਅਲਹਿਦਾ ਕੀਤੀਆਂ ਐਪਲੀਕੇਸ਼ਨਾਂ</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d ਐਪਲੀਕੇਸ਼ਨ ਸਮੇਤ</item> + <item quantity="other">%d ਐਪਲੀਕੇਸ਼ਨਾਂ ਸਮੇਤ</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d ਅਲਹਿਦਾ ਰੱਖਿਆ</item> + <item quantity="other">%d ਅਲਹਿਦਾ ਰੱਖੇ</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d ਸਮੇਤ</item> + <item quantity="other">%d ਸਮੇਤ</item> + </plurals> + <string name="all_applications">ਸਾਰੀਆਂ ਐਪਲੀਕੇਸ਼ਨਾਂ</string> + <string name="exclude_from_tunnel">ਅਲਹਿਦਾ</string> + <string name="include_in_tunnel">ਸਿਰਫ਼ ਸ਼ਾਮਲ</string> + <plurals name="include_n_applications"> + <item quantity="one">%d ਐਪ ਸ਼ਾਮਲ ਕਰੋ</item> + <item quantity="other">%d ਐਪਾਂ ਸ਼ਾਮਲ ਕਰੋ</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">%d ਐਪ ਅਲਹਿਦਾ ਰੱਖੋ</item> + <item quantity="other">%d ਐਪਾਂ ਅਲਹਿਦਾ ਰੱਖੋ</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">ਹਰ ਸਕਿੰਟ</item> + <item quantity="other">ਹਰ %d ਸਕਿੰਟ</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">ਸਕਿੰਟ</item> + <item quantity="other">ਸਕਿੰਟ</item> + </plurals> + <string name="use_all_applications">ਸਾਰੀਆਂ ਐਪਾਂ ਵਰਤੋਂ</string> + <string name="add_peer">ਪੀਅਰ ਜੋੜੋ</string> + <string name="addresses">ਸਿਰਨਾਵੇ</string> + <string name="applications">ਐਪਲੀਕੇਸ਼ਨਾਂ</string> + <string name="allow_remote_control_intents_summary_off">ਬਾਹਰੀ ਐਪਾਂ ਟਨਲਾਂ ਨੂੰ ਬਦਲ ਨਹੀਂ ਸਕਦੀਆਂ (ਸਿਫਾਰਸ਼ੀ)</string> + <string name="allow_remote_control_intents_summary_on">ਬਾਹਰੀ ਐਪਾਂ ਟਨਲਾਂ ਨੂੰ ਬਦਲ ਸਕਦੀਆਂ ਹਨ (ਤਕਨੀਕੀ)</string> + <string name="allow_remote_control_intents_title">ਰਿਮੋਟ ਕੰਟਰੋਲ ਐਪਾਂ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string> + <string name="allowed_ips">ਮਨਜ਼ੂਰ ਕੀਤੇ IP</string> + <string name="bad_config_context">%1$s ਦੇ %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%2$s ਵਿੱਚ %1$s</string> + <string name="bad_config_explanation_pka">: ਧਨਾਤਮਕ ਅਤੇ 65535 ਤੋਂ ਘੱਟ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ</string> + <string name="bad_config_explanation_positive_number">: ਧਨਾਤਮਕ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ</string> + <string name="bad_config_explanation_udp_port">: ਢੁੱਕਵਾਂ UDP ਪੋਰਟ ਨੰਬਰ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ</string> + <string name="bad_config_reason_invalid_key">ਗ਼ੈਰਵਾਜਬ ਕੁੰਜੀ</string> + <string name="bad_config_reason_invalid_number">ਗ਼ੈਰਵਾਜਬ ਨੰਬਰ</string> + <string name="bad_config_reason_invalid_value">ਗ਼ੈਰਵਾਜਬ ਮੁੱਲ</string> + <string name="bad_config_reason_missing_attribute">ਨਾ-ਮੌਜੂਦ ਗੁਣ</string> + <string name="bad_config_reason_missing_section">ਨਾ-ਮੌਜੂਦ ਚੋਣ</string> + <string name="bad_config_reason_syntax_error">ਸੰਟੈਕਸ ਗ਼ਲਤੀ</string> + <string name="bad_config_reason_unknown_attribute">ਅਣਪਛਾਤਾ ਗੁਣ</string> + <string name="bad_config_reason_unknown_section">ਅਣਪਛਾਤਾ ਭਾਗ</string> + <string name="bad_config_reason_value_out_of_range">ਮੁੱਲ ਹੱਦ ਤੋਂ ਬਾਹਰ ਹੈ</string> + <string name="bad_extension_error">ਫ਼ਾਇਲ .conf ਜਾਂ .zip ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ</string> + <string name="cancel">ਰੱਦ ਕਰੋ</string> + <string name="config_delete_error">ਸੰਰਚਨਾ ਫ਼ਾਇਲ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ</string> + <string name="config_exists_error">“%s” ਲਈ ਸੰਰਚਨਾ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ</string> + <string name="config_file_exists_error">ਸੰਰਚਨਾ ਫ਼ਾਇਲ “%s” ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ</string> + <string name="config_not_found_error">ਸੰਰਚਨਾ ਫ਼ਾਇਲ “%s” ਨਹੀਂ ਲੱਭੀ</string> + <string name="config_rename_error">ਸੰਰਚਨਾ ਫ਼ਾਇਲ “%s” ਦਾ ਨਾਂ ਨਹੀਂ ਬਦਲਿਆ ਜਾ ਸਕਦਾ ਹੈ</string> + <string name="config_save_error"> “%1$s” ਲਈ ਸੰਰਚਨਾ ਫ਼ਾਇਲ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ: %2$s</string> + <string name="config_save_success">“%s” ਲਈ ਸੰਰਚਨਾ ਕਾਮਯਾਬੀ ਨਾਲ ਸੰਭਾਲੀ ਗਈ ਹੈ</string> + <string name="create_activity_title">ਵਾਇਰਗਾਰਡ ਟਨਲ ਬਣਾਓ</string> + <string name="create_bin_dir_error">ਲੋਕਲ ਬਾਈਨਰੀ ਡਾਇਰੈਕਟਰੀ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ</string> + <string name="create_downloads_file_error">ਡਾਊਨਲੋਡ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਫ਼ਾਇਲ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ</string> + <string name="create_empty">ਮੁੱਢ ਤੋਂ ਬਣਾਓ</string> + <string name="create_from_file">ਫ਼ਾਇਲ ਜਾਂ ਅਕਾਇਵ ਤੋਂ ਦਰਾਮਦ ਕਰੋ</string> + <string name="create_from_qr_code">QR ਕੋਡ ਤੋਂ ਸਕੈਨ ਕਰੋ</string> + <string name="create_output_dir_error">ਆਉਟਪੁੱਟ ਡਾਇਰੈਕਟਰੀ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ</string> + <string name="create_temp_dir_error">ਲੋਕਲ ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ</string> + <string name="create_tunnel">ਟਨਲ ਬਣਾਓ</string> + <string name="copied_to_clipboard">%s ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕੀਤਾ</string> + <string name="dark_theme_summary_off">ਇਸ ਵੇਲੇ ਹਲਕਾ (ਦਿਨ) ਥੀਮ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ</string> + <string name="dark_theme_summary_on">ਇਸ ਵੇਲੇ ਗੂੜ੍ਹਾ (ਰਾਤ) ਥੀਮ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ</string> + <string name="dark_theme_title">ਗੂੜ੍ਹਾ ਥੀਮ ਵਰਤੋਂ</string> + <string name="delete">ਹਟਾਓ</string> + <string name="tv_delete">ਹਟਾਉਣ ਲਈ ਟਨਲ ਚੁਣੋ</string> + <string name="tv_select_a_storage_drive">ਸਟੋਰੇਜ਼ ਡਰਾਈਵ ਚੁਣੋ</string> + <string name="tv_no_file_picker">ਫਾਇਲਾਂ ਬਰਾਊਜ਼ ਕਰਨ ਲਈ ਫਾਇਲ ਪਰਬੰਧਕੀ ਸਹੂਲਤ ਇੰਸਟਾਲ ਕਰੋ</string> + <string name="tv_add_tunnel_get_started">ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਟਨਲ ਜੋੜੋ</string> + <string name="disable_config_export_title">ਸੰਰਚਨਾ ਐਕਸਪੋਰਟ ਕਰਨ ਨੂੰ ਅਸਮਰੱਥ ਕਰੋ</string> + <string name="disable_config_export_description">ਸੰਰਚਨਾ ਐਕਸਪੋਰਟ ਕਰਨ ਉੱਤੇ ਰੋਕ ਲਾਉਣ ਨਾਲ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀਆਂ ਲਈ ਪਹੁੰਚ ਘਟੇਗੀ</string> + <string name="dns_servers">DNS ਸਰਵਰ</string> + <string name="edit">ਸੋਧੋ</string> + <string name="endpoint">ਐਂਡ-ਪੁਆਇੰਟ</string> + <string name="error_down">ਟਨਲ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਗ਼ਲਤੀ: %s</string> + <string name="error_fetching_apps">ਐਪ ਸੂਚੀ ਲੈਣ ਦੌਰਾਨ ਗ਼ਲਤੀ: %s</string> + <string name="error_root">ਰੂਟ ਪਹੁੰਚ ਲਵੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string> + <string name="error_up">ਟਨਲ ਚਾਲੂ ਕਰਨ ਦੌਰਾਨ ਗ਼ਲਤੀ: %s</string> + <string name="exclude_private_ips">ਪ੍ਰਾਈਵੇਟ IP ਅਲਹਿਦਾ ਰੱਖੋ</string> + <string name="generate_new_private_key">ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਬਣਾਓ</string> + <string name="generic_error">ਅਣਪਛਾਤੀ “%s” ਗਲਤੀ</string> + <string name="hint_automatic">(ਆਟੋ)</string> + <string name="hint_generated">(ਤਿਆਰ ਕੀਤਾ)</string> + <string name="hint_optional">(ਚੋਣਵਾਂ)</string> + <string name="hint_optional_discouraged">(ਚੋਣਵਾਂ, ਪਰ ਸਿਫਾਰਸ਼ੀ ਨਹੀਂ)</string> + <string name="hint_random">(ਰਲਵਾਂ)</string> + <string name="illegal_filename_error">ਗ਼ੈਰ-ਵਾਜਬ ਫ਼ਾਇਲ ਨਾਂ \"%s\"</string> + <string name="import_error">ਟਨਲ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s</string> + <string name="import_from_qr_code">QR ਕੋਡ ਤੋਂ ਟਨਲ ਇੰਪੋਰਟ ਕਰੋ</string> + <string name="import_success">\"%s\" ਇੰਪੋਰਟ ਕੀਤੀ</string> + <string name="interface_title">ਇੰਟਰਫੇਸ</string> + <string name="key_contents_error">ਕੁੰਜੀ ਵਿੱਚ ਗ਼ਲਤ ਅੱਖਰ</string> + <string name="key_length_error">ਗ਼ਲਤ ਕੁੰਜੀ ਦੀ ਲੰਬਾਈ</string> + <string name="key_length_explanation_base64">: WireGuard base64 ਕੁੰਜੀਆਂ ਵਿੱਚ 44 ਅੱਖਰ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ (32 ਬਾਈਟ)</string> + <string name="key_length_explanation_binary">: WireGuard ਕੁੰਜੀਆਂ 32 ਬਾਈਟ ਹੋਣੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ</string> + <string name="key_length_explanation_hex">: WireGuard ਹੈਕਸਾ ਕੁੰਜੀਆਂ ਵਿੱਚ 64 ਅੱਖਰ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ (32 ਬਾਈਟ)</string> + <string name="listen_port">ਸੁਣਨ ਵਾਲੀ ਪੋਰਟ</string> + <string name="log_export_error">ਲਾਗ ਐਕਸਪੋਰਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s</string> + <string name="log_export_subject">ਵਾਇਰਗਾਰਡ ਐਂਡਰਾਈਡ ਲਾਗ ਫ਼ਾਇਲ</string> + <string name="log_export_success">“%s” ਵਜੋਂ ਸੰਭਾਲਿਆ ਗਿਆ</string> + <string name="log_export_title">ਲਾਗ ਫ਼ਾਇਲ ਬਰਾਮਦ ਕਰੋ</string> + <string name="log_saver_activity_label">ਲਾਗ ਸੰਭਾਲੋ</string> + <string name="log_viewer_pref_summary">ਲਾਗ ਡੀਬੱਗ ਕਰਨ ਲਈ ਸਹਾਇਤਾ ਕਰ ਸਕਦੇ ਹਨ</string> + <string name="log_viewer_pref_title">ਐਪਲੀਕੇਸ਼ਨ ਲਾਗ ਵੇਖੋ</string> + <string name="log_viewer_title">ਲਾਗ</string> + <string name="logcat_error">logcat ਚਲਾਉਣ ਲਈ ਅਸਮਰੱਥ: </string> + <string name="module_enabler_disabled_summary">ਤਜਰਬੇ ਅਧੀਨ ਕਰਨਲ ਮੋਡੀਊਲ ਕਾਰਗੁਜ਼ਾਰੀ ਸੁਧਾਰ ਸਕਦਾ ਹੈ</string> + <string name="module_enabler_disabled_title">ਕਰਨਲ ਮੋਡੀਊਲ ਬੈਕਐਂਡ ਸਮਰੱਥ ਕਰੋ</string> + <string name="module_enabler_enabled_summary">ਹੌਲੀ ਵਰਤੋਂਕਾਰ-ਸਪੇਸ ਬੈਂਕਡ ਸਥਿਰਤਾ ਸੁਧਾਰ ਕਰ ਸਕਦਾ ਹੈ</string> + <string name="module_enabler_enabled_title">ਕਰਨਲ ਮੋਡੀਊਲ ਬੈਕਐਂਡ ਅਸਮਰੱਥ ਕਰੋ</string> + <string name="module_installer_error">ਕੁਝ ਗਲਤ ਵਾਪਰ ਗਿਆ। ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string> + <string name="module_installer_initial">ਤਜਰਬੇ ਅਧੀਨ ਕਰਨਲ ਮੋਡੀਊਲ ਕਾਰਗੁਜ਼ਾਰੀ ਸੁਧਾਰ ਸਕਦਾ ਹੈ</string> + <string name="module_installer_not_found">ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਲਈ ਕੋਈ ਮੋਡੀਊਲ ਮੌਜੂਦ ਨਹੀਂ ਹਨ</string> + <string name="module_installer_title">ਕਰਨਲ ਮੋਡੀਊਲ ਡਾਊਨਲੋਡ ਕਰਕੇ ਇੰਸਟਾਲ ਕਰੋ</string> + <string name="module_installer_working">ਡਾਊਨਲੋਡ ਤੇ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ…</string> + <string name="module_version_error">ਕਰਨਲ ਮੋਡੀਊਲ ਵਰਜ਼ਨ ਪਤਾ ਲਗਾਉਣ ਲਈ ਅਸਮਰੱਥ ਹੈ</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">ਇੱਕ ਟਨਲ ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਹੋਰ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ</string> + <string name="multiple_tunnels_summary_on">ਕਈ ਟਨਲਾਂ ਇੱਕੋ ਸਮੇਂ ਵੀ ਚਾਲੂ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ</string> + <string name="multiple_tunnels_title">ਇੱਕੋ ਸਮੇਂ ਕਈ ਟਨਲਾਂ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string> + <string name="name">ਨਾਂ</string> + <string name="no_config_error">ਬਿਨਾਂ ਸੰਰਚਨਾ ਦੇ ਟਲਨ ਨੂੰ ਚਾਲੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string> + <string name="no_configs_error">ਕੋਈ ਸੰਰਚਨਾ ਨਹੀਂ ਲੱਭੀ</string> + <string name="no_tunnels_error">ਕੋਈ ਟਨਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ</string> + <string name="parse_error_generic">ਸਤਰ</string> + <string name="parse_error_inet_address">IP ਸਿਰਨਾਵਾਂ</string> + <string name="parse_error_inet_endpoint">ਐਂਡ-ਪੁਆਇੰਟ</string> + <string name="parse_error_inet_network">IP ਨੈੱਟਵਰਕ</string> + <string name="parse_error_integer">ਨੰਬਰ</string> + <string name="parse_error_reason">%1$s “%2$s” ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ</string> + <string name="peer">ਪੀਅਰ</string> + <string name="permission_description">ਵਾਇਰਗਾਰਡ ਟਨਲਾਂ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ, ਮਨਮਰਜ਼ੀ ਮੁਤਾਬਕ ਟਨਲਾਂ ਨੂੰ ਸਮਰੱਥ ਤੇ ਅਸਮਰੱਥ ਕਰੋ, ਸੰਭਾਵਿਤ ਇੰਟਰਨੈੱਟ ਟਰੈਫਿਕ ਦੀ ਦਿਸ਼ਾ ਬਦਲੋ</string> + <string name="permission_label">ਵਾਇਰਗਰਾਡ ਟਨਲਾਂ ਕੰਟਰੋਲ ਕਰੋ</string> + <string name="persistent_keepalive">ਸਥਿਰ ਲਗਾਤਾਰ ਜਾਰੀ ਰੱਖੋ</string> + <string name="pre_shared_key">ਪਹਿਲਾਂ-ਸਾਂਝੀ ਕੀਤੀ ਕੁੰਜੀ</string> + <string name="pre_shared_key_enabled">ਸਮਰੱਥ ਹੈ</string> + <string name="private_key">ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ</string> + <string name="public_key">ਪਬਲਿਕ ਕੁੰਜੀ</string> + <string name="qr_code_hint">ਟੋਟਕਾ: `qrencode -t ansiutf8 < tunnel.conf` ਨਾਲ ਤਿਆਰ ਕਰੋ।</string> + <string name="restore_on_boot_summary_off">ਬੂਟ ਕਰਨ ਸਮੇਂ ਸਮਰੱਥ ਕੀਤੀਆਂ ਟਨਲਾਂ ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ</string> + <string name="restore_on_boot_summary_on">ਬੂਟ ਕਰਨ ਸਮੇਂ ਸਮਰੱਥ ਕੀਤੀਆਂ ਟਨਲਾਂ ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾਵੇਗਾ</string> + <string name="restore_on_boot_title">ਬੂਟ ਕਰਨ ਉੱਤੇ ਬਹਾਲ ਕਰੋ</string> + <string name="save">ਸੰਭਾਲੋ</string> + <string name="select_all">ਸਾਰੇ ਚੁਣੋ</string> + <string name="settings">ਸੈਟਿੰਗਾਂ</string> + <string name="shell_exit_status_read_error">ਸ਼ੈਲ ਬਾਹਰ ਜਾਣ (exit) ਸਥਿਤੀ ਪੜ੍ਹ ਨਹੀਂ ਸਕਦੀ</string> + <string name="shell_marker_count_error">ਸ਼ੈਲ 4 ਮਾਰਕਰਾਂ ਦੀ ਉਮੀਦ ਕਰਦੀ ਸੀ, %d ਮਿਲੇ</string> + <string name="shell_start_error">ਸ਼ੈਲ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਫ਼ਲ ਹੈ: %d</string> + <string name="success_application_will_restart">ਕਾਮਯਾਬ। ਐਪਲੀਕੇਸ਼ਨ ਹੁਣ ਮੁੜ-ਚਾਲੂ ਹੋਵੇਗੀ…</string> + <string name="toggle_all">ਸਭ ਪਲਟੋ</string> + <string name="toggle_error">ਵਾਇਰਗਾਰਡ ਟਨਲ ਬਦਲਣ ਦੌਰਾਨ ਗ਼ਲਤੀ: %s</string> + <string name="tools_installer_already">wg ਅਤੇ wg-quick ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ</string> + <string name="tools_installer_failure">ਕਮਾਂਡ-ਲਾਈਨ ਟੂਲ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ (ਰੂਟ ਨਹੀਂ ਹੋ?)</string> + <string name="tools_installer_initial">ਸਕ੍ਰਿਪਟ ਲਿਖਣ ਲਈ ਚੋਣਵੇਂ ਟੂਲ ਇੰਸਟਾਲ ਕਰੋ</string> + <string name="tools_installer_initial_magisk">Magisk ਮੋਡੀਊਲ ਵਜੋਂ ਸਕ੍ਰਿਪਟਾਂ ਲਿਖਣ ਲਈ ਚੋਣਵੇਂ ਟੂਲ ਇੰਸਟਾਲ ਕਰੋ</string> + <string name="tools_installer_initial_system">ਸਿਸਟਮ ਪਾਰਟੀਸ਼ਨ ਵਿੱਚ ਸਕ੍ਰਿਪਟ ਲਿਖਣ ਲਈ ਚੋਣਵੇਂ ਟੂਲ ਇੰਸਟਾਲ ਕਰੋ</string> + <string name="tools_installer_success_magisk">wg ਅਤੇ wg-quick ਨੂੰ Magisk ਮੋਡੀਊਲ ਵਜੋਂ ਇੰਸਟਾਲ ਕੀਤਾ (ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ)</string> + <string name="tools_installer_success_system">wg ਅਤੇ wg-quick ਨੂੰ ਸਿਸਟਮ ਪਾਰਟੀਸ਼ਨ ਵਿੱਚ ਇੰਸਟਾਲ ਕੀਤਾ</string> + <string name="tools_installer_title">ਕਮਾਂਡ ਲਾਈਨ ਟੂਲ ਇੰਸਟਾਲ ਕਰੋ</string> + <string name="tools_installer_working">wg ਤੇ wg-quick ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ</string> + <string name="tools_unavailable_error">ਚਾਹੀਦੇ ਟੂਲ ਮੌਜੂਦ ਨਹੀਂ ਹਨ</string> + <string name="transfer">ਟਰਾਂਸਫਰ</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">tun ਡਿਵਾਈਸ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ</string> + <string name="tunnel_config_error">ਟਨਲ ਦੀ ਸੰਰਚਨਾ ਕਰਨ ਲਈ ਅਸਮਰੱਥ (wg-quick ਨੇ %d ਵਾਪਸ ਕੀਤਾ)</string> + <string name="tunnel_create_error">ਟਨਲ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s</string> + <string name="tunnel_create_success">“%s” ਟਨਲ ਕਾਮਯਾਬੀ ਨਾਲ ਬਣਾਈ</string> + <string name="tunnel_error_already_exists">ਟਨਲ “%s” ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ</string> + <string name="tunnel_error_invalid_name">ਅਯੋਗ ਨਾਂ</string> + <string name="tunnel_name">ਟਨਲ ਦਾ ਨਾਂ</string> + <string name="tunnel_on_error">ਟਨਲ ਚਾਲੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ (wgTurnOn ਨੇ %d ਵਾਪਸ ਕੀਤਾ)</string> + <string name="tunnel_rename_error">ਟਨਲ ਨਾਂ-ਬਦਲਣ ਲਈ ਅਸਮਰੱਥ: %s</string> + <string name="tunnel_rename_success">ਟਨਲ ਦਾ ਨਾਂ \"%s\" ਵਜੋਂ ਕਾਮਯਾਬੀ ਨਾਲ ਬਦਲਿਆ ਗਿਆ</string> + <string name="type_name_go_userspace">ਵਰਤੋਂ-ਸਪੇਸ ਤੇ ਜਾਓ</string> + <string name="type_name_kernel_module">ਕਰਨਲ ਮੋਡੀਊਲ</string> + <string name="unknown_error">ਅਣਪਛਾਤੀ ਗਲਤੀ</string> + <string name="version_summary_checking">%s ਬੈਕਐਂਡ ਵਰਜ਼ਨ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string> + <string name="version_summary_unknown">ਅਣਪਛਾਤਾ %s ਵਰਜਨ</string> + <string name="version_title">Android ਲਈ WireGuard v%s</string> + <string name="vpn_not_authorized_error">VPN ਸੇਵਾ ਨੂੰ ਵਰਤੋਂਕਾਰ ਨੇ ਪਰਮਾਣਿਤ ਨਹੀਂ ਕੀਤਾ</string> + <string name="vpn_start_error">ਐਂਡਰਾਈਡ VPN ਸੇਵਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ</string> + <string name="zip_export_error">ਟਨਲਾਂ ਐਕਸਪੋਰਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s</string> + <string name="zip_export_success">“%s” ਉੱਤੇ ਸੰਭਾਲਿਆ ਗਿਆ</string> + <string name="zip_export_summary">ਜ਼ਿਪ ਫਾਈਲ ਨੂੰ ਡਾਊਨਲੋਡ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਿਆ ਜਾਵੇਗਾ</string> + <string name="zip_export_title">ਟਨਲ ਨੂੰ ਜ਼ਿੱਪ ਫ਼ਾਇਲ ਵਜੋਂ ਬਰਾਮਦ ਕਰੋ</string> + <string name="biometric_prompt_zip_exporter_title">ਟਨਲ ਬਰਾਮਦ ਕਰਨ ਲਈ ਪਰਮਾਣਕਿਤਾ</string> + <string name="biometric_prompt_private_key_title">ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਵੇਖਣ ਲਈ ਪਰਮਾਣਕਿਤਾ</string> + <string name="biometric_auth_error">ਪਰਮਾਣਿਤ ਕਰਨ ਲਈ ਅਸਫ਼ਲ</string> + <string name="biometric_auth_error_reason">ਪਰਮਾਣਿਤ ਕਰਨ ਲਈ ਅਸਫ਼ਲ: %s</string> +</resources> diff --git a/ui/src/main/res/values-pl-rPL/strings.xml b/ui/src/main/res/values-pl-rPL/strings.xml new file mode 100644 index 00000000..3c9de47d --- /dev/null +++ b/ui/src/main/res/values-pl-rPL/strings.xml @@ -0,0 +1,264 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Nie można usunąć %d tunelu: %s</item> + <item quantity="few">Nie można usunąć %d tuneli: %s</item> + <item quantity="many">Nie można usunąć %d tuneli: %s</item> + <item quantity="other">Nie można usunąć %d tuneli: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">Pomyślnie usunięto tunel %d</item> + <item quantity="few">Pomyślnie usunięto %d tunele</item> + <item quantity="many">Pomyślnie usunięto %d tuneli</item> + <item quantity="other">Pomyślnie usunięto %d tuneli</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d wybrany tunel</item> + <item quantity="few">%d wybrane tunele</item> + <item quantity="many">%d wybranych tuneli</item> + <item quantity="other">%d wybranych tuneli</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Zaimportowano %1$d z %2$d tuneli</item> + <item quantity="few">Zaimportowano %1$d z %2$d tuneli</item> + <item quantity="many">Zaimportowano %1$d z %2$d tuneli</item> + <item quantity="other">Zaimportowano %1$d z %2$d tuneli</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">Zaimportowano %d tunel</item> + <item quantity="few">Zaimportowano %d tunele</item> + <item quantity="many">Zaimportowano %d tuneli</item> + <item quantity="other">Zaimportowano %d tuneli</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d wykluczona aplikacja</item> + <item quantity="few">%d wykluczone aplikacje</item> + <item quantity="many">%d wykluczonych aplikacji</item> + <item quantity="other">%d wykluczonych aplikacji</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d dołączona aplikacja</item> + <item quantity="few">%d dołączone aplikacje</item> + <item quantity="many">%d dołączonych aplikacji</item> + <item quantity="other">%d dołączonych aplikacji</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d wykluczona</item> + <item quantity="few">%d wykluczone</item> + <item quantity="many">%d wykluczonych</item> + <item quantity="other">%d wykluczonych</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d dołączona</item> + <item quantity="few">%d dołączone</item> + <item quantity="many">%d dołączonych</item> + <item quantity="other">%d dołączonych</item> + </plurals> + <string name="all_applications">Wszystkie aplikacje</string> + <string name="exclude_from_tunnel">Wyklucz</string> + <string name="include_in_tunnel">Dołącz tylko</string> + <plurals name="include_n_applications"> + <item quantity="one">Dołącz %d aplikację</item> + <item quantity="few">Dołącz %d aplikacje</item> + <item quantity="many">Dołącz %d aplikacji</item> + <item quantity="other">Dołącz %d aplikacji</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Wyklucz %d aplikację</item> + <item quantity="few">Wyklucz %d aplikacje</item> + <item quantity="many">Wyklucz %d aplikacji</item> + <item quantity="other">Wyklucz %d aplikacji</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">co sekundę</item> + <item quantity="few">co %d sekundy</item> + <item quantity="many">co %d sekund</item> + <item quantity="other">co %d sekund</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">sekunda</item> + <item quantity="few">sekundy</item> + <item quantity="many">sekund</item> + <item quantity="other">sekundy</item> + </plurals> + <string name="use_all_applications">Użyj wszystkich</string> + <string name="add_peer">Dodaj klienta</string> + <string name="addresses">Adresy</string> + <string name="applications">Aplikacje</string> + <string name="allow_remote_control_intents_summary_off">Zewnętrzne aplikacje nie mogą przełączać tuneli (zalecane)</string> + <string name="allow_remote_control_intents_summary_on">Zewnętrzne aplikacje mogą przełączać tunele (zaawansowane)</string> + <string name="allow_remote_control_intents_title">Zezwól na kontrolowanie przez zewnętrzne aplikacje</string> + <string name="allowed_ips">Dozwolone adresy IP</string> + <string name="bad_config_context">%1$s dla %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s w %2$s</string> + <string name="bad_config_explanation_pka">: Musi być dodatni i nie większy niż 65535</string> + <string name="bad_config_explanation_positive_number">: Musi być dodatni</string> + <string name="bad_config_explanation_udp_port">: Musi być prawidłowym numerem portu UDP</string> + <string name="bad_config_reason_invalid_key">Nieprawidłowy klucz</string> + <string name="bad_config_reason_invalid_number">Nieprawidłowa liczba</string> + <string name="bad_config_reason_invalid_value">Nieprawidłowa wartość</string> + <string name="bad_config_reason_missing_attribute">Brakujący atrybut</string> + <string name="bad_config_reason_missing_section">Brakująca sekcja</string> + <string name="bad_config_reason_syntax_error">Błąd składni</string> + <string name="bad_config_reason_unknown_attribute">Nieznany atrybut</string> + <string name="bad_config_reason_unknown_section">Nieznana sekcja</string> + <string name="bad_config_reason_value_out_of_range">Wartość poza zakresem</string> + <string name="bad_extension_error">Plik musi posiadać rozszerzenie CONF lub ZIP</string> + <string name="error_no_qr_found">Kod QR nie został znaleziony w obrazie</string> + <string name="error_qr_checksum">Weryfikacja sumy kontrolnej kodu QR nie powiodła się</string> + <string name="cancel">Anuluj</string> + <string name="config_delete_error">Nie można usunąć pliku konfiguracyjnego „%s”</string> + <string name="config_exists_error">Konfiguracja dla „%s” już istnieje</string> + <string name="config_file_exists_error">Plik konfiguracyjny „%s” już istnieje</string> + <string name="config_not_found_error">Nie znaleziono pliku konfiguracyjnego „%s”</string> + <string name="config_rename_error">Nie można zmienić nazwy pliku konfiguracyjnego „%s”</string> + <string name="config_save_error">Nie można zapisać konfiguracji dla „%1$s”: %2$s</string> + <string name="config_save_success">Pomyślnie zapisano konfigurację dla „%s”</string> + <string name="create_activity_title">Utwórz tunel WireGuard</string> + <string name="create_bin_dir_error">Nie można utworzyć lokalnego folderu dla plików wykonywalnych</string> + <string name="create_downloads_file_error">Nie można utworzyć pliku w folderze pobierania</string> + <string name="create_empty">Utwórz ręcznie</string> + <string name="create_from_file">Utwórz z pliku lub archiwum</string> + <string name="create_from_qr_code">Zeskanuj kod QR</string> + <string name="create_output_dir_error">Nie można utworzyć folderu wyjściowego</string> + <string name="create_temp_dir_error">Nie można utworzyć tymczasowego folderu lokalnego</string> + <string name="create_tunnel">Utwórz tunel</string> + <string name="copied_to_clipboard">%s skopiowano do schowka</string> + <string name="dark_theme_summary_off">Obecnie używany jest jasny motyw</string> + <string name="dark_theme_summary_on">Obecnie używany jest ciemny motyw</string> + <string name="dark_theme_title">Użyj ciemnego motywu</string> + <string name="delete">Usuń</string> + <string name="tv_delete">Wybierz tunel do usunięcia</string> + <string name="tv_select_a_storage_drive">Wybierz dysk pamięci</string> + <string name="tv_no_file_picker">Zainstaluj narzędzie do zarządzania plikami, aby przeglądać pliki</string> + <string name="tv_add_tunnel_get_started">Dodaj tunel, aby rozpocząć</string> + <string name="disable_config_export_title">Wyłącz eksportowanie konfiguracji</string> + <string name="disable_config_export_description">Wyłączenie eksportowania konfiguracji sprawi, że klucze prywatne będą mniej dostępne</string> + <string name="dns_servers">Serwery DNS</string> + <string name="dns_search_domains">Sufiksy DNS</string> + <string name="edit">Edytuj</string> + <string name="endpoint">Punkt końcowy</string> + <string name="error_down">Błąd podczas zamykania tunelu: %s</string> + <string name="error_fetching_apps">Błąd podczas pobierania listy aplikacji: %s</string> + <string name="error_root">Proszę uzyskać dostęp do root-a i spróbować ponownie</string> + <string name="error_up">Błąd podczas otwierania tunelu: %s</string> + <string name="exclude_private_ips">Wyklucz prywatne adresy IP</string> + <string name="generate_new_private_key">Wygeneruj nowy klucz prywatny</string> + <string name="generic_error">Nieznany błąd „%s”</string> + <string name="hint_automatic">(auto.)</string> + <string name="hint_generated">(wygenerowany)</string> + <string name="hint_optional">(opcjonalnie)</string> + <string name="hint_optional_discouraged">(opcjonalnie, niezalecane)</string> + <string name="hint_random">(losowy)</string> + <string name="illegal_filename_error">Niedozwolona nazwa pliku „%s”</string> + <string name="import_error">Nie można zaimportować tunelu: %s</string> + <string name="import_from_qr_code">Importuj tunel za pomocą kodu QR</string> + <string name="import_success">Zaimportowano „%s”</string> + <string name="interface_title">Interfejs</string> + <string name="key_contents_error">Nieprawidłowe znaki w kluczu</string> + <string name="key_length_error">Nieprawidłowa długość klucza</string> + <string name="key_length_explanation_base64">: Klucze Base64 WireGuard-a muszą mieć długość 44 znaków (32 bajty)</string> + <string name="key_length_explanation_binary">: Klucze WireGuard-a muszą mieć wielkość 32 bajtów</string> + <string name="key_length_explanation_hex">: Klucze Hex WireGuard-a muszą mieć długość 64 znaków (32 bajty)</string> + <string name="listen_port">Port nasłuchu</string> + <string name="log_export_error">Nie można wyeksportować logu: %s</string> + <string name="log_export_subject">Plik logu programu WireGuard dla systemu Android</string> + <string name="log_export_success">Zapisano w „%s”</string> + <string name="log_export_title">Wyeksportuj plik logu</string> + <string name="log_saver_activity_label">Zapisz log</string> + <string name="log_viewer_pref_summary">Logi mogą pomóc w debugowaniu</string> + <string name="log_viewer_pref_title">Wyświetl log aplikacji</string> + <string name="log_viewer_title">Log</string> + <string name="logcat_error">Nie można uruchomić narzędzia logcat: </string> + <string name="module_enabler_disabled_summary">Eksperymentalny moduł jądra może poprawić wydajność</string> + <string name="module_enabler_disabled_title">Włącz moduł jądra</string> + <string name="module_enabler_enabled_summary">Wolniejsza implementacja w przestrzeni użytkownika może poprawić stabilność</string> + <string name="module_enabler_enabled_title">Wyłącz moduł jądra</string> + <string name="module_installer_error">Coś poszło nie tak. Proszę spróbować ponownie</string> + <string name="module_installer_initial">Eksperymentalny moduł jądra może poprawić wydajność</string> + <string name="module_installer_not_found">Brak dostępnych modułów dla tego urządzenia</string> + <string name="module_installer_title">Pobierz i zainstaluj moduł jądra</string> + <string name="module_installer_working">Pobieranie i instalowanie…</string> + <string name="module_version_error">Nie można określić wersji modułu jądra</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Włączenie jednego tunelu spowoduje wyłączenie innych</string> + <string name="multiple_tunnels_summary_on">Wiele tuneli może być włączonych jednocześnie</string> + <string name="multiple_tunnels_title">Zezwól na wiele równoległych tuneli</string> + <string name="name">Nazwa</string> + <string name="no_config_error">Próba otwarcia tunelu bez konfiguracji</string> + <string name="no_configs_error">Nie odnaleziono żadnych konfiguracji</string> + <string name="no_tunnels_error">Brak tuneli</string> + <string name="parse_error_generic">ciąg</string> + <string name="parse_error_inet_address">Adresy IP</string> + <string name="parse_error_inet_endpoint">punkt końcowy</string> + <string name="parse_error_inet_network">Sieć IP</string> + <string name="parse_error_integer">liczba</string> + <string name="parse_error_reason">Nie można przetworzyć %1$s „%2$s”</string> + <string name="peer">Klient</string> + <string name="permission_description">kontrolowanie tuneli WireGuard, włączanie i wyłączanie tuneli, potencjalnie błędne kierowanie ruchem internetowym</string> + <string name="permission_label">sterowanie tunelami WireGuard</string> + <string name="persistent_keepalive">Utrzymanie połączenia</string> + <string name="pre_shared_key">Klucz wstępnie udostępniony</string> + <string name="pre_shared_key_enabled">włączone</string> + <string name="private_key">Klucz prywatny</string> + <string name="public_key">Klucz publiczny</string> + <string name="qr_code_hint">Wskazówka: wygeneruj za pomocą `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="restore_on_boot_summary_off">Włączone tunele nie zostaną przywrócone podczas uruchamiania</string> + <string name="restore_on_boot_summary_on">Włączone tunele zostaną przywrócone podczas uruchamiania</string> + <string name="restore_on_boot_title">Przywróć podczas uruchamiania</string> + <string name="save">Zapisz</string> + <string name="select_all">Wybierz wszystko</string> + <string name="settings">Ustawienia</string> + <string name="shell_exit_status_read_error">Powłoka nie może odczytać statusu wyjścia</string> + <string name="shell_marker_count_error">Powłoka spodziewała się 4 znaczników, otrzymano %d</string> + <string name="shell_start_error">Nie udało się uruchomić powłoki: %d</string> + <string name="success_application_will_restart">Ukończono pomyślnie. Aplikacja zostanie uruchomiona ponownie…</string> + <string name="toggle_all">Przełącz wszystkie</string> + <string name="toggle_error">Błąd podczas przełączania tunelu WireGuard: %s</string> + <string name="tools_installer_already">Narzędzia wg i wg-quick są już zainstalowane</string> + <string name="tools_installer_failure">Nie można zainstalować narzędzi wiersza poleceń (brak root-a?)</string> + <string name="tools_installer_initial">Zainstaluj opcjonalne narzędzia do tworzenia skryptów</string> + <string name="tools_installer_initial_magisk">Zainstaluj opcjonalne narzędzia do tworzenia skryptów jako moduł Magisk</string> + <string name="tools_installer_initial_system">Zainstaluj opcjonalne narzędzia do tworzenia skryptów na partycji systemowej</string> + <string name="tools_installer_success_magisk">Narzędzia wg i wg-quick zostały zainstalowane jako moduł Magisk (wymagane ponowne uruchomienie)</string> + <string name="tools_installer_success_system">Narzędzia wg i wg-quick zostały zainstalowane na partycji systemowej</string> + <string name="tools_installer_title">Zainstaluj narzędzia wiersza poleceń</string> + <string name="tools_installer_working">Instalowanie wg i wg-quick</string> + <string name="tools_unavailable_error">Wymagane narzędzia są niedostępne</string> + <string name="transfer">Transfer</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">odebrano: %1$s, wysłano: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Nie można utworzyć urządzenia TUN</string> + <string name="tunnel_config_error">Nie można skonfigurować tunelu (wg-quick zwróciło %d)</string> + <string name="tunnel_create_error">Nie można utworzyć tunelu: %s</string> + <string name="tunnel_create_success">Pomyślnie utworzono tunel „%s”</string> + <string name="tunnel_error_already_exists">Tunel \"%s\" już istnieje</string> + <string name="tunnel_error_invalid_name">Nieprawidłowa nazwa</string> + <string name="tunnel_name">Nazwa tunelu</string> + <string name="tunnel_on_error">Nie można włączyć tunelu (wgTurnOn zwróciło %d)</string> + <string name="tunnel_dns_failure">Nie można odnaleźć nazwy hosta DNS: “%s”</string> + <string name="tunnel_rename_error">Nie można zmienić nazwy tunelu: %s</string> + <string name="tunnel_rename_success">Pomyślnie zmieniono nazwę tunelu na „%s”</string> + <string name="type_name_go_userspace">Przestrzeń użytkownika Go</string> + <string name="type_name_kernel_module">Moduł jądra</string> + <string name="unknown_error">Nieznany błąd</string> + <string name="version_summary">%1$s backend %2$s</string> + <string name="version_summary_checking">Sprawdzanie wersji implementacji: %s</string> + <string name="version_summary_unknown">Nieznana wersja %s</string> + <string name="version_title">WireGuard dla systemu Android v%s</string> + <string name="vpn_not_authorized_error">Usługa VPN nie została autoryzowana przez użytkownika</string> + <string name="vpn_start_error">Nie można uruchomić usługi VPN systemu Android</string> + <string name="zip_export_error">Nie można wyeksportować tuneli: %s</string> + <string name="zip_export_success">Zapisano w „%s”</string> + <string name="zip_export_summary">Plik ZIP zostanie zapisany w folderze pobierania</string> + <string name="zip_export_title">Wyeksportuj tunele do pliku ZIP</string> + <string name="biometric_prompt_zip_exporter_title">Uwierzytelnij, aby wyeksportować tunele</string> + <string name="biometric_prompt_private_key_title">Uwierzytelnij, aby zobaczyć klucz prywatny</string> + <string name="biometric_auth_error">Błąd uwierzytelnienia</string> + <string name="biometric_auth_error_reason">Błąd uwierzytelnienia: %s</string> +</resources> diff --git a/ui/src/main/res/values-pt-rBR/strings.xml b/ui/src/main/res/values-pt-rBR/strings.xml new file mode 100644 index 00000000..eb8ab339 --- /dev/null +++ b/ui/src/main/res/values-pt-rBR/strings.xml @@ -0,0 +1,226 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Não é possível excluir o túnel %d: %s</item> + <item quantity="other">Não foi possível excluir túneis %d: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">Túnel %d excluído com sucesso</item> + <item quantity="other">Túneis %d excluídos com êxito</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">Túnel %d selecionado</item> + <item quantity="other">Túneis %d selecionados</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Importados %1$d dos %2$d túneis</item> + <item quantity="other">Importados %1$d dos %2$d túneis</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">Importado %d túnel</item> + <item quantity="other">Importados %d túneis</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">Aplicação %d Excluída</item> + <item quantity="other">Aplicações %d Excluídas</item> + </plurals> + <string name="all_applications">Todos as aplicativos</string> + <string name="exclude_from_tunnel">Retirar</string> + <string name="include_in_tunnel">Incluir somente</string> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">segundo</item> + <item quantity="other">segundos</item> + </plurals> + <string name="use_all_applications">Usar todas aplicações</string> + <string name="add_peer">Adicionar Par</string> + <string name="addresses">Endereço</string> + <string name="applications">Aplicativo</string> + <string name="allow_remote_control_intents_summary_off">Aplicativos externos podem não alternar túneis (recomendado)</string> + <string name="allow_remote_control_intents_summary_on">Aplicativos externos podem alternar túneis (avançado)</string> + <string name="allow_remote_control_intents_title">Permitir controle remoto de apps</string> + <string name="allowed_ips">IPs Permitidos</string> + <string name="bad_config_context">%2$s da %1$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s em %2$s</string> + <string name="bad_config_explanation_pka">: Deve ser positivo e não mais que 65535</string> + <string name="bad_config_explanation_positive_number">: Deve ser positivo</string> + <string name="bad_config_explanation_udp_port">: Deve ser um número de porta UDP válido</string> + <string name="bad_config_reason_invalid_key">Chave inválida</string> + <string name="bad_config_reason_invalid_number">Número inválido</string> + <string name="bad_config_reason_invalid_value">Valor inválido</string> + <string name="bad_config_reason_missing_attribute">Atributo ausente</string> + <string name="bad_config_reason_missing_section">Seção em falta</string> + <string name="bad_config_reason_syntax_error">Erro de sintaxe</string> + <string name="bad_config_reason_unknown_attribute">Atributo desconhecido</string> + <string name="bad_config_reason_unknown_section">Seção desconhecida</string> + <string name="bad_config_reason_value_out_of_range">Valor fora do intervalo</string> + <string name="bad_extension_error">O arquivo deve ser .conf ou .zip</string> + <string name="error_no_qr_found">Código QR não encontrado na imagem</string> + <string name="error_qr_checksum">Falha na verificação do código QR</string> + <string name="cancel">Cancelar</string> + <string name="config_delete_error">Não é possível excluir o arquivo de configuração %s</string> + <string name="config_exists_error">Configuração para \"%s\" já existe</string> + <string name="config_file_exists_error">Arquivo de configuração “%s” já existe</string> + <string name="config_not_found_error">Arquivo de configuração “%s” não encontrado</string> + <string name="config_rename_error">Não é possível renomear o arquivo de configuração “%s”</string> + <string name="config_save_error">Não pode salvar a configuração para \"%1$s\": %2$s</string> + <string name="config_save_success">Configuração salva com sucesso para “%s”</string> + <string name="create_activity_title">Criar túnel WireGuard</string> + <string name="create_bin_dir_error">Não é possível criar o diretório local do binário</string> + <string name="create_downloads_file_error">Não é possível criar arquivo no diretório de downloads</string> + <string name="create_empty">Criar do zero</string> + <string name="create_from_file">Criar a partir de arquivo</string> + <string name="create_from_qr_code">Ler código QR</string> + <string name="create_output_dir_error">Não é possível criar o diretório de saída</string> + <string name="create_temp_dir_error">Não é possível criar o diretório temporário local</string> + <string name="create_tunnel">Criar túnel</string> + <string name="copied_to_clipboard">%s copiado para a área de transferência</string> + <string name="dark_theme_summary_off">Atualmente usando tema claro (dia)</string> + <string name="dark_theme_summary_on">Atualmente usando tema escuro (noite)</string> + <string name="dark_theme_title">Usar tema escuro</string> + <string name="delete">Excluir</string> + <string name="tv_delete">Selecione o túnel para excluir</string> + <string name="tv_select_a_storage_drive">Selecione uma unidade de armazenamento</string> + <string name="tv_no_file_picker">Por favor, instale um utilitário de gerenciamento de arquivos para procurar arquivos</string> + <string name="tv_add_tunnel_get_started">Adicione um túnel para começar</string> + <string name="donate_title">♥️ Doar para o projeto WireGuard</string> + <string name="donate_summary">Todas as contribuições ajudam</string> + <string name="donate_google_play_disappointment">Obrigado por apoiar o Projeto WireGuard!\n\nInfelizmente, devido às políticas do Google, não temos permissão para vincular a parte da página do projeto onde você pode fazer uma doação. Esperamos que você consiga descobrir isso!\n\nObrigado novamente pela sua contribuição.</string> + <string name="disable_config_export_title">Desativar exportação de configuração</string> + <string name="disable_config_export_description">Desativar a exportação de configuração torna as chaves privadas menos acessíveis</string> + <string name="dns_servers">Servidores DNS</string> + <string name="dns_search_domains">Domínios de pesquisa de DNS</string> + <string name="edit">Editar</string> + <string name="endpoint">Endpoint</string> + <string name="error_down">Erro ao derrubar o túnel: %s</string> + <string name="error_fetching_apps">Erro ao obter lista de apps: %s</string> + <string name="error_root">Por favor, obtenha acesso root e tente novamente</string> + <string name="error_prepare">Erro ao preparar o túnel: %s</string> + <string name="error_up">Erro ao criar túnel: %s</string> + <string name="exclude_private_ips">Excluir IPs privados</string> + <string name="generate_new_private_key">Gerar uma nova chave privada</string> + <string name="generic_error">Erro desconhecido “%s”</string> + <string name="hint_automatic">(automático)</string> + <string name="hint_generated">(gerado)</string> + <string name="hint_optional">(opcional)</string> + <string name="hint_optional_discouraged">(opcional, não recomendado)</string> + <string name="hint_random">(aleatório)</string> + <string name="illegal_filename_error">Nome de arquivo inválido “%s”</string> + <string name="import_error">Não foi possível importar o túnel: %s</string> + <string name="import_from_qr_code">Importar Túnel por QR Code</string> + <string name="import_success">Importado “%s”</string> + <string name="interface_title">Interface</string> + <string name="key_contents_error">Caracteres inválidos na chave</string> + <string name="key_length_error">Chave com tamanho incorreto</string> + <string name="key_length_explanation_base64">: Chaves base64 do WireGuard devem ter 44 caracteres (32 bytes)</string> + <string name="key_length_explanation_binary">: Chaves do WireGuard devem ter 32 bytes</string> + <string name="key_length_explanation_hex">: Chaves hex do WireGuard devem ter 64 caracteres (32 bytes)</string> + <string name="latest_handshake">Último handshake</string> + <string name="latest_handshake_ago">%s atrás</string> + <string name="listen_port">Porta de escuta</string> + <string name="log_export_error">Não foi possível exportar o log: %s</string> + <string name="log_export_subject">Arquivo de log do WireGuard Android</string> + <string name="log_export_success">Salvo em “%s”</string> + <string name="log_export_title">Exportar arquivo de log</string> + <string name="log_saver_activity_label">Salvar log</string> + <string name="log_viewer_pref_summary">Registros podem ajudar na depuração</string> + <string name="log_viewer_pref_title">Exibir registros da aplicação</string> + <string name="log_viewer_title">Registro</string> + <string name="logcat_error">Não foi possível executar o logcat: </string> + <string name="module_enabler_disabled_summary">O módulo do Kernel experimental pode melhorar o desempenho</string> + <string name="module_enabler_disabled_title">Habilitar módulo backend do kernel</string> + <string name="module_enabler_enabled_summary">O backend do userspace mais lento pode aumentar a estabilidade</string> + <string name="module_enabler_enabled_title">Desativar backend do módulo do kernel</string> + <string name="module_installer_error">Ocorreu um erro. Tente novamente</string> + <string name="module_installer_initial">O módulo experimental do kernel pode melhorar o desempenho</string> + <string name="module_installer_not_found">Não há módulos disponíveis para o seu dispositivo</string> + <string name="module_installer_title">Baixar e instalar módulo do kernel</string> + <string name="module_installer_working">Baixando e instalando…</string> + <string name="module_version_error">Não foi possível determinar a versão do módulo do kernel</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Ligar um túnel irá desligar outros</string> + <string name="multiple_tunnels_summary_on">Múltiplos túneis podem ser ativados simultaneamente</string> + <string name="multiple_tunnels_title">Permitir múltiplos túneis simultâneos</string> + <string name="name">Nome</string> + <string name="no_config_error">Não é possível criar um túnel sem configuração</string> + <string name="no_configs_error">Nenhuma configuração foi encontrada</string> + <string name="no_tunnels_error">Não existem túneis</string> + <string name="parse_error_generic">string</string> + <string name="parse_error_inet_address">Endereço IP</string> + <string name="parse_error_inet_endpoint">endpoint</string> + <string name="parse_error_inet_network">Rede IP</string> + <string name="parse_error_reason">Não é possível analisar %1$s “%2$s”</string> + <string name="permission_description">permite controlar túneis do WireGuard, ativando e desativando túneis a vontade, potencialmente desviando o tráfego na Internet</string> + <string name="permission_label">controlar túneis do WireGuard</string> + <string name="persistent_keepalive">Keepalive persistente</string> + <string name="pre_shared_key">Chave pré-partilhada</string> + <string name="pre_shared_key_enabled">ativo</string> + <string name="private_key">Chave Privada</string> + <string name="public_key">Chave pública</string> + <string name="qr_code_hint">Dica: gerar com `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="quick_settings_tile_add_title">Adicionar botão ao painel de configurações rápidas</string> + <string name="quick_settings_tile_add_summary">A tecla de atalho alterna o túnel mais recente</string> + <string name="quick_settings_tile_add_failure">Não foi possível adicionar o atalho de botão: erro %d</string> + <string name="restore_on_boot_title">Restaurar na inicialização</string> + <string name="save">Salvar</string> + <string name="select_all">Selecionar tudo</string> + <string name="settings">Definições</string> + <string name="shell_exit_status_read_error">O Shell não pode ler o status de saída</string> + <string name="shell_marker_count_error">Shell esperava 4 marcadores, mas recebeu apenas %d</string> + <string name="shell_start_error">Shell falhou ao iniciar: %d</string> + <string name="success_application_will_restart">Sucesso. O aplicativo irá reiniciar agora…</string> + <string name="toggle_error">Erro ao ativar o túnel do WireGuard: %s</string> + <string name="tools_installer_already">wg e wg-quick já estão instalados</string> + <string name="tools_installer_failure">Não foi possível instalar ferramentas de linha de comando (sem root?)</string> + <string name="tools_installer_initial">Instalar ferramentas opcionais para scripting</string> + <string name="tools_installer_initial_magisk">Instalar ferramentas opcionais para scripting como o módulo Magisk</string> + <string name="tools_installer_initial_system">Instalar ferramentas opcionais para escrever na partição do sistema</string> + <string name="tools_installer_success_magisk">wg e wg-quick instalado como um módulo Magisk (é necessário reiniciar)</string> + <string name="tools_installer_success_system">wg e wg-quick instalados na partição do sistema</string> + <string name="tools_installer_title">Instalar ferramentas de linha de comando</string> + <string name="tools_installer_working">Instalando wg e wg-quick</string> + <string name="tools_unavailable_error">Ferramentas necessárias indisponíveis</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Não foi possível criar o túnel: %s</string> + <string name="tunnel_config_error">Não foi possível configurar o túnel (wg-quick retornou %d)</string> + <string name="tunnel_create_error">Não foi possível criar o túnel: %s</string> + <string name="tunnel_create_success">Túnel criado com sucesso “%s”</string> + <string name="tunnel_error_already_exists">Túnel “%s” já existe</string> + <string name="tunnel_error_invalid_name">Nome inválido</string> + <string name="tunnel_list_placeholder">Adicionar um túnel usando o botão abaixo</string> + <string name="tunnel_name">Nome do túnel</string> + <string name="tunnel_on_error">Não foi possível ativar o túnel (wgTurnOn retornou %d)</string> + <string name="tunnel_dns_failure">Não foi possível resolver host DNS: \"%s\"</string> + <string name="tunnel_rename_error">Não foi possível renomear o túnel: %s</string> + <string name="tunnel_rename_success">Renomeado com sucesso o túnel para “%s”</string> + <string name="type_name_kernel_module">Modo de Kernel</string> + <string name="unknown_error">Erro desconhecido</string> + <string name="updater_avalable">Uma atualização do aplicativo está disponível. Pôr favor atualize agora.</string> + <string name="updater_action">Baixar & Atualizar</string> + <string name="updater_rechecking">Obtendo metadados de atualização…</string> + <string name="updater_download_progress">Baixando a atualização: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Baixando atualização: %s</string> + <string name="updater_installing">Instalando atualização…</string> + <string name="updater_failure">Falha na atualização: %s. Tentaremos novamente em breve…</string> + <string name="updater_corrupt_title">Aplicativo corrompido</string> + <string name="updater_corrupt_message">Este aplicativo está corrompido. Por favor, baixe novamente o APK do site vinculado abaixo. Depois disso, desinstale o aplicativo e reinstale-o a partir do APK baixado.</string> + <string name="updater_corrupt_navigate">Abrir site</string> + <string name="version_summary_checking">Verificando a versão do backend %s</string> + <string name="version_summary_unknown">Versão %s desconhecida</string> + <string name="version_title">WireGuard para Android v%s</string> + <string name="vpn_not_authorized_error">Serviço de VPN não autorizado pelo usuário</string> + <string name="vpn_start_error">Não foi possível iniciar o serviço de VPN do Android</string> + <string name="zip_export_error">Não foi possível exportar túneis: %s</string> + <string name="zip_export_success">Salvo em “%s”</string> + <string name="zip_export_summary">O arquivo Zip será salvo na pasta de downloads</string> + <string name="zip_export_title">Exportar túneis para arquivo zip</string> + <string name="biometric_prompt_zip_exporter_title">Autenticar para exportar túneis</string> + <string name="biometric_prompt_private_key_title">Autenticar para ver a chave privada</string> + <string name="biometric_auth_error">Falha de autenticação</string> + <string name="biometric_auth_error_reason">Falha de autenticação: %s</string> +</resources> diff --git a/ui/src/main/res/values-pt-rPT/strings.xml b/ui/src/main/res/values-pt-rPT/strings.xml new file mode 100644 index 00000000..48afc41b --- /dev/null +++ b/ui/src/main/res/values-pt-rPT/strings.xml @@ -0,0 +1,233 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Não foi possível apagar %d túnel: %s</item> + <item quantity="other">Não foi possível apagar %d túneis: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">%d túnel apagado com sucesso</item> + <item quantity="other">%d túneis apagados com sucesso</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d túnel selecionado</item> + <item quantity="other">%d túneis selecionados</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Importado %1$d de %2$d túneis</item> + <item quantity="other">Importados %1$d de %2$d túneis</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">%d túnel importado</item> + <item quantity="other">%d túneis importados</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d Aplicação Excluída</item> + <item quantity="other">%d Aplicações Excluídas</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d Aplicação Incluída</item> + <item quantity="other">%d Aplicações incluídas</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d Excluída</item> + <item quantity="other">%d Excluídas</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d Incluída</item> + <item quantity="other">%d Incluídas</item> + </plurals> + <string name="all_applications">Todas as Aplicações</string> + <string name="exclude_from_tunnel">Excluir</string> + <string name="include_in_tunnel">Apenas aplicações incluídas</string> + <plurals name="include_n_applications"> + <item quantity="one">Incluir %d Aplicação</item> + <item quantity="other">Incluir %d Aplicações</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Excluir %d Aplicação</item> + <item quantity="other">Exluir %d Aplicações</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">a cada %d segundo</item> + <item quantity="other">a cada %d segundos</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">segundo</item> + <item quantity="other">segundos</item> + </plurals> + <string name="use_all_applications">Usar todas as aplicações</string> + <string name="add_peer">Adicionar nó</string> + <string name="addresses">Endereços</string> + <string name="applications">Aplicações</string> + <string name="allow_remote_control_intents_summary_off">Aplicações externas não podem controlar túneis (recomendado)</string> + <string name="allow_remote_control_intents_summary_on">Aplicações externas podem controlar túneis (avançado)</string> + <string name="allow_remote_control_intents_title">Permitir controlo remoto por outras aplicações</string> + <string name="allowed_ips">IPs permitidos</string> + <string name="bad_config_context">%2$s de %1$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s em %2$s</string> + <string name="bad_config_explanation_pka">: Tem que ser positivo e não mais do que 65535</string> + <string name="bad_config_explanation_positive_number">: tem que ser positivo</string> + <string name="bad_config_explanation_udp_port">: Tem que ser um número de porta UDP válido</string> + <string name="bad_config_reason_invalid_key">Chave inválida</string> + <string name="bad_config_reason_invalid_number">Número inválido</string> + <string name="bad_config_reason_invalid_value">Valor inválido</string> + <string name="bad_config_reason_missing_attribute">Atributo em falta</string> + <string name="bad_config_reason_missing_section">Secção em falta</string> + <string name="bad_config_reason_syntax_error">Erro de sintaxe</string> + <string name="bad_config_reason_unknown_attribute">Atributo desconhecido</string> + <string name="bad_config_reason_unknown_section">Secção desconhecida</string> + <string name="bad_config_reason_value_out_of_range">Valor fora do intervalo</string> + <string name="bad_extension_error">O ficheiro tem que ser do tipo .conf ou .zip</string> + <string name="cancel">Cancelar</string> + <string name="config_delete_error">Não é possível apagar arquivo de configuração %s</string> + <string name="config_exists_error">A configuração para \"%s\" já existe</string> + <string name="config_file_exists_error">O ficheiro de configuração \"%s\" já existe</string> + <string name="config_not_found_error">O ficheiro de configuração \"%s\" não foi encontrado</string> + <string name="config_rename_error">Não foi possível renomear o ficheiro de configuração “%s\"</string> + <string name="config_save_error">Não foi possível guardar a configuração para “%1$s”: %2$s</string> + <string name="config_save_success">A configuração para \"%s\" foi guardada com sucesso</string> + <string name="create_activity_title">Criar túnel WireGuard</string> + <string name="create_bin_dir_error">Não foi possível criar diretoria de binários local</string> + <string name="create_downloads_file_error">Não foi possível criar diretoria de downloads local</string> + <string name="create_empty">Criar do zero</string> + <string name="create_from_file">Importar de ficheiro ou arquivo</string> + <string name="create_from_qr_code">Digitalizar a partir de código QR</string> + <string name="create_output_dir_error">Não foi possível criar diretoria de saída</string> + <string name="create_temp_dir_error">Não foi possível criar diretoria local temporária</string> + <string name="create_tunnel">Criar túnel</string> + <string name="copied_to_clipboard">%s copiado para a área de transferências</string> + <string name="dark_theme_summary_off">Atualmente a usar tema claro (dia)</string> + <string name="dark_theme_summary_on">Atualmente a usar tema escuro (noite)</string> + <string name="dark_theme_title">Usar tema escuro</string> + <string name="delete">Eliminar</string> + <string name="tv_delete">Selecione o túnel para apagar</string> + <string name="tv_select_a_storage_drive">Selecione uma unidade de armazenamento</string> + <string name="tv_no_file_picker">Por favor, instale um utilitário de gestão de ficheiros para procurar arquivos</string> + <string name="tv_add_tunnel_get_started">Adicionar um túnel para começar</string> + <string name="disable_config_export_title">Desativar exportação de configuração</string> + <string name="disable_config_export_description">Desativar a exportação de configuração torna as chaves privadas menos acessíveis</string> + <string name="dns_servers">Servidores de DNS</string> + <string name="edit">Editar</string> + <string name="endpoint">Endpoint</string> + <string name="error_down">Erro ao fechar túnel: %s</string> + <string name="error_fetching_apps">Erro ao obter lista de aplicações: %s</string> + <string name="error_root">Por favor, obtenha acesso root e tente novamente</string> + <string name="error_up">Erro ao abrir túnel: %s</string> + <string name="exclude_private_ips">Excluir IPs privados</string> + <string name="generate_new_private_key">Gerar nova chave privada</string> + <string name="generic_error">Erro desconhecido “%s”</string> + <string name="hint_automatic">(automático)</string> + <string name="hint_generated">(gerado)</string> + <string name="hint_optional">(opcional)</string> + <string name="hint_optional_discouraged">(opcional, não recomendado)</string> + <string name="hint_random">(aleatório)</string> + <string name="illegal_filename_error">Nome de arquivo inválido “%s”</string> + <string name="import_error">Não foi possível importar túnel: %s</string> + <string name="import_from_qr_code">Importar Túnel a partir de Código QR</string> + <string name="import_success">“%s” Importado</string> + <string name="interface_title">Interface</string> + <string name="key_contents_error">Caracteres inválidos na chave</string> + <string name="key_length_error">Tamanho de chave incorreto</string> + <string name="key_length_explanation_base64">: Chaves base64 do WireGuard têm que ter 44 caracteres (32 bytes)</string> + <string name="key_length_explanation_binary">: Chaves de WireGuard têm que ter 32 bytes</string> + <string name="key_length_explanation_hex">: Chaves hexadecimais do WireGuard têm que ter 64 caracteres (32 bytes)</string> + <string name="listen_port">Porta de escuta</string> + <string name="log_export_error">Não foi possível exportar o log: %s</string> + <string name="log_export_subject">Arquivo de log do WireGuard Android</string> + <string name="log_export_success">Guardado em “%s”</string> + <string name="log_export_title">Exportar ficheiro de log</string> + <string name="log_saver_activity_label">Guardar log</string> + <string name="log_viewer_pref_summary">Logs podem ajudar na depuração</string> + <string name="log_viewer_pref_title">Ver log da aplicação</string> + <string name="log_viewer_title">Log</string> + <string name="logcat_error">Não foi possível executar o logcat: </string> + <string name="module_enabler_disabled_summary">O módulo experimental de kernel pode melhorar o desempenho</string> + <string name="module_enabler_disabled_title">Habilitar módulo backend do kernel</string> + <string name="module_enabler_enabled_summary">O backend do userspace mais lento pode aumentar a estabilidade</string> + <string name="module_enabler_enabled_title">Desabilitar módulo backend do kernel</string> + <string name="module_installer_error">Ocorreu um erro. Por favor, tente novamente</string> + <string name="module_installer_initial">O módulo experimental do kernel pode melhorar o desempenho</string> + <string name="module_installer_not_found">Não há módulos disponíveis para o seu dispositivo</string> + <string name="module_installer_title">Transferir e instalar módulo de kernel</string> + <string name="module_installer_working">A transferir e instalar…</string> + <string name="module_version_error">Não foi possível determinar a versão do módulo de kernel</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Ativar um túnel irá desativar todos os outros</string> + <string name="multiple_tunnels_summary_on">Vários túneis podem ser ativados simultaneamente</string> + <string name="multiple_tunnels_title">Permitir vários túneis em simultâneo</string> + <string name="name">Nome</string> + <string name="no_config_error">A tentar abrir um túnel sem configuração</string> + <string name="no_configs_error">Nenhuma configuração encontrada</string> + <string name="no_tunnels_error">Não existem túneis</string> + <string name="parse_error_generic">texto</string> + <string name="parse_error_inet_address">Endereço IP</string> + <string name="parse_error_inet_endpoint">endpoint</string> + <string name="parse_error_inet_network">Rede de IP</string> + <string name="parse_error_integer">número</string> + <string name="parse_error_reason">Não foi possível analisar %1$s “%2$s”</string> + <string name="peer">Nó</string> + <string name="permission_description">controlar túneis WireGuard, ativando e desativando túneis a vontade, potencialmente desviando o tráfego na Internet</string> + <string name="permission_label">controlar túneis WireGuard</string> + <string name="persistent_keepalive">Keepalive persistente</string> + <string name="pre_shared_key">Chave pré-partilhada</string> + <string name="pre_shared_key_enabled">ativo</string> + <string name="private_key">Chave privada</string> + <string name="public_key">Chave Pública</string> + <string name="qr_code_hint">Dica: gerar com `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="restore_on_boot_summary_off">Não abrirá túneis ativos durante o arranque</string> + <string name="restore_on_boot_summary_on">Abrirá túneis ativos durante o arranque</string> + <string name="restore_on_boot_title">Restaurar no arranque</string> + <string name="save">Guardar</string> + <string name="select_all">Selecionar tudo</string> + <string name="settings">Definições</string> + <string name="shell_exit_status_read_error">A shell não pôde ler o estado de saída</string> + <string name="shell_marker_count_error">A shell esperava 4 marcadores, recebeu %d</string> + <string name="shell_start_error">A shell falhou ao iniciar: %d</string> + <string name="success_application_will_restart">Sucesso. A aplicação irá reiniciar…</string> + <string name="toggle_all">Ativar/Desativar todos</string> + <string name="toggle_error">Erro ao alterar o túnel WireGuard: %s</string> + <string name="tools_installer_already">wg e wg-quick já estão instalados</string> + <string name="tools_installer_failure">Não foi possível instalar as ferramentas de linha de comando (sem root?)</string> + <string name="tools_installer_initial">Instalar ferramentas opcionais para scripting</string> + <string name="tools_installer_initial_magisk">Instalar ferramentas opcionais para scripting como módulo Magisk</string> + <string name="tools_installer_initial_system">Instalar ferramentas opcionais para scripting na partição de sistema</string> + <string name="tools_installer_success_magisk">wg e wg-quick instalados como módulo Magisk (requer reinicialização)</string> + <string name="tools_installer_success_system">wg e wg-quick instalados na partição do sistema</string> + <string name="tools_installer_title">Instalar ferramentas de linha de comando</string> + <string name="tools_installer_working">A instalar wg e wg-quick</string> + <string name="tools_unavailable_error">Ferramentas necessárias não disponíveis</string> + <string name="transfer">Transferência</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Não foi possível criar dispositivo tun</string> + <string name="tunnel_config_error">Não foi possível configurar o túnel (wg-quick retornou %d)</string> + <string name="tunnel_create_error">Não foi possível criar o túnel: %s</string> + <string name="tunnel_create_success">Túnel criado com sucesso “%s”</string> + <string name="tunnel_error_already_exists">O túnel “%s” já existe</string> + <string name="tunnel_error_invalid_name">Nome inválido</string> + <string name="tunnel_name">Nome do túnel</string> + <string name="tunnel_on_error">Não foi possível ligar o túnel (wgTurnOn retornou %d)</string> + <string name="tunnel_rename_error">Não foi possível renomear o túnel: %s</string> + <string name="tunnel_rename_success">Túnel renomeado com sucesso para “%s”</string> + <string name="type_name_go_userspace">Go userspace</string> + <string name="type_name_kernel_module">Módulo de kernel</string> + <string name="unknown_error">Erro desconhecido</string> + <string name="version_summary_checking">A verificar versão de backend %s</string> + <string name="version_summary_unknown">Versão %s desconhecida</string> + <string name="version_title">WireGuard para Android v%s</string> + <string name="vpn_not_authorized_error">Serviço VPN não foi autorizado pelo utilizador</string> + <string name="vpn_start_error">Não foi possível iniciar o serviço de VPN do Android</string> + <string name="zip_export_error">Não foi possível exportar túneis: %s</string> + <string name="zip_export_success">Guardado em “%s”</string> + <string name="zip_export_summary">O arquivo Zip será guardado na pasta de downloads</string> + <string name="zip_export_title">Exportar túneis para arquivo zip</string> + <string name="biometric_prompt_zip_exporter_title">Autenticar para exportar túneis</string> + <string name="biometric_prompt_private_key_title">Autenticar para ver a chave privada</string> + <string name="biometric_auth_error">Falha de autenticação</string> + <string name="biometric_auth_error_reason">Falha de autenticação: %s</string> +</resources> diff --git a/ui/src/main/res/values-ro-rRO/strings.xml b/ui/src/main/res/values-ro-rRO/strings.xml new file mode 100644 index 00000000..16ee62f0 --- /dev/null +++ b/ui/src/main/res/values-ro-rRO/strings.xml @@ -0,0 +1,259 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Nu se poate șterge %d tunel: %s</item> + <item quantity="few">Nu se pot șterge %d tunele: %s</item> + <item quantity="other">Nu se pot șterge %d de tunele: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">%d tunel a fost șters</item> + <item quantity="few">%d tunele șterse</item> + <item quantity="other">%d de tunele șterse</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d tunel selectat</item> + <item quantity="few">%d tuneluri selectate</item> + <item quantity="other">%d de tuneluri selectate</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">%1$d din %2$d tuneluri importate</item> + <item quantity="few">%1$d din %2$d tuneluri importate</item> + <item quantity="other">%1$d din %2$d de tuneluri importate</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">%d tunel importat</item> + <item quantity="few">%d tuneluri importate</item> + <item quantity="other">%d de tuneluri importate</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d aplicație exclusă</item> + <item quantity="few">%d aplicații excluse</item> + <item quantity="other">%d de aplicații excluse</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d aplicație inclusă</item> + <item quantity="few">%d aplicații incluse</item> + <item quantity="other">%d de aplicații incluse</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d exclusă</item> + <item quantity="few">%d excluse</item> + <item quantity="other">%d excluse</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d inclusă</item> + <item quantity="few">%d incluse</item> + <item quantity="other">%d incluse</item> + </plurals> + <string name="all_applications">Toate aplicațiile</string> + <string name="exclude_from_tunnel">Excludere</string> + <string name="include_in_tunnel">Includere numai</string> + <plurals name="include_n_applications"> + <item quantity="one">Include %d aplicație</item> + <item quantity="few">Include %d aplicații</item> + <item quantity="other">Include %d de aplicații</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Exclude %d aplicație</item> + <item quantity="few">Exclude %d aplicații</item> + <item quantity="other">Exclude %d de aplicații</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">în fiecare secundă</item> + <item quantity="few">la fiecare %d secunde</item> + <item quantity="other">la fiecare %d secunde</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">secundă</item> + <item quantity="few">secunde</item> + <item quantity="other">secunde</item> + </plurals> + <string name="use_all_applications">Utilizează toate aplicațiile</string> + <string name="add_peer">Adăugare pereche</string> + <string name="addresses">Adrese</string> + <string name="applications">Aplicații</string> + <string name="allow_remote_control_intents_summary_off">Aplicațiile externe nu pot comuta tunelurile (recomandat)</string> + <string name="allow_remote_control_intents_summary_on">Aplicațiile externe pot comuta tunelurile (avansat)</string> + <string name="allow_remote_control_intents_title">Permite aplicații de control la distanță</string> + <string name="allowed_ips">IP-uri permise</string> + <string name="bad_config_context">%2$s pentru %1$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s în %2$s</string> + <string name="bad_config_explanation_pka">: Trebuie să fie pozitiv și nu mai mare decât 65535</string> + <string name="bad_config_explanation_positive_number">: Trebuie să fie pozitiv</string> + <string name="bad_config_explanation_udp_port">: Trebuie să fie un număr de port UDP valid</string> + <string name="bad_config_reason_invalid_key">Cheie invalidă</string> + <string name="bad_config_reason_invalid_number">Număr invalid</string> + <string name="bad_config_reason_invalid_value">Valoare invalidă</string> + <string name="bad_config_reason_missing_attribute">Atribuit lipsă</string> + <string name="bad_config_reason_missing_section">Secțiune lipsă</string> + <string name="bad_config_reason_syntax_error">Eroare de sintaxă</string> + <string name="bad_config_reason_unknown_attribute">Atribuit necunoscut</string> + <string name="bad_config_reason_unknown_section">Secțiune necunoscută</string> + <string name="bad_config_reason_value_out_of_range">Valoare în afara intervalului</string> + <string name="bad_extension_error">Fișierul trebuie să fie .conf sau .zip</string> + <string name="error_no_qr_found">Codul QR nu a fost găsit în imagine</string> + <string name="error_qr_checksum">Nu a putut fi efectuată verificarea sumei de control pentru codul QR</string> + <string name="cancel">Anulare</string> + <string name="config_delete_error">Fișierul de configurare %s nu poate fi șters</string> + <string name="config_exists_error">Configurația pentru „%s” există deja</string> + <string name="config_file_exists_error">Fișierul de configurare „%s” există deja</string> + <string name="config_not_found_error">Fișier de configurare „%s” negăsit</string> + <string name="config_rename_error">Fișierul de configurare „%s” nu poate fi redenumit</string> + <string name="config_save_error">Nu poate fi salvată configurația pentru „%1$s”: %2$s</string> + <string name="config_save_success">Configurația pentru „%s” a fost salvată</string> + <string name="create_activity_title">Creare tunel WireGuard</string> + <string name="create_bin_dir_error">Nu se poate crea directorul binar local</string> + <string name="create_downloads_file_error">Fișierul nu poate fi creat în directorul pentru descărcări</string> + <string name="create_empty">Creare de la zero</string> + <string name="create_from_file">Importare din fișier sau arhivă</string> + <string name="create_from_qr_code">Scanare din cod QR</string> + <string name="create_output_dir_error">Nu se poate crea directorul de ieșire</string> + <string name="create_temp_dir_error">Nu se poate crea directorul temporar local</string> + <string name="create_tunnel">Creare tunel</string> + <string name="copied_to_clipboard">%s a fost copiat în memoria temporară</string> + <string name="dark_theme_summary_off">În prezent este utilizată tema luminoasă (zi)</string> + <string name="dark_theme_summary_on">În prezent este utilizată tema întunecată (noapte)</string> + <string name="dark_theme_title">Utilizare temă întunecată</string> + <string name="delete">Ștergere</string> + <string name="tv_delete">Selectează tunelul de șters</string> + <string name="tv_select_a_storage_drive">Selectează o unitate de stocare</string> + <string name="tv_no_file_picker">Instalează un serviciu de administrare a fișierelor pentru a căuta fișiere</string> + <string name="tv_add_tunnel_get_started">Adaugă un tunel pentru a începe</string> + <string name="donate_title">♥ Donează pentru proiectul WireGuard</string> + <string name="donate_summary">Fiecare contribuţie ajută</string> + <string name="donate_google_play_disappointment">Vă mulțumim pentru sprijinul acordat Proiectului WireGuard!\n\nDin păcate, din cauza politicilor Google, nu avem voie să punem un link către pagina web a proiectului unde poți face o donație. Sperăm că vă puteți descurca!\n\nMulțumim din nou pentru contribuție.</string> + <string name="disable_config_export_title">Dezactivează exportarea configurației</string> + <string name="disable_config_export_description">Dezactivarea exportării configurației face mai puțin accesibile cheile private</string> + <string name="dns_servers">Servere DNS</string> + <string name="dns_search_domains">Domenii de căutare</string> + <string name="edit">Editare</string> + <string name="endpoint">Punct final</string> + <string name="error_down">Eroare la oprirea tunelului: %s</string> + <string name="error_fetching_apps">Eroare la preluarea listei de aplicații: %s</string> + <string name="error_root">Obține acces root și încearcă din nou</string> + <string name="error_prepare">Eroare la pregătirea tunelului: %s</string> + <string name="error_up">Eroare la pornirea tunelului: %s</string> + <string name="exclude_private_ips">Excludere IP-uri private</string> + <string name="generate_new_private_key">Generare cheie privată nouă</string> + <string name="generic_error">Eroare „%s” necunoscută</string> + <string name="hint_automatic">(auto)</string> + <string name="hint_generated">(generată)</string> + <string name="hint_optional">(opțională)</string> + <string name="hint_optional_discouraged">(opțională, nerecomandată)</string> + <string name="hint_random">(aleatorie)</string> + <string name="illegal_filename_error">Nume nepermis de fișier „%s”</string> + <string name="import_error">Tunelul nu poate fi importat: %s</string> + <string name="import_from_qr_code">Importare tunel din cod QR</string> + <string name="import_success">„%s” importat</string> + <string name="interface_title">Interfață</string> + <string name="key_contents_error">Caractere incorecte în cheie</string> + <string name="key_length_error">Lungime incorectă a cheii</string> + <string name="key_length_explanation_base64">: Cheile base64 ale WireGuard trebuie să aibă 44 de caractere (32 de octeți)</string> + <string name="key_length_explanation_binary">: Cheile WireGuard trebuie să aibă 32 de octeți</string> + <string name="key_length_explanation_hex">: Cheile hex WireGuard trebuie să aibă 64 de caractere (32 de octeți)</string> + <string name="latest_handshake">Cea mai recentă negociere</string> + <string name="latest_handshake_ago">%s în urmă</string> + <string name="listen_port">Port de ascultare</string> + <string name="log_export_error">Jurnalul nu poate fi exportat: %s</string> + <string name="log_export_subject">Fișier de jurnal Android WireGuard</string> + <string name="log_export_success">Salvat în „%s”</string> + <string name="log_export_title">Exportare fișier de jurnal</string> + <string name="log_saver_activity_label">Salvare jurnal</string> + <string name="log_viewer_pref_summary">Jurnalele pot ajuta la depanare</string> + <string name="log_viewer_pref_title">Vizualizare jurnal aplicație</string> + <string name="log_viewer_title">Jurnal</string> + <string name="logcat_error">Programul logcat nu poate fi executat: </string> + <string name="module_enabler_disabled_summary">Modulul experimental de nucleu poate îmbunătăți performanța</string> + <string name="module_enabler_disabled_title">Activează biblioteca modulului de nucleu</string> + <string name="module_enabler_enabled_summary">Biblioteca mai lentă a spațiului utilizatorului poate îmbunătăți stabilitatea</string> + <string name="module_enabler_enabled_title">Dezactivează biblioteca modulului de nucleu</string> + <string name="module_installer_error">A apărut o eroare. Încearcă din nou</string> + <string name="module_installer_initial">Modulul experimental de nucleu poate îmbunătăți performanța</string> + <string name="module_installer_not_found">Nu sunt disponibile module pentru dispozitivul tău</string> + <string name="module_installer_title">Descărcare și instalare modul nucleu</string> + <string name="module_installer_working">Se descarcă și se instalează…</string> + <string name="module_version_error">Nu se poate determina versiunea modulului de nucleu</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Pornirea unui tunel va opri celelalte tuneluri</string> + <string name="multiple_tunnels_summary_on">Mai multe tunele pot fi pornite simultan</string> + <string name="multiple_tunnels_title">Permite mai multe tuneluri simultane</string> + <string name="name">Nume</string> + <string name="no_config_error">Se încearcă pornirea unui tunel fără configurație</string> + <string name="no_configs_error">Nu au fost găsite configurații</string> + <string name="no_tunnels_error">Nu există tuneluri</string> + <string name="parse_error_generic">șir</string> + <string name="parse_error_inet_address">Adresă IP</string> + <string name="parse_error_inet_endpoint">punct final</string> + <string name="parse_error_inet_network">Rețea IP</string> + <string name="parse_error_integer">număr</string> + <string name="parse_error_reason">Nu se poate analiza %1$s „%2$s”</string> + <string name="peer">Pereche</string> + <string name="permission_description">controleze tuneluri WireGuard și, astfel, să activeze și să dezactiveze tuneluri în mod automat, existând posibilitatea de a dirija greșit traficul de internet</string> + <string name="permission_label">controleze tuneluri WireGuard</string> + <string name="persistent_keepalive">Mesaj keepalive persistent</string> + <string name="pre_shared_key">Cheie predistribuită</string> + <string name="pre_shared_key_enabled">activată</string> + <string name="private_key">Cheie privată</string> + <string name="public_key">Cheie publică</string> + <string name="qr_code_hint">Sfat: generează cu `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="quick_settings_tile_add_title">Adaugă secțiune la panoul de setări rapide</string> + <string name="quick_settings_tile_add_summary">Comanda rapidă comută cel mai recent tunel</string> + <string name="restore_on_boot_summary_off">Tunelurile activate nu vor fi pornite odată cu pornirea dispozitivului</string> + <string name="restore_on_boot_summary_on">Tunelurile activate vor fi pornite odată cu pornirea dispozitivului</string> + <string name="restore_on_boot_title">Restaurare la pornire</string> + <string name="save">Salvare</string> + <string name="select_all">Selectare totală</string> + <string name="settings">Setări</string> + <string name="shell_exit_status_read_error">Interfața de comunicare nu poate citi starea de ieșire</string> + <string name="shell_marker_count_error">Interfața de comunicare a așteptat 4 marcatori, a primit %d</string> + <string name="shell_start_error">Interfața de comunicare nu a putut porni: %d</string> + <string name="success_application_will_restart">Succes. Aplicația se va reporni acum…</string> + <string name="toggle_all">Comutare toate</string> + <string name="toggle_error">Eroare la comutarea tunelului WireGuard: %s</string> + <string name="tools_installer_already">wg și wg-quick sunt deja instalate</string> + <string name="tools_installer_failure">Nu se pot instala instrumentele de linie de comandă (lipsă root?)</string> + <string name="tools_installer_initial">Instalare instrumente opționale pentru scriptare</string> + <string name="tools_installer_initial_magisk">Instalare instrumente opționale pentru scriptare ca modul Magisk</string> + <string name="tools_installer_initial_system">Instalare instrumente opționale pentru scriptare în partiția de sistem</string> + <string name="tools_installer_success_magisk">wg și wg-quick instalate ca modul Magisk (este necesară repornirea)</string> + <string name="tools_installer_success_system">wg și wg-quick instalate în partiția de sistem</string> + <string name="tools_installer_title">Instalare instrumente de linie de comandă</string> + <string name="tools_installer_working">Se instalează wg și wg-quick</string> + <string name="tools_unavailable_error">Instrumentele necesare sunt indisponibile</string> + <string name="transfer">Transferare</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Nu se poate crea dispozitiv TUN</string> + <string name="tunnel_config_error">Tunelul nu poate fi configurat (wg-quick a returnat %d)</string> + <string name="tunnel_create_error">Tunelul nu poate fi creat: %s</string> + <string name="tunnel_create_success">Tunelul „%s” a fost creat</string> + <string name="tunnel_error_already_exists">Tunelul „%s” există deja</string> + <string name="tunnel_error_invalid_name">Nume invalid</string> + <string name="tunnel_name">Numele tunelului</string> + <string name="tunnel_on_error">Tunelul nu poate fi pornit (wgTurnOn a returnat %d)</string> + <string name="tunnel_dns_failure">Nu se poate rezolva numele gazdei DNS: „%s”</string> + <string name="tunnel_rename_error">Tunelul nu poate fi redenumit: %s</string> + <string name="tunnel_rename_success">Tunelul a fost redenumit ca „%s”</string> + <string name="type_name_go_userspace">Spațiu de utilizator Go</string> + <string name="type_name_kernel_module">Modul nucleu</string> + <string name="unknown_error">Eroare necunoscută</string> + <string name="version_summary">Bibliotecă %1$s %2$s</string> + <string name="version_summary_checking">Se verifică versiunea bibliotecii %s</string> + <string name="version_summary_unknown">Versiune %s necunoscută</string> + <string name="version_title">WireGuard pentru Android v%s</string> + <string name="vpn_not_authorized_error">Serviciul VPN nu este autorizat de utilizator</string> + <string name="vpn_start_error">Serviciul VPN Android nu poate fi pornit</string> + <string name="zip_export_error">Tunelurile nu pot fi exportate: %s</string> + <string name="zip_export_success">Salvat în „%s”</string> + <string name="zip_export_summary">Fișierul zip va fi salvat în dosarul pentru descărcări</string> + <string name="zip_export_title">Exportare tuneluri în fișierul zip</string> + <string name="biometric_prompt_zip_exporter_title">Autentifică-te pentru a exporta tunelurile</string> + <string name="biometric_prompt_private_key_title">Autentifică-te pentru a vizualiza cheia privată</string> + <string name="biometric_auth_error">Eroare la autentificare</string> + <string name="biometric_auth_error_reason">Eroare la autentificare: %s</string> +</resources> diff --git a/ui/src/main/res/values-ru/strings.xml b/ui/src/main/res/values-ru/strings.xml index dfa0904e..70f38ee1 100644 --- a/ui/src/main/res/values-ru/strings.xml +++ b/ui/src/main/res/values-ru/strings.xml @@ -2,19 +2,19 @@ <resources> <plurals name="delete_error"> <item quantity="one">Не удалось удалить %d туннель: %s</item> - <item quantity="few">Не удалось удалить %d туннелей: %s</item> + <item quantity="few">Не удалось удалить %d туннеля: %s</item> <item quantity="many">Не удалось удалить %d туннелей: %s</item> <item quantity="other">Не удалось удалить %d туннелей: %s</item> </plurals> <plurals name="delete_success"> <item quantity="one">Успешно удален %d туннель</item> - <item quantity="few">Успешно удалено %d туннелей</item> + <item quantity="few">Успешно удалено %d туннеля</item> <item quantity="many">Успешно удалено %d туннелей</item> <item quantity="other">Успешно удалено %d туннелей</item> </plurals> <plurals name="delete_title"> <item quantity="one">%d туннель выбран</item> - <item quantity="few">%d туннелей выбрано</item> + <item quantity="few">%d туннеля выбрано</item> <item quantity="many">%d туннелей выбрано</item> <item quantity="other">%d туннелей выбрано</item> </plurals> @@ -25,111 +25,173 @@ <item quantity="other">Импортировано %1$d из %2$d туннелей</item> </plurals> <plurals name="import_total_success"> - <item quantity="one">Импортированный %d туннель</item> - <item quantity="few">Импортировано %d туннелей</item> + <item quantity="one">Импортирован %d туннель</item> + <item quantity="few">Импортировано %d туннеля</item> <item quantity="many">Импортировано %d туннелей</item> <item quantity="other">Импортировано %d туннелей</item> </plurals> <plurals name="set_excluded_applications"> - <item quantity="one">%d Исключенное приложение</item> - <item quantity="few">%d Исключенных приложений</item> - <item quantity="many">%d Исключенных приложений</item> - <item quantity="other">%d Исключенных приложений</item> + <item quantity="one">%d исключенное приложение</item> + <item quantity="few">%d исключенных приложения</item> + <item quantity="many">%d исключенных приложений</item> + <item quantity="other">%d исключенных приложений</item> </plurals> - <string name="add_peer">Добавить пира</string> - <string name="addresses">IP-адреса</string> - <string name="allow_remote_control_intents_summary_off">Сторонние приложения не могут переключать туннели (рекомендуется)</string> - <string name="allow_remote_control_intents_summary_on">Сторонние приложения могут переключать туннели (дополнительно)</string> - <string name="allow_remote_control_intents_title">Доступ к другим приложениям</string> - <string name="allowed_ips">Разрешенные IP-адреса</string> - <string name="app_name">WireGuard</string> + <plurals name="set_included_applications"> + <item quantity="one">%d включенное приложение</item> + <item quantity="few">%d включенных приложения</item> + <item quantity="many">%d включенных приложений</item> + <item quantity="other">%d включенных приложений</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d исключено</item> + <item quantity="few">%d исключено</item> + <item quantity="many">%d исключено</item> + <item quantity="other">%d исключено</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d включено</item> + <item quantity="few">%d включено</item> + <item quantity="many">%d включено</item> + <item quantity="other">%d включено</item> + </plurals> + <string name="all_applications">Все приложения</string> + <string name="exclude_from_tunnel">Исключить для</string> + <string name="include_in_tunnel">Включить для</string> + <plurals name="include_n_applications"> + <item quantity="one">Включить %d приложение</item> + <item quantity="few">Включить %d приложения</item> + <item quantity="many">Включить %d приложений</item> + <item quantity="other">Включить %d приложений</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Исключить %d приложение</item> + <item quantity="few">Исключить %d приложения</item> + <item quantity="many">Исключить %d приложений</item> + <item quantity="other">Исключить %d приложений</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">каждую секунду</item> + <item quantity="few">каждые %d секунды</item> + <item quantity="many">каждые %d секунд</item> + <item quantity="other">каждые %d секунд</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">секунда</item> + <item quantity="few">секунды</item> + <item quantity="many">секунд</item> + <item quantity="other">секунд</item> + </plurals> + <string name="use_all_applications">Использовать все приложения</string> + <string name="add_peer">Добавить пир</string> + <string name="addresses">Адреса</string> + <string name="applications">Приложения</string> + <string name="allow_remote_control_intents_summary_off">Внешние приложения не могут переключать туннели (рекомендуется)</string> + <string name="allow_remote_control_intents_summary_on">Внешние приложения могут переключать туннели (продвинутые)</string> + <string name="allow_remote_control_intents_title">Разрешить управление через внешние приложения</string> + <string name="allowed_ips">Разрешенные IP</string> <string name="bad_config_context">%1$s из %2$s</string> <string name="bad_config_context_top_level">%s</string> <string name="bad_config_error">%1$s в %2$s</string> - <string name="bad_config_explanation_pka">: Должен быть положительный и не больше 65535</string> - <string name="bad_config_explanation_positive_number">: Должен быть положительный</string> - <string name="bad_config_explanation_udp_port">: Должен быть действительный номер порта UDP</string> + <string name="bad_config_explanation_pka">: Значение должно быть больше нуля, но меньше 65535</string> + <string name="bad_config_explanation_positive_number">: Значение должно быть больше нуля</string> + <string name="bad_config_explanation_udp_port">: Должен быть допустимым UDP-портом</string> <string name="bad_config_reason_invalid_key">Неправильный ключ</string> <string name="bad_config_reason_invalid_number">Неправильный номер</string> - <string name="bad_config_reason_invalid_value">Неправильное значение</string> + <string name="bad_config_reason_invalid_value">Недопустимое значение</string> <string name="bad_config_reason_missing_attribute">Несуществующий атрибут</string> <string name="bad_config_reason_missing_section">Несуществующий раздел</string> <string name="bad_config_reason_syntax_error">Синтаксическая ошибка</string> <string name="bad_config_reason_unknown_attribute">Неизвестный атрибут</string> <string name="bad_config_reason_unknown_section">Неизвестный раздел</string> <string name="bad_config_reason_value_out_of_range">Значение вне диапазона</string> - <string name="bad_extension_error">Файл должен быть .conf или .zip</string> + <string name="bad_extension_error">Файл должен иметь формат .conf или .zip</string> + <string name="error_no_qr_found">QR-код не найден на изображении</string> + <string name="error_qr_checksum">Ошибка проверки контрольной суммы QR-кода</string> <string name="cancel">Отмена</string> <string name="config_delete_error">Не удалось удалить файл конфигурации %s</string> <string name="config_exists_error">Конфигурация для “%s” уже существует</string> <string name="config_file_exists_error">Файл конфигурации “%s” уже существует</string> <string name="config_not_found_error">Файл конфигурации “%s” не найден</string> <string name="config_rename_error">Не удалось переименовать файл конфигурации “%s”</string> - <string name="config_save_error">Не удается сохранить конфигурацию для “%1$s”: %2$s</string> + <string name="config_save_error">Не удалось сохранить конфигурацию для “%1$s”: %2$s</string> <string name="config_save_success">Конфигурация для “%s” успешно сохранена</string> - <string name="create_activity_title">Создать WireGuard туннель</string> - <string name="create_bin_dir_error">Не удалось создать локальный двоичный каталог</string> + <string name="create_activity_title">Создать туннель WireGuard</string> + <string name="create_bin_dir_error">Не удалось создать локальный бинарный каталог</string> <string name="create_downloads_file_error">Не удалось создать файл в каталоге загрузок</string> - <string name="create_empty">Создать вручную</string> + <string name="create_empty">Создать с нуля</string> <string name="create_from_file">Импорт из файла или архива</string> <string name="create_from_qr_code">Сканировать QR-код</string> <string name="create_output_dir_error">Не удалось создать выходной каталог</string> <string name="create_temp_dir_error">Не удалось создать временный локальный каталог</string> <string name="create_tunnel">Создать туннель</string> + <string name="copied_to_clipboard">Скопирован(о) в буфер обмена: %s</string> <string name="dark_theme_summary_off">В данный момент используется светлая (дневная) тема</string> <string name="dark_theme_summary_on">В данный момент используется темная (ночная) тема</string> <string name="dark_theme_title">Использовать темную тему</string> <string name="delete">Удалить</string> + <string name="tv_delete">Выберите туннель для удаления</string> + <string name="tv_select_a_storage_drive">Выберите накопитель</string> + <string name="tv_no_file_picker">Пожалуйста, установите утилиту управления файлами для их просмотра</string> + <string name="tv_add_tunnel_get_started">Добавьте туннель, чтобы начать</string> + <string name="donate_title">♥ Пожертвовать проекту WireGuard</string> + <string name="donate_summary">Каждое пожертвование помогает</string> + <string name="donate_google_play_disappointment">Спасибо за поддержку проекта WireGuard!\n\nК сожалению, из-за политики Google, нельзя размещать ссылку на тот раздел сайта проекта, где можно сделать пожертвование. Надеемся, вы сможете разобраться самостоятельно!\n\nЕщераз спасибо за ваш вклад.</string> + <string name="disable_config_export_title">Отключить экспорт конфигурации</string> + <string name="disable_config_export_description">Отключение экспорта конфигурации делает приватные ключи менее доступными</string> <string name="dns_servers">DNS-серверы</string> - <string name="edit">Редактировать</string> + <string name="dns_search_domains">Домены поиска</string> + <string name="edit">Изменить</string> <string name="endpoint">Конечная точка</string> - <string name="error_down">Ошибка при выходе из туннеля: %s</string> + <string name="error_down">Ошибка при отключении туннеля: %s</string> <string name="error_fetching_apps">Ошибка при получении списка приложений: %s</string> <string name="error_root">Пожалуйста, получите root-доступ и попробуйте снова</string> + <string name="error_prepare">Ошибка при подготовке туннеля: %s</string> <string name="error_up">Ошибка при запуске туннеля: %s</string> <string name="exclude_private_ips">Исключить частные IP-адреса</string> <string name="generate_new_private_key">Сгенерировать новый приватный ключ</string> - <string name="generic_error">Неизвестная “%s” ошибка</string> + <string name="generic_error">Неизвестная ошибка “%s”</string> <string name="hint_automatic">(авто)</string> <string name="hint_generated">(сгенерирован)</string> <string name="hint_optional">(опционально)</string> - <string name="hint_optional_discouraged">(опционально, не рекомендуется)</string> - <string name="hint_random">(авто)</string> - <string name="illegal_filename_error">Неверное имя файла “%s”</string> - <string name="import_error">Не удалось импортировать туннель: %s</string> + <string name="hint_optional_discouraged">(необязательно, не рекомендуется)</string> + <string name="hint_random">(случайно)</string> + <string name="illegal_filename_error">Недопустимое имя файла “%s”</string> + <string name="import_error">Невозможно импортировать туннель: %s</string> <string name="import_from_qr_code">Импортировать туннель из QR-кода</string> <string name="import_success">Импортировано “%s”</string> <string name="interface_title">Интерфейс</string> <string name="key_contents_error">Плохие символы в ключе</string> - <string name="key_length_error">Неверная длина ключа</string> - <string name="key_length_explanation_base64">: Ключи WireGuard base64 должны содержать 44 символа (32 байта)</string> - <string name="key_length_explanation_binary">: Ключи WireGuard должны быть 32 байта</string> - <string name="key_length_explanation_hex">: HEX ключи WireGuard должны содержать 64 символа (32 байта)</string> + <string name="key_length_error">Неправильная длина ключа</string> + <string name="key_length_explanation_base64">: ключи WireGuard base64 должны содержать 44 символа (32 байта)</string> + <string name="key_length_explanation_binary">: ключи WireGuard должны быть 32 байта</string> + <string name="key_length_explanation_hex">: HEX-ключи WireGuard должны содержать 64 символа (32 байта)</string> + <string name="latest_handshake">Последнее рукопожатие</string> + <string name="latest_handshake_ago">%s назад</string> <string name="listen_port">Порт</string> - <string name="log_export_error">Не удалось экспортировать логи: %s</string> - <string name="log_export_subject">Файл логов WireGuard Android</string> + <string name="log_export_error">Не удалось экспортировать журнал: %s</string> + <string name="log_export_subject">Файл журнала WireGuard Android</string> <string name="log_export_success">Сохранено в “%s”</string> - <string name="log_export_title">Экспорт логов в файл</string> - <string name="log_saver_activity_label">Сохранить логи</string> - <string name="log_viewer_pref_summary">Логи могут помочь с отладкой</string> - <string name="log_viewer_pref_title">Просмотр логов приложения</string> - <string name="log_viewer_title">Логи</string> + <string name="log_export_title">Экспорт журнала в файл</string> + <string name="log_saver_activity_label">Сохранить журнал</string> + <string name="log_viewer_pref_summary">Журналы могут помочь при отладке</string> + <string name="log_viewer_pref_title">Просмотр журналов приложения</string> + <string name="log_viewer_title">Журнал</string> <string name="logcat_error">Не удалось запустить logcat: </string> - <string name="module_disabler_disabled_summary">Экспериментальный модуль ядра приоритетнее и улучшает производительность</string> - <string name="module_disabler_disabled_title">Включить модуль ядра</string> - <string name="module_disabler_enabled_summary">Пользовательское пространство немного медленнее и улучшает стабильность</string> - <string name="module_disabler_enabled_title">Выключить модуль ядра</string> + <string name="module_enabler_disabled_summary">Экспериментальный модуль ядра может улучшить производительность</string> + <string name="module_enabler_disabled_title">Включить бэкэнд модуля ядра</string> + <string name="module_enabler_enabled_summary">Пользовательское пространство немного медленнее и улучшает стабильность</string> + <string name="module_enabler_enabled_title">Отключить бэкэнд модуля ядра</string> <string name="module_installer_error">Что-то пошло не так. Пожалуйста, попробуйте еще раз</string> <string name="module_installer_initial">Экспериментальный модуль ядра может улучшить производительность</string> <string name="module_installer_not_found">Для вашего устройства нет доступных модулей</string> <string name="module_installer_title">Скачать и установить модуль ядра</string> <string name="module_installer_working">Скачивание и установка…</string> - <string name="module_version_error">Не удалось определить версию модуля ядра</string> + <string name="module_version_error">Невозможно определить версию модуля ядра</string> <string name="mtu">MTU</string> - <string name="multiple_tunnels_summary_off">Только один туннель, выключит другие</string> - <string name="multiple_tunnels_summary_on">Могут быть включены несколько туннелей одновременно</string> - <string name="multiple_tunnels_title">Несколько одновременных туннелей</string> - <string name="name">Имя</string> + <string name="multiple_tunnels_summary_off">Включение одного туннеля отключит другие</string> + <string name="multiple_tunnels_summary_on">Одновременно можно включить несколько туннелей</string> + <string name="multiple_tunnels_title">Несколько туннелей</string> + <string name="name">Название</string> <string name="no_config_error">Попытка поднять туннель без конфигурации</string> <string name="no_configs_error">Конфигурации не найдены</string> <string name="no_tunnels_error">Туннелей не существует</string> @@ -138,32 +200,37 @@ <string name="parse_error_inet_endpoint">конечная точка</string> <string name="parse_error_inet_network">IP-сеть</string> <string name="parse_error_integer">число</string> - <string name="parse_error_reason">Не могу разобрать %1$s “%2$s”</string> + <string name="parse_error_reason">Невозможно разобрать %1$s “%2$s”</string> <string name="peer">Пир</string> - <string name="permission_description">управлять туннелями WireGuard, включая и отключая туннели по желанию, потенциально перенаправляя интернет-трафик</string> + <string name="permission_description">контроль над туннелями WireGuard, включение и отключение туннелей по своему усмотрению, возможность неправильного управления сетевым трафиком</string> <string name="permission_label">управлять туннелями WireGuard</string> <string name="persistent_keepalive">Постоянное соединение</string> <string name="pre_shared_key">Общий ключ</string> + <string name="pre_shared_key_enabled">включено</string> <string name="private_key">Приватный ключ</string> <string name="public_key">Публичный ключ</string> - <string name="qr_code_hint">Совет: генерировать с `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="qr_code_hint">Совет: генерировать с “qrencode -t ansiutf8 < tunnel.conf”.</string> + <string name="quick_settings_tile_add_title">Добавить элемент в панель быстрых настроек</string> + <string name="quick_settings_tile_add_summary">Элемент переключает последний активный туннель</string> + <string name="quick_settings_tile_add_failure">Не удается добавить ярлык: ошибка %d</string> + <string name="quick_settings_tile_action">Переключить туннель</string> <string name="restore_on_boot_summary_off">Не поднимать ранее выбранные туннели при загрузке</string> <string name="restore_on_boot_summary_on">Поднимать ранее выбранные туннели при загрузке</string> - <string name="restore_on_boot_title">Восстанавливать при загрузке</string> + <string name="restore_on_boot_title">Восстановить при загрузке</string> <string name="save">Сохранить</string> <string name="select_all">Выбрать все</string> <string name="settings">Настройки</string> <string name="shell_exit_status_read_error">Shell не может прочитать статус выхода</string> <string name="shell_marker_count_error">Shell ожидает 4 маркера, получено %d</string> <string name="shell_start_error">Не удалось запустить Shell: %d</string> - <string name="success_application_will_restart">Успех. Приложение перезапустится…</string> + <string name="success_application_will_restart">Успешно. Приложение будет перезапущено…</string> <string name="toggle_all">Инвертировать все</string> <string name="toggle_error">Ошибка переключения туннеля WireGuard: %s</string> <string name="tools_installer_already">wg и wg-quick уже установлены</string> <string name="tools_installer_failure">Не удалось установить инструменты командной строки (нет root?)</string> - <string name="tools_installer_initial">Установите дополнительные инструменты для сценариев</string> - <string name="tools_installer_initial_magisk">Установите дополнительные инструменты для сценариев в качестве модуля Magisk</string> - <string name="tools_installer_initial_system">Установите дополнительные инструменты для сценариев в системный раздел</string> + <string name="tools_installer_initial">Установить дополнительные инструменты для сценариев</string> + <string name="tools_installer_initial_magisk">Установить дополнительные инструменты для сценариев в качестве модуля Magisk</string> + <string name="tools_installer_initial_system">Установить дополнительные инструменты для сценариев в системный раздел</string> <string name="tools_installer_success_magisk">wg и wg-quick установлены как модуль Magisk (требуется перезагрузка)</string> <string name="tools_installer_success_system">wg и wg-quick установлены в системный раздел</string> <string name="tools_installer_title">Установить инструменты командной строки</string> @@ -171,35 +238,46 @@ <string name="tools_unavailable_error">Необходимые инструменты недоступны</string> <string name="transfer">Статистика</string> <string name="transfer_bytes">%d Б</string> - <string name="transfer_gibibytes">%.2f Гб</string> - <string name="transfer_kibibytes">%.2f Кб</string> - <string name="transfer_mibibytes">%.2f Мб</string> - <string name="transfer_rx_tx">Принято: %1$s, Отдано: %2$s</string> - <string name="transfer_tibibytes">%.2f Тб</string> + <string name="transfer_gibibytes">%.2f ГиБ</string> + <string name="transfer_kibibytes">%.2f КиБ</string> + <string name="transfer_mibibytes">%.2f МиБ</string> + <string name="transfer_rx_tx">Принято: %1$s, Передано: %2$s</string> + <string name="transfer_tibibytes">%.2f ТиБ</string> <string name="tun_create_error">Не удалось создать устройство tun</string> <string name="tunnel_config_error">Не удалось настроить туннель (wg-quick вернул %d)</string> <string name="tunnel_create_error">Не удалось создать туннель: %s</string> - <string name="tunnel_create_success">Успешно созданный туннель “%s”</string> + <string name="tunnel_create_success">Успешно создан туннель “%s”</string> <string name="tunnel_error_already_exists">Туннель “%s” уже существует</string> <string name="tunnel_error_invalid_name">Неправильное имя</string> - <string name="tunnel_list_placeholder">Добавьте туннель с помощью синей кнопки</string> + <string name="tunnel_list_placeholder">Добавьте туннель с помощью кнопки ниже</string> <string name="tunnel_name">Название туннеля</string> <string name="tunnel_on_error">Не удалось включить туннель (wgTurnOn вернул %d)</string> + <string name="tunnel_dns_failure">Не удалось определить DNS имя: “%s”</string> <string name="tunnel_rename_error">Не удалось переименовать туннель: %s</string> <string name="tunnel_rename_success">Туннель успешно переименован в “%s”</string> - <string name="type_name_go_userspace">Пользовательское пространство</string> + <string name="type_name_go_userspace">Go в пользовательском пространстве</string> <string name="type_name_kernel_module">Модуль ядра</string> <string name="unknown_error">Неизвестная ошибка</string> - <string name="version_summary">%1$s v%2$s</string> - <string name="version_summary_checking">Проверка версии %s</string> + <string name="updater_avalable">Доступно обновление приложения. Пожалуйста, обновите.</string> + <string name="updater_action">Загрузить и установить</string> + <string name="updater_rechecking">Получение метаданных обновления…</string> + <string name="updater_download_progress">Загрузка обновления: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Загрузка обновления: %s</string> + <string name="updater_installing">Установка обновления…</string> + <string name="updater_failure">Ошибка обновления: %s. Повторите попытку…</string> + <string name="updater_corrupt_title">Приложение повреждено</string> + <string name="updater_corrupt_message">Приложение повреждено. Загрузите APK с сайта, указанного ниже, затем удалите это приложение и установите из загруженного APK.</string> + <string name="updater_corrupt_navigate">Открыть сайт</string> + <string name="version_summary">Бэкенд: %1$s %2$s</string> + <string name="version_summary_checking">Проверка версии бэкэнда %s</string> <string name="version_summary_unknown">Неизвестная версия %s</string> <string name="version_title">WireGuard для Android v%s</string> - <string name="vpn_not_authorized_error">VPN-сервис не авторизован пользователем</string> + <string name="vpn_not_authorized_error">Сервис VPN не авторизован пользователем</string> <string name="vpn_start_error">Не удалось запустить службу Android VPN</string> <string name="zip_export_error">Не удалось экспортировать туннели: %s</string> <string name="zip_export_success">Сохранено в “%s”</string> - <string name="zip_export_summary">Zip-архив будет сохранен в папке загрузок</string> - <string name="zip_export_title">Экспорт туннелей в zip-архив</string> + <string name="zip_export_summary">Zip-файл будет сохранен в папке загрузок</string> + <string name="zip_export_title">Экспорт туннелей в zip-файл</string> <string name="biometric_prompt_zip_exporter_title">Аутентификация для экспорта туннелей</string> <string name="biometric_prompt_private_key_title">Аутентификация для просмотра приватного ключа</string> <string name="biometric_auth_error">Ошибка аутентификации</string> diff --git a/ui/src/main/res/values-si-rLK/strings.xml b/ui/src/main/res/values-si-rLK/strings.xml new file mode 100644 index 00000000..f7941a1e --- /dev/null +++ b/ui/src/main/res/values-si-rLK/strings.xml @@ -0,0 +1,204 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="set_excluded_applications"> + <item quantity="one">බැහැර කළ යෙදුම් %d යි</item> + <item quantity="other">බැහැර කළ යෙදුම් %d යි</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">ඇතුළත් කළ යෙදුම් %d යි</item> + <item quantity="other">ඇතුළත් කළ යෙදුම් %d යි</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%dක් බැහැරයි</item> + <item quantity="other">%dක් බැහැරයි</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%dක් ඇතුළත්</item> + <item quantity="other">%dක් ඇතුළත්</item> + </plurals> + <string name="all_applications">සියළුම යෙදුම්</string> + <string name="exclude_from_tunnel">බැහැර</string> + <string name="include_in_tunnel">ඇතුළත් දෑ පමණි</string> + <plurals name="include_n_applications"> + <item quantity="one">යෙදුම් %dක් ඇතුළත්</item> + <item quantity="other">යෙදුම් %dක් ඇතුළත්</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">යෙදුම් %dක් බැහැර</item> + <item quantity="other">යෙදුම් %dක් බැහැර</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">සෑම තත්පරයකට</item> + <item quantity="other">සෑම තත්පර %d කට</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">තත්පරය</item> + <item quantity="other">තත්පර</item> + </plurals> + <string name="use_all_applications">සියලුම යෙදුම් භාවිතාකරන්න</string> + <string name="addresses">ලිපින</string> + <string name="applications">යෙදුම්</string> + <string name="allow_remote_control_intents_title">දුරස්ථ පාලක යෙදුම්වලට ඉඩදෙන්න</string> + <string name="allowed_ips">ඉඩදුන් අ.ජා.කෙ.:</string> + <string name="bad_config_context">%1$s\' %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%2$sන් %1$s</string> + <string name="bad_config_explanation_pka">: ධනාත්මක විය යුතු අතර 65535 ට නොවැඩි විය යුතුය</string> + <string name="bad_config_explanation_positive_number">: ධනාත්මක විය යුතුය</string> + <string name="bad_config_explanation_udp_port">: වලංගු UDP තොට අංකයක් විය යුතුය</string> + <string name="bad_config_reason_invalid_key">වලංගු නොවන යතුරකි</string> + <string name="bad_config_reason_invalid_number">වලංගු නොවන අංකයකි</string> + <string name="bad_config_reason_invalid_value">වලංගු නොවන අගයකි</string> + <string name="bad_config_reason_missing_attribute">ගුණාංගය මග හැරී ඇත</string> + <string name="bad_config_reason_missing_section">කොටස අතුරුදහන්</string> + <string name="bad_config_reason_syntax_error">වාක්ය ඛණ්ඩ දෝෂය</string> + <string name="bad_config_reason_unknown_attribute">නොදන්නා ගුණාංගය</string> + <string name="bad_config_reason_unknown_section">නොදන්නා කොටස</string> + <string name="bad_config_reason_value_out_of_range">අගය පරාසයෙන් පිටත</string> + <string name="bad_extension_error">ගොනුව .conf හෝ .zip විය යුතුය</string> + <string name="error_no_qr_found">රූපයේ QR කේතය හමු නොවේ</string> + <string name="error_qr_checksum">QR කේත චෙක්සම් සත්යාපනය අසාර්ථක විය</string> + <string name="cancel">අවලංගු</string> + <string name="config_delete_error">වින්යාස ගොනුව %s මැකීමට නොහැකිය</string> + <string name="config_exists_error">“%s” සඳහා වින්යාසය දැනටමත් පවතී</string> + <string name="config_file_exists_error">“%s” වින්යාස ගොනුව දැනටමත් පවතී</string> + <string name="config_not_found_error">\"%s\" වින්යාස ගොනුව හමු නොවිණි</string> + <string name="config_rename_error">“%s” වින්යාස ගොනුව නැවත නම් කළ නොහැකිය</string> + <string name="config_save_error">“%1$s”: %2$s සඳහා වින්යාසය සුරැකීමට නොහැකිය</string> + <string name="config_save_success">“%s” සඳහා සාර්ථකව වින්යාසය සුරැකිණි</string> + <string name="create_activity_title">WireGuard Tunnel සාදන්න</string> + <string name="create_bin_dir_error">දේශීය ද්විමය නාමාවලිය සෑදිය නොහැක</string> + <string name="create_downloads_file_error">බාගැනීම් නාමාවලියෙහි ගොනුව සෑදීමට නොහැකිය</string> + <string name="create_empty">මුල සිට නිර්මාණය කරන්න</string> + <string name="create_from_file">ගොනුවකින් හෝ සංරක්ෂිතයකින් ආයාතය</string> + <string name="create_from_qr_code">QR කේතයෙන් සුපිරික්සන්න</string> + <string name="create_output_dir_error">ප්රතිදාන නාමාවලිය සෑදිය නොහැකිය</string> + <string name="create_temp_dir_error">තාවකාලික ස්ථානීය නාමාවලිය සෑදිය නොහැකිය</string> + <string name="copied_to_clipboard">%s පසුරුපුවරුවට පිටපත්විය</string> + <string name="dark_theme_summary_off">දැනට දීප්ත (දිවා) තේමාව භාවිතා කරයි</string> + <string name="dark_theme_summary_on">දැනට අඳුරු (රාත්රී) තේමාව භාවිතා කරයි</string> + <string name="dark_theme_title">අඳුරු තේමාව භාවිතය</string> + <string name="delete">මකන්න</string> + <string name="tv_select_a_storage_drive">ගබඩා ධාවකයක් තෝරන්න</string> + <string name="tv_no_file_picker">කරුණාකර ගොනු පිරික්සීමට ගොනු කළමනාකරණ උපයෝගිතා ස්ථාපනය කරන්න</string> + <string name="disable_config_export_description">වින්යාස අපනයනය අක්රිය කිරීම පුද්ගලික යතුරු වලට ප්රවේශ වීම අඩු කරයි</string> + <string name="dns_servers">ව.නා.ප. සේවාදායක</string> + <string name="dns_search_domains">වසම් සොයන්න</string> + <string name="edit">සංස්කරණය</string> + <string name="error_fetching_apps">යෙදුම් ලැයිස්තුව ලබා ගැනීමේ දෝෂයකි: %s</string> + <string name="error_root">කරුණාකර මූල ප්රවේශය ලබාගෙන නැවත උත්සාහ කරන්න</string> + <string name="exclude_private_ips">පෞද්. යතුරු බැහැර කරන්න</string> + <string name="generate_new_private_key">නව පෞද්. යතුර උත්පාදනය</string> + <string name="generic_error">නොදන්නා \"%s\" දෝෂයකි</string> + <string name="hint_automatic">(ස්වයං)</string> + <string name="hint_generated">(උත්පාදිතයි)</string> + <string name="hint_optional">(විකල්ප)</string> + <string name="hint_optional_discouraged">(විකල්ප, නිර්දේශ නොකරයි)</string> + <string name="hint_random">(අහඹු)</string> + <string name="illegal_filename_error">“%s” නීතිවිරෝධී ගොනු නාමයකි</string> + <string name="import_success">“%s” අයාත කළා</string> + <string name="interface_title">අතුරුමුහුණත</string> + <string name="key_contents_error">යතුරේ නරක අකුරු</string> + <string name="key_length_error">යතුරේ ආයාමය සාවද්යයි</string> + <string name="key_length_explanation_base64">: WireGuard base64 යතුරු අක්ෂර 44 (බයිට් 32) විය යුතුය.</string> + <string name="key_length_explanation_binary">: වයර්ගාඩ් යතුරු බයිට 32 ක් විය යුතුය</string> + <string name="key_length_explanation_hex">: WireGuard hex යතුරු අක්ෂර 64 (බයිට් 32) විය යුතුය.</string> + <string name="listen_port">සවන්දීමේ කෙවෙනිය</string> + <string name="log_export_error">ලොගය අපනයනය කළ නොහැක: %s</string> + <string name="log_export_subject">WireGuard Android ලොග් ගොනුව</string> + <string name="log_export_success">“%s” ට සුරැකිණි</string> + <string name="log_export_title">ලොග් ගොනුව අපනයනය කරන්න</string> + <string name="log_saver_activity_label">ලොගය සුරකින්න</string> + <string name="log_viewer_pref_summary">ලඝු-සටහන් නිදොස්කරණයට සහාය විය හැක</string> + <string name="log_viewer_pref_title">යෙදුම් ලොගය බලන්න</string> + <string name="log_viewer_title">ලඝු</string> + <string name="logcat_error">logcat ධාවනය කළ නොහැක: </string> + <string name="module_enabler_disabled_summary">පර්යේෂණාත්මක කර්නල් මොඩියුලය කාර්ය සාධනය වැඩි දියුණු කළ හැක</string> + <string name="module_enabler_disabled_title">කර්නල් මොඩියුල පසුපෙළ සබල කරන්න</string> + <string name="module_enabler_enabled_summary">මන්දගාමී පරිශීලක අවකාශයේ පසුපෙළ ස්ථාවරත්වය වැඩි දියුණු කළ හැකිය</string> + <string name="module_enabler_enabled_title">කර්නල් මොඩියුල පසුපෙළ අක්රීය කරන්න</string> + <string name="module_installer_error">මොකක්හරි වැරැද්දක් වෙලා. කරුණාකර නැවත උත්සාහ කරන්න</string> + <string name="module_installer_initial">පර්යේෂණාත්මක කර්නල් මොඩියුලය කාර්ය සාධනය වැඩි දියුණු කළ හැක</string> + <string name="module_installer_not_found">ඔබගේ උපාංගය සඳහා මොඩියුල නොමැත</string> + <string name="module_installer_title">කර්නල් මොඩියුලය බාගත කර ස්ථාපනය කරන්න</string> + <string name="module_installer_working">බාගතවෙමින් සහ ස්ථාපනය වෙමින්…</string> + <string name="module_version_error">කර්නල් මොඩියුල අනුවාදය තීරණය කළ නොහැක</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">එක් උමගක් සක්රිය කිරීමෙන් අනෙක් ඒවා නිවා දමනු ඇත</string> + <string name="multiple_tunnels_summary_on">බහු උමං මාර්ග එකවර ක්රියාත්මක කළ හැක</string> + <string name="multiple_tunnels_title">එකවර උමං මාර්ග කිහිපයකට ඉඩ දෙන්න</string> + <string name="name">නම</string> + <string name="no_config_error">කිසිදු වින්යාසයක් නොමැති උමගක් ගෙන ඒමට උත්සාහ කිරීම</string> + <string name="no_configs_error">වින්යාස කිරීම් හමු නොවිණි</string> + <string name="no_tunnels_error">උමං මාර්ග නොමැත</string> + <string name="parse_error_generic">නූල්</string> + <string name="parse_error_inet_address">අ.ජා.කෙ. ලිපිනය</string> + <string name="parse_error_inet_endpoint">අවසන් ලක්ෂ්යය</string> + <string name="parse_error_inet_network">අ.ජා.කෙ. ජාලය</string> + <string name="parse_error_integer">අංකය</string> + <string name="parse_error_reason">%1$s \"%2$s\" විග්රහ කළ නොහැක</string> + <string name="peer">සම වයසේ මිතුරන්</string> + <string name="persistent_keepalive">නොනැසී පැවතීම</string> + <string name="pre_shared_key">පෙර-බෙදාගත් යතුර</string> + <string name="pre_shared_key_enabled">සබලයි</string> + <string name="private_key">පුද්ගලික යතුර</string> + <string name="public_key">පොදු යතුර</string> + <string name="qr_code_hint">ඉඟිය: `qrencode -t ansiutf8 < tunnel.conf` සමඟින් ජනනය කරන්න.</string> + <string name="restore_on_boot_summary_off">ආරම්භයේදී සක්රීය උමං ගෙන එන්නේ නැත</string> + <string name="restore_on_boot_summary_on">ආරම්භයේදී සක්රීය උමං ගෙන එනු ඇත</string> + <string name="restore_on_boot_title">ආරම්භයේදී ප්රතිසාධනය කරන්න</string> + <string name="save">සුරකින්න</string> + <string name="select_all">සියල්ල තෝරන්න</string> + <string name="settings">සැකසුම්</string> + <string name="shell_exit_status_read_error">Shell හට පිටවීමේ තත්ත්වය කියවිය නොහැක</string> + <string name="shell_marker_count_error">Shell අපේක්ෂිත ලකුණු 4, %dලැබිණි</string> + <string name="shell_start_error">Shell ආරම්භ කිරීමට අසමත් විය: %d</string> + <string name="success_application_will_restart">සාර්ථකයි. යෙදුම දැන් නැවත ආරම්භ කෙරේ…</string> + <string name="toggle_all">සියල්ල ටොගල් කරන්න</string> + <string name="toggle_error">WireGuard උමං ටොගල් කිරීමේ දෝෂය: %s</string> + <string name="tools_installer_already">wg සහ wg-quick දැනටමත් ස්ථාපනය කර ඇත</string> + <string name="tools_installer_failure">විධාන රේඛා මෙවලම් ස්ථාපනය කළ නොහැක (root නැත?)</string> + <string name="tools_installer_initial">ස්ක්රිප්ටින් සඳහා විකල්ප මෙවලම් ස්ථාපනය කරන්න</string> + <string name="tools_installer_initial_magisk">මැජික් මොඩියුලය ලෙස ස්ක්රිප්ට් කිරීම සඳහා විකල්ප මෙවලම් ස්ථාපනය කරන්න</string> + <string name="tools_installer_initial_system">පද්ධති කොටසට ස්ක්රිප්ට් කිරීම සඳහා විකල්ප මෙවලම් ස්ථාපනය කරන්න</string> + <string name="tools_installer_success_magisk">wg සහ wg-quick Magisk මොඩියුලයක් ලෙස ස්ථාපනය කර ඇත (නැවත පණගැන්වීම අවශ්යයි)</string> + <string name="tools_installer_success_system">wg සහ wg-quick පද්ධති කොටස තුළ ස්ථාපනය කර ඇත</string> + <string name="tools_installer_title">විධාන රේඛා මෙවලම් ස්ථාපනය කරන්න</string> + <string name="tools_installer_working">wg සහ wg-ඉක්මන් ස්ථාපනය කිරීම</string> + <string name="tools_unavailable_error">අවශ්ය මෙවලම් නොමැත</string> + <string name="transfer">මාරු</string> + <string name="transfer_bytes">බ. %d</string> + <string name="transfer_gibibytes">ගි.බ. %.2f</string> + <string name="transfer_kibibytes">කි.බ. %.2f</string> + <string name="transfer_mibibytes">මෙ.බ. %.2f</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">ටෙ.බ. %.2f</string> + <string name="tun_create_error">ටුන් උපාංගය සෑදීමට නොහැක</string> + <string name="tunnel_config_error">උමග වින්යාස කිරීමට නොහැක (wg-quick return %d)</string> + <string name="tunnel_create_error">උමග නිර්මාණය කළ නොහැක: %s</string> + <string name="tunnel_create_success">උමග \"%s\" සාර්ථකව නිර්මාණය කරන ලදී</string> + <string name="tunnel_error_already_exists">උමං \"%s\" දැනටමත් පවතී</string> + <string name="tunnel_error_invalid_name">වලංගු නොවන නමකි</string> + <string name="tunnel_name">උමං නම</string> + <string name="tunnel_on_error">උමග ක්රියාත්මක කළ නොහැක (wgTurnOn %dආපසු ලබා දෙන ලදී)</string> + <string name="tunnel_dns_failure">DNS සත්කාරක නාමය විසඳිය නොහැක: \"%s\"</string> + <string name="tunnel_rename_error">උමග නැවත නම් කළ නොහැක: %s</string> + <string name="tunnel_rename_success">උමඟ සාර්ථකව \"%s\" ලෙස නම් කරන ලදී</string> + <string name="type_name_go_userspace">පරිශීලක අවකාශයට යන්න</string> + <string name="type_name_kernel_module">කර්නල් මොඩියුලය</string> + <string name="unknown_error">නොදන්නා දෝෂයකි</string> + <string name="version_summary">%1$s පසුපෙළ %2$s</string> + <string name="version_summary_checking">%s පසුබිම් අනුවාදය පරීක්ෂා කරමින්</string> + <string name="version_summary_unknown">නොදන්නා %s අනුවාදය</string> + <string name="version_title">ඇන්ඩ්රොයිඩ් සඳහා වයර්ගාඩ් අනු.%s</string> + <string name="vpn_not_authorized_error">VPN සේවාව පරිශීලකයා විසින් අනුමත කර නොමැත</string> + <string name="vpn_start_error">Android VPN සේවාව ආරම්භ කළ නොහැක</string> + <string name="zip_export_error">උමං අපනයනය කළ නොහැක: %s</string> + <string name="zip_export_success">“%s” ට සුරැකිණි</string> + <string name="zip_export_summary">Zip ගොනුව බාගැනීම් ෆෝල්ඩරයට සුරකිනු ඇත</string> + <string name="zip_export_title">zip ගොනුවට උමං අපනයනය කරන්න</string> + <string name="biometric_prompt_zip_exporter_title">උමං අපනයනය කිරීමට සත්යාපනය කරන්න</string> + <string name="biometric_prompt_private_key_title">පුද්ගලික යතුර බැලීමට සත්යාපනය කරන්න</string> + <string name="biometric_auth_error">සත්යාපනය අසාර්ථක වීම</string> + <string name="biometric_auth_error_reason">සත්යාපන අසාර්ථකත්වය: %s</string> +</resources> diff --git a/ui/src/main/res/values-sk-rSK/strings.xml b/ui/src/main/res/values-sk-rSK/strings.xml new file mode 100644 index 00000000..40df1d7e --- /dev/null +++ b/ui/src/main/res/values-sk-rSK/strings.xml @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="all_applications">Všetky aplikácie</string> + <string name="exclude_from_tunnel">Vylúč</string> + <string name="include_in_tunnel">Zahrň len</string> + <string name="use_all_applications">Použi všetky aplikácie</string> + <string name="add_peer">Pridať peera</string> + <string name="addresses">Adresy</string> + <string name="applications">Aplikácie</string> + <string name="allow_remote_control_intents_summary_off">Externé aplikácie nemôžu spustiť tunely (odporúčané)</string> + <string name="allow_remote_control_intents_summary_on">Externé aplikácie môžu spustiť tunely (pokročilé)</string> + <string name="allow_remote_control_intents_title">Povoliť aplikáciám vzdialenú správu</string> + <string name="allowed_ips">Povolené IP adresy</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s v %2$s</string> + <string name="bad_config_explanation_pka">: Musí byť kladné a nie väčšie ako 65535</string> + <string name="bad_config_explanation_positive_number">: Musí byť kladné</string> + <string name="bad_config_explanation_udp_port">: Musí byť platné číslo UDP portu</string> + <string name="bad_config_reason_invalid_key">Neplatný kľúč</string> + <string name="bad_config_reason_invalid_number">Neplatné číslo</string> + <string name="bad_config_reason_invalid_value">Neplatná hodnota</string> + <string name="bad_config_reason_missing_attribute">Chýbajúci atribút</string> + <string name="bad_config_reason_missing_section">Chýbajúca sekcia</string> + <string name="bad_config_reason_syntax_error">Chyba syntaxe</string> + <string name="bad_config_reason_unknown_attribute">Neznámy atribút</string> + <string name="bad_config_reason_unknown_section">Neznáma sekcia</string> + <string name="bad_config_reason_value_out_of_range">Hodnota mimo povoleného rozsahu</string> + <string name="bad_extension_error">Súbor musí byť .conf alebo .zip</string> + <string name="cancel">Zrušiť</string> + <string name="config_delete_error">Nemožete vymazať konfiguračný súbor %s</string> + <string name="config_exists_error">Konfigurácia pre “%s” už existuje</string> + <string name="config_file_exists_error">Konfiguračný súbor pre “%s” už existuje</string> + <string name="config_not_found_error">Konfiguračný súbor “%s” sa nenašiel</string> + <string name="config_rename_error">Nepodarilo sa premenovať konfiguračný súbor “%s”</string> + <string name="config_save_error">Nepodarilo sa uložiť konfiguráciu pre “%1$s”: %2$s</string> + <string name="config_save_success">Úspešne sa podarilo uložiť konfiguráciu pre “%s”</string> + <string name="create_activity_title">Vytvoriť WireGuard tunel</string> + <string name="create_bin_dir_error">Nepodarilo sa vytvoriť lokálny priečinok pre binárne súbory</string> + <string name="create_downloads_file_error">Nepodarilo sa vytvoriť súbor v priečinku stiahnuté</string> + <string name="create_empty">Vytvoriť od počiatku</string> + <string name="create_from_file">Importovať zo súboru alebo archívu</string> + <string name="create_from_qr_code">Skenovať z QR kódu</string> + <string name="create_output_dir_error">Nepodarilo sa vytvoriť výstupný adresár</string> + <string name="create_temp_dir_error">Nepodarilo sa vytvoriť lokálny dočasný priečinok</string> + <string name="create_tunnel">Vytvoriť tunel</string> + <string name="copied_to_clipboard">%s skopírované do schránky</string> + <string name="dark_theme_summary_off">Momentálne používate svetlý (denný) vzhľad</string> + <string name="dark_theme_summary_on">Momentálne používate tmavý (nočný) vzhľad</string> + <string name="dark_theme_title">Používať tmavý vzhľad</string> + <string name="delete">Odstrániť</string> + <string name="tv_delete">Vyberte tunel na odstránenie</string> + <string name="tv_select_a_storage_drive">Vyberte úložnú jednotku</string> + <string name="tv_no_file_picker">Prosím nainštalujte manažéra súborov aby ste mohli prehliadať súbory</string> + <string name="tv_add_tunnel_get_started">Pridajte tunel aby ste mohli začať</string> + <string name="disable_config_export_title">Zakázať export konfigurácie</string> + <string name="disable_config_export_description">Zakázanie exportu konfigurácie spôsobí, že prístup k súkromným kľúčom sa stáva zložitým</string> + <string name="dns_servers">Servery DNS</string> + <string name="dns_search_domains">Prehľadávať domény</string> + <string name="edit">Upraviť</string> + <string name="endpoint">Koncový bod</string> + <string name="error_down">Chyba pri vypínaní tunela: %s</string> + <string name="error_fetching_apps">Chyba pri načítaní zoznamu aplikácií: %s</string> + <string name="error_root">Získajte prístup root a skúste znova</string> + <string name="error_up">Chyba pri zapínaní tunela: %s</string> + <string name="exclude_private_ips">Vynechať súkromné IP</string> + <string name="generate_new_private_key">Generovať nový súkromný kľúč</string> + <string name="generic_error">Neznáma “%s” chyba</string> + <string name="hint_automatic">(automatické)</string> + <string name="hint_generated">(generované)</string> + <string name="hint_optional">(voliteľné)</string> + <string name="hint_optional_discouraged">(voliteľné, neodporúča sa)</string> + <string name="hint_random">(náhodné)</string> + <string name="illegal_filename_error">Nepovolené meno súboru “%s”</string> + <string name="import_error">Nepodarilo sa importovať tunel: %s</string> + <string name="import_from_qr_code">Importovať tunel z QR kódu</string> + <string name="import_success">Podarilo sa importovať “%s”</string> + <string name="interface_title">Rozhranie</string> + <string name="key_contents_error">Nepovolené znaky v kľúči</string> + <string name="key_length_error">Nesprávna dĺžka kľúču</string> + <string name="key_length_explanation_base64">: WireGuard base64 kľúče musia mať 44 znakov (32 bytes)</string> + <string name="key_length_explanation_binary">: WireGuard kľúče musia byť 32 bytové</string> + <string name="key_length_explanation_hex">: WireGuard hex kľúče musia mať 64 znakov (32 bytes)</string> + <string name="listen_port">Otvorený port</string> + <string name="log_export_error">Nepodarilo sa exportovať log: %s</string> + <string name="log_export_subject">WireGuard Android Denník udalostí</string> + <string name="log_export_success">Uložené do “%s”</string> + <string name="log_export_title">Exportovať denník udalostí</string> + <string name="log_saver_activity_label">Uložiť denník udalostí</string> + <string name="log_viewer_pref_summary">Denníky udalostí môžu byt nápomocné pri ladení aplikácie</string> + <string name="log_viewer_pref_title">Zobraziť denník udalostí aplikácie</string> + <string name="log_viewer_title">Denník udalostí</string> + <string name="logcat_error">Nepodarilo sa spustiť logcat: </string> + <string name="module_enabler_enabled_summary">Pomalší userspace backend môže zlepšiť stabilitu</string> + <string name="module_installer_error">Niečo sa pokazilo. Prosím, skúste znova</string> + <string name="module_installer_not_found">Pre vaše zariadenie nie sú k dispozícii žiadne moduly</string> + <string name="module_installer_title">Stiahnutie a inštalácia kernelového modulu</string> + <string name="module_installer_working">Sťahuje sa a inštaluje sa…</string> + <string name="mtu">Maximálna prenosová jednotka</string> + <string name="multiple_tunnels_summary_off">Zapnutím jedného tunela vypnete ostatné</string> + <string name="multiple_tunnels_summary_on">Môžu byť zapnuté viaceré tunely naraz</string> + <string name="multiple_tunnels_title">Povoliť viacero tunelov naraz</string> + <string name="name">Názov</string> + <string name="no_config_error">Pokúšam sa zapnúť tunel bez konfigurácie</string> + <string name="no_configs_error">Nenašli sa žiadne konfigurácie</string> + <string name="no_tunnels_error">Neexistujú žiadne tunely</string> + <string name="parse_error_generic">reťazec</string> + <string name="parse_error_inet_address">IP adresa</string> + <string name="parse_error_inet_endpoint">koncový bod</string> + <string name="parse_error_inet_network">IP sieť</string> + <string name="parse_error_integer">číslo</string> + <string name="parse_error_reason">Nedá sa parsovať %1$s “%2$s”</string> + <string name="pre_shared_key">Vopred zdieľaný kľúč</string> + <string name="pre_shared_key_enabled">povolené</string> + <string name="private_key">Súkromný kľúč</string> + <string name="public_key">Verejný kľúč</string> + <string name="qr_code_hint">Tip: vygenerovať s `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="restore_on_boot_title">Obnov po štarte</string> + <string name="save">Uložiť</string> + <string name="select_all">Označiť všetko</string> + <string name="settings">Nastavenia</string> + <string name="toggle_all">Prepnúť všetko</string> + <string name="tools_installer_already">wg a wg-quick už sú nainštalované</string> + <string name="tools_installer_initial">Nainštalovať voliteľné nástroje pre skriptovanie</string> + <string name="tools_installer_initial_magisk">Nainštalovať voliteľné nástroje pre skriptovanie ako Magisk modul</string> + <string name="tools_installer_success_magisk">wg a wg-quick sú nainštalované ako Magisk modul (reštart požadovaný)</string> + <string name="tools_installer_title">Inštalácia nástrojov príkazového riadku</string> + <string name="tools_installer_working">Inštaluje sa wg a wg-quick</string> + <string name="tools_unavailable_error">Potrebné nástroje nie sú k dispozícii</string> + <string name="transfer">Prenos</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">sem: %1$s, tam: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Nepodarilo sa vytvoriť tun zariadenie</string> + <string name="tunnel_create_error">Nepodarilo sa vytvoriť tunel: %s</string> + <string name="tunnel_create_success">Úspešne vytvorený tunel “%s”</string> + <string name="tunnel_error_already_exists">Tunel “%s” už existuje</string> + <string name="tunnel_error_invalid_name">Neplatný názov</string> + <string name="tunnel_name">Meno tunelu</string> + <string name="tunnel_rename_error">Nepodarilo sa premenovať tunel: %s</string> + <string name="tunnel_rename_success">Úspešne premenovaný tunel na “%s”</string> + <string name="type_name_kernel_module">Kernelový modul</string> + <string name="unknown_error">Neznáma chyba</string> + <string name="version_summary_unknown">Neznáma %s verzia</string> + <string name="version_title">WireGuard pre Android v%s</string> + <string name="vpn_not_authorized_error">VPN služba neautorizovaná používateľom</string> + <string name="vpn_start_error">Nepodarilo sa spustiť Android VPN službu</string> + <string name="zip_export_error">Nepodarilo sa exportovať tunely: %s</string> + <string name="zip_export_success">Uložené ako “%s”</string> + <string name="zip_export_summary">Zip súbor bude uložený do priečinka stiahnuté</string> + <string name="zip_export_title">Export tunelov do zip súboru</string> + <string name="biometric_prompt_zip_exporter_title">Overovanie pre export tunelov</string> + <string name="biometric_prompt_private_key_title">Authenticate to view private key</string> + <string name="biometric_auth_error">Overovanie zlyhalo</string> + <string name="biometric_auth_error_reason">Overovanie zlyhalo: %s</string> +</resources> diff --git a/ui/src/main/res/values-sl/strings.xml b/ui/src/main/res/values-sl/strings.xml index 3317ada2..c5600041 100644 --- a/ui/src/main/res/values-sl/strings.xml +++ b/ui/src/main/res/values-sl/strings.xml @@ -89,7 +89,6 @@ <string name="allow_remote_control_intents_summary_on">Zunanje aplikacije lahko preklapljajo tunele (napredno)</string> <string name="allow_remote_control_intents_title">Dovoljeno upravljanje preko zunanjih aplikacij</string> <string name="allowed_ips">Dovoljeni naslovi IP</string> - <string name="app_name">WireGuard</string> <string name="bad_config_context">%1$s-ov %2$s</string> <string name="bad_config_context_top_level">%s</string> <string name="bad_config_error">%1$s v %2$s</string> @@ -123,11 +122,19 @@ <string name="create_output_dir_error">Izhodnega imenika ni bilo mogoče ustvariti</string> <string name="create_temp_dir_error">Lokalnega začasnega imenika ni bilo mogoče ustvariti</string> <string name="create_tunnel">Ustvari tunel</string> + <string name="copied_to_clipboard">%s kopirano v odložišče</string> <string name="dark_theme_summary_off">V uporabi svetla (dnevna) tema</string> <string name="dark_theme_summary_on">V uporabi temna (nočna) tema</string> <string name="dark_theme_title">Uporabi temno temo</string> <string name="delete">Izbriši</string> + <string name="tv_delete">Izberi tunel za izbris</string> + <string name="tv_select_a_storage_drive">Izberite podatkovni pogon</string> + <string name="tv_no_file_picker">Prosim namesti orodje za upravljanje datotek za njihov ogled</string> + <string name="tv_add_tunnel_get_started">Za začetek dodaj tunel</string> + <string name="disable_config_export_title">Onemogoči izvoz nastavitev</string> + <string name="disable_config_export_description">Onemogočenje nastavitev za izvoz nastavitev naredi zasebne ključe manj dostopne</string> <string name="dns_servers">Strežniki DNS</string> + <string name="dns_search_domains">Pripone DNS</string> <string name="edit">Uredi</string> <string name="endpoint">Končna točka</string> <string name="error_down">Napaka pri zaključevanju tunela: %s</string> @@ -162,10 +169,10 @@ <string name="log_viewer_pref_title">Prikaži dnevnik aplikacije</string> <string name="log_viewer_title">Dnevnik</string> <string name="logcat_error">Ukaza logcat ni bilo mogoče izvesti: </string> - <string name="module_disabler_disabled_summary">Eksperimentalni modul jedra lahko izboljša zmogljivost</string> - <string name="module_disabler_disabled_title">Omogoči zaledje za modul jedra</string> - <string name="module_disabler_enabled_summary">Počasnejše uporabniško zaledje lahko izboljša stabilnost</string> - <string name="module_disabler_enabled_title">Onemogoči zaledje za modul jedra</string> + <string name="module_enabler_disabled_summary">Eksperimentalni modul jedra lahko izboljša zmogljivost</string> + <string name="module_enabler_disabled_title">Omogoči zaledje za modul jedra</string> + <string name="module_enabler_enabled_summary">Počasnejše uporabniško zaledje lahko izboljša stabilnost</string> + <string name="module_enabler_enabled_title">Onemogoči zaledje za modul jedra</string> <string name="module_installer_error">Nekaj je šlo narobe, prosimo poskusite znova</string> <string name="module_installer_initial">Eksperimentalni modul jedra lahko izboljša zmogljivost</string> <string name="module_installer_not_found">Za vašo napravo ni razpoložljivih modulov</string> @@ -213,7 +220,7 @@ <string name="tools_installer_initial_magisk">Namestitev izbirnih orodij za skripte kot modula Magisk</string> <string name="tools_installer_initial_system">Namestitev izbirnih orodij za skripte na sistemsko particijo</string> <string name="tools_installer_success_magisk">wg in wg-quick kot modul Magisk nameščen (zahtevan ponovni zagon)</string> - <string name="tools_installer_success_system">wg und wg-quick nameščena na sistemsko particijo</string> + <string name="tools_installer_success_system">wg in wg-quick nameščena na sistemsko particijo</string> <string name="tools_installer_title">Namesti orodja za ukazno vrstico</string> <string name="tools_installer_working">Nameščam wg in wg-quick</string> <string name="tools_unavailable_error">Zahtevana orodja niso na voljo</string> @@ -230,15 +237,15 @@ <string name="tunnel_create_success">Tunel „%s“ uspešno ustvarjen</string> <string name="tunnel_error_already_exists">Tunel „%s“ že obstaja</string> <string name="tunnel_error_invalid_name">Neveljavno ime</string> - <string name="tunnel_list_placeholder">Dodaj tunel s klikom na modri gumb</string> <string name="tunnel_name">Ime tunela</string> <string name="tunnel_on_error">Tunela ni bilo mogoče vključiti (wgTurnOn je vrnil %d)</string> + <string name="tunnel_dns_failure">Imena DNS gostitelja ni bilo mogoče razrešiti: \"%s\"</string> <string name="tunnel_rename_error">Tunela ni bilo mogoče preimenovati: %s</string> <string name="tunnel_rename_success">Tunel uspešno preimenovan v „%s“</string> - <string name="type_name_go_userspace">Go userspace</string> + <string name="type_name_go_userspace">Uporabniški prostor Go</string> <string name="type_name_kernel_module">Modul jedra</string> <string name="unknown_error">Neznana napaka</string> - <string name="version_summary">Zaledje %1$s v%2$s</string> + <string name="version_summary">Zaledje %1$s %2$s</string> <string name="version_summary_checking">Preverjam verzijo zaledja %s</string> <string name="version_summary_unknown">Neznana verzija %s</string> <string name="version_title">WireGuard za Android v%s</string> diff --git a/ui/src/main/res/values-sv-rSE/strings.xml b/ui/src/main/res/values-sv-rSE/strings.xml new file mode 100644 index 00000000..910f9e05 --- /dev/null +++ b/ui/src/main/res/values-sv-rSE/strings.xml @@ -0,0 +1,259 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Kunde inte ta bort %d tunnel: %s</item> + <item quantity="other">Kunde inte ta bort %d tunnlar: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">Tog bort %d tunneln</item> + <item quantity="other">Tog bort %d tunnlar</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d tunnel vald</item> + <item quantity="other">%d tunnlar valda</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Importerade %1$d av %2$d tunnlar</item> + <item quantity="other">Importerade %1$d av %2$d tunnlar</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">Importerade %d tunnel</item> + <item quantity="other">Importerade %d tunnlar</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d exkluderad applikation</item> + <item quantity="other">%d Exkluderade applikationer</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d inkluderad applikation</item> + <item quantity="other">%d inkluderade applikationer</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d exkluderad</item> + <item quantity="other">%d exkluderade</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d inkluderad</item> + <item quantity="other">%d inkluderade</item> + </plurals> + <string name="all_applications">Alla applikationer</string> + <string name="exclude_from_tunnel">Exkludera</string> + <string name="include_in_tunnel">Inkludera endast</string> + <plurals name="include_n_applications"> + <item quantity="one">Inkludera %d app</item> + <item quantity="other">Inkludera %d appar</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Exkludera %d app</item> + <item quantity="other">Exkludera %d appar</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">varje sekund</item> + <item quantity="other">var %d sekund</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">sekund</item> + <item quantity="other">sekunder</item> + </plurals> + <string name="use_all_applications">Använd alla appar</string> + <string name="add_peer">Lägg till klient</string> + <string name="addresses">Adresser</string> + <string name="applications">Applikationer</string> + <string name="allow_remote_control_intents_summary_off">Externa appar kan inte växla tunnlar (rekommenderas)</string> + <string name="allow_remote_control_intents_summary_on">Externa appar kan växla tunnlar (avancerat)</string> + <string name="allow_remote_control_intents_title">Tillåt fjärrstyrningsappar</string> + <string name="allowed_ips">Tillåtna IP-adresser</string> + <string name="bad_config_context">%1$s\'s %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s i %2$s</string> + <string name="bad_config_explanation_pka">: Måste vara positivt och högst 65535</string> + <string name="bad_config_explanation_positive_number">: Måste vara positivt</string> + <string name="bad_config_explanation_udp_port">: Måste vara ett giltigt UDP-portnummer</string> + <string name="bad_config_reason_invalid_key">Ogiltig nyckel</string> + <string name="bad_config_reason_invalid_number">Ogiltigt nummer</string> + <string name="bad_config_reason_invalid_value">Ogiltigt värde</string> + <string name="bad_config_reason_missing_attribute">Attribut saknas</string> + <string name="bad_config_reason_missing_section">Avsnitt saknas</string> + <string name="bad_config_reason_syntax_error">Syntaxfel</string> + <string name="bad_config_reason_unknown_attribute">Okänt attribut</string> + <string name="bad_config_reason_unknown_section">Okänt avsnitt</string> + <string name="bad_config_reason_value_out_of_range">Värde utanför giltigt intervall</string> + <string name="bad_extension_error">Filen måste vara .conf eller .zip</string> + <string name="error_no_qr_found">QR-kod hittas inte i bilden</string> + <string name="error_qr_checksum">QR-kods checksifferkontroll misslyckades</string> + <string name="cancel">Avbryt</string> + <string name="config_delete_error">Kan inte ta bort konfigurationsfilen %s</string> + <string name="config_exists_error">Konfiguration för ”%s” finns redan</string> + <string name="config_file_exists_error">Konfigurationsfil ”%s” finns redan</string> + <string name="config_not_found_error">Konfigurationsfil ”%s” hittades inte</string> + <string name="config_rename_error">Kan inte byta namn på konfigurationsfil ”%s”</string> + <string name="config_save_error">Kan inte spara konfigurationen för ”%1$s”: %2$s</string> + <string name="config_save_success">Konfigurationen för ”%s ” sparades</string> + <string name="create_activity_title">Skapa WireGuard Tunnel</string> + <string name="create_bin_dir_error">Kan inte skapa lokal binärkatalog</string> + <string name="create_downloads_file_error">Kan inte skapa fil i nedladdningskatalogen</string> + <string name="create_empty">Skapa från grunden</string> + <string name="create_from_file">Importera från fil eller arkiv</string> + <string name="create_from_qr_code">Skanna från QR-kod</string> + <string name="create_output_dir_error">Kan inte skapa utdatakatalog</string> + <string name="create_temp_dir_error">Kan inte skapa lokal temporär katalog</string> + <string name="create_tunnel">Skapa tunnel</string> + <string name="copied_to_clipboard">%s kopierades till urklipp</string> + <string name="dark_theme_summary_off">Använder just nu ljust (dag) tema</string> + <string name="dark_theme_summary_on">Använder just nu mörkt (natt) tema</string> + <string name="dark_theme_title">Använd mörkt tema</string> + <string name="delete">Radera</string> + <string name="tv_delete">Välj tunnel att ta bort</string> + <string name="tv_select_a_storage_drive">Välj en lagringsenhet</string> + <string name="tv_no_file_picker">Installera ett filhanteringsverktyg för att bläddra bland filer</string> + <string name="tv_add_tunnel_get_started">Lägg till en tunnel för att komma igång</string> + <string name="donate_title">♥ Donera till WireGuard Projektet</string> + <string name="donate_summary">Varje bidrag hjälper</string> + <string name="donate_google_play_disappointment">Tack för att du stödjer WireGuard Projektet!\n\nPå grund av Googles policyer får vi dessvärre inte till den del av projektets webbsida där du kan göra en donation. Förhoppningsvis kan du hitta dit ändå!\n\nTack igen för ditt bidrag.</string> + <string name="disable_config_export_title">Inaktivera export av konfiguration</string> + <string name="disable_config_export_description">Inaktivering av konfigurationsexport gör privata nycklar mindre tillgängliga</string> + <string name="dns_servers">DNS-servrar</string> + <string name="dns_search_domains">Sök domäner</string> + <string name="edit">Redigera</string> + <string name="endpoint">Slutpunkt</string> + <string name="error_down">Fel vid nedtagning av tunnel: %s</string> + <string name="error_fetching_apps">Fel vid hämtning av applista: %s</string> + <string name="error_root">Vänligen få rootbehörighet och försök igen</string> + <string name="error_prepare">Fel vid förberedelse av tunnel: %s</string> + <string name="error_up">Fel vid uppstart av tunnel: %s</string> + <string name="exclude_private_ips">Uteslut privata IP-adresser</string> + <string name="generate_new_private_key">Skapa ny privat nyckel</string> + <string name="generic_error">Okänt ”%s” fel</string> + <string name="hint_automatic">(automatisk)</string> + <string name="hint_generated">(skapad)</string> + <string name="hint_optional">(valfritt)</string> + <string name="hint_optional_discouraged">(valfritt, rekommenderas inte)</string> + <string name="hint_random">(slumpmässigt)</string> + <string name="illegal_filename_error">Ogiltigt filnamn ”%s”</string> + <string name="import_error">Kan inte importera tunnel: %s</string> + <string name="import_from_qr_code">Importera tunnel från QR-kod</string> + <string name="import_success">Importerade ”%s”</string> + <string name="interface_title">Gränssnitt</string> + <string name="key_contents_error">Ogiltiga tecken i nyckel</string> + <string name="key_length_error">Felaktig nyckellängd</string> + <string name="key_length_explanation_base64">: WireGuard base64 nycklar måste vara 44 tecken (32 bytes)</string> + <string name="key_length_explanation_binary">: WireGuard nycklar måste vara 32 bytes</string> + <string name="key_length_explanation_hex">: WireGuard hex nycklar måste vara 64 tecken (32 bytes)</string> + <string name="latest_handshake">Senaste handskakning</string> + <string name="latest_handshake_ago">%s sedan</string> + <string name="listen_port">Lyssningsport</string> + <string name="log_export_error">Kan inte exportera loggen: %s</string> + <string name="log_export_subject">WireGuard Android loggfil</string> + <string name="log_export_success">Sparad till ”%s”</string> + <string name="log_export_title">Exportera loggfil</string> + <string name="log_saver_activity_label">Spara logg</string> + <string name="log_viewer_pref_summary">Loggfiler kan underlätta vid felsökning</string> + <string name="log_viewer_pref_title">Visa applikationslogg</string> + <string name="log_viewer_title">Logg</string> + <string name="logcat_error">Kunde inte köra logcat: </string> + <string name="module_enabler_disabled_summary">Den experimentella kärnmodulen kan förbättra prestanda</string> + <string name="module_enabler_disabled_title">Aktivera backend för kärnmodul</string> + <string name="module_enabler_enabled_summary">Den långsammare backend för användarrymden kan förbättra stabiliteten</string> + <string name="module_enabler_enabled_title">Inaktivera backend för kärnmodul</string> + <string name="module_installer_error">Något gick fel. Vänligen försök igen</string> + <string name="module_installer_initial">Den experimentella kärnmodulen kan förbättra prestanda</string> + <string name="module_installer_not_found">Inga moduler finns tillgängliga för din enhet</string> + <string name="module_installer_title">Ladda ner och installera kärnmodul</string> + <string name="module_installer_working">Hämtar och installerar…</string> + <string name="module_version_error">Kunde inte bestämma version av kärnmodulen</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Att slå på en tunnel stänger av andra</string> + <string name="multiple_tunnels_summary_on">Flera tunnlar kan slås på samtidigt</string> + <string name="multiple_tunnels_title">Tillåt flera samtidiga tunnlar</string> + <string name="name">Namn</string> + <string name="no_config_error">Försöker bygga en tunnel utan konfiguration</string> + <string name="no_configs_error">Inga konfigurationer hittades</string> + <string name="no_tunnels_error">Inga tunnlar finns</string> + <string name="parse_error_generic">sträng</string> + <string name="parse_error_inet_address">IP-adress</string> + <string name="parse_error_inet_endpoint">slutpunkt</string> + <string name="parse_error_inet_network">IP-nätverk</string> + <string name="parse_error_integer">nummer</string> + <string name="parse_error_reason">Kan inte tolka %1$s ”%2$s”</string> + <string name="peer">Klient</string> + <string name="permission_description">styra WireGuard tunnlar, aktivera och inaktivera tunnlar efter behag, möjlighet till felkoppling av internettrafik</string> + <string name="permission_label">kontrollera WireGuard tunnlar</string> + <string name="persistent_keepalive">Beständig keepalive</string> + <string name="pre_shared_key">Fördelad nyckel</string> + <string name="pre_shared_key_enabled">aktiverad</string> + <string name="private_key">Privat nyckel</string> + <string name="public_key">Offentlig nyckel</string> + <string name="qr_code_hint">Tips: generera med `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="quick_settings_tile_add_title">Lägg till tile i snabbinställningarna</string> + <string name="quick_settings_tile_add_summary">Tilen växlar din senaste tunnel mellan på och av</string> + <string name="quick_settings_tile_add_failure">Misslyckades med att skapa tile: fel %d</string> + <string name="quick_settings_tile_action">Växla tunnel på/av</string> + <string name="restore_on_boot_summary_off">Kommer inte ta upp aktiverade tunnlar vid uppstart</string> + <string name="restore_on_boot_summary_on">Kommer ta upp aktiverade tunnlar vid uppstart</string> + <string name="restore_on_boot_title">Återställ vid uppstart</string> + <string name="save">Spara</string> + <string name="select_all">Välj alla</string> + <string name="settings">Inställningar</string> + <string name="shell_exit_status_read_error">Shell kan inte läsa avslutningsstatus</string> + <string name="shell_marker_count_error">Shell förväntade sig 4 markörer, tog emot %d</string> + <string name="shell_start_error">Shell kunde inte starta: %d</string> + <string name="success_application_will_restart">Framgång. Applikationen kommer nu att starta om…</string> + <string name="toggle_all">Växla alla</string> + <string name="toggle_error">Fel vid växling av WireGuard-tunnel: %s</string> + <string name="tools_installer_already">wg och wg-quick är redan installerade</string> + <string name="tools_installer_failure">Kan inte installera kommandoradsverktyg (ej root?)</string> + <string name="tools_installer_initial">Installera valfria verktyg för skriptprogram</string> + <string name="tools_installer_initial_magisk">Installera valfria verktyg för skript som Magisk modul</string> + <string name="tools_installer_initial_system">Installera valfria verktyg för skriptning till systempartitionen</string> + <string name="tools_installer_success_magisk">wg och wg-quick installerat som en Magisk modul (omstart krävs)</string> + <string name="tools_installer_success_system">wg och wg-quick installerat i systempartitionen</string> + <string name="tools_installer_title">Installera kommandoradsverktyg</string> + <string name="tools_installer_working">Installera wg och wg-quick</string> + <string name="tools_unavailable_error">Nödvändiga verktyg är inte tillgängliga</string> + <string name="transfer">Överföring</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Kunde inte skapa tun-enhet</string> + <string name="tunnel_config_error">Går inte att konfigurera tunneln (wg-quick returnerade %d)</string> + <string name="tunnel_create_error">Kan inte skapa tunnel: %s</string> + <string name="tunnel_create_success">Lyckades skapa tunnel “%s”</string> + <string name="tunnel_error_already_exists">Tunnel ”%s” finns redan</string> + <string name="tunnel_error_invalid_name">Ogiltigt namn</string> + <string name="tunnel_list_placeholder">Lägg till en tunnel med knappen nedan</string> + <string name="tunnel_name">Tunnelns namn</string> + <string name="tunnel_on_error">Kunde inte aktivera tunneln (wgTurnOn returnerade %d)</string> + <string name="tunnel_dns_failure">Det går inte att lösa DNS-värdnamn: ”%s”</string> + <string name="tunnel_rename_error">Kan inte byta namn på tunnel: %s</string> + <string name="tunnel_rename_success">Lyckades döpa om tunnel till “%s”</string> + <string name="type_name_go_userspace">Användarutrymme för Go</string> + <string name="type_name_kernel_module">Kärnmodul</string> + <string name="unknown_error">Okänt fel</string> + <string name="updater_avalable">Det finns en uppdatering till appen. Vänligen uppdatera nu.</string> + <string name="updater_action">Ladda ner & uppdatera</string> + <string name="updater_rechecking">Hämtar uppdateringens metadata…</string> + <string name="updater_download_progress">Laddar ner uppdatering: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Laddar ner uppdatering: %s</string> + <string name="updater_installing">Installerar uppdatering…</string> + <string name="updater_failure">Uppdatering misslyckades: %s. Försöker igen inom kort…</string> + <string name="updater_corrupt_title">Applikationen är korrupt</string> + <string name="updater_corrupt_message">Applikationen är korrupt. Vänligen ladda ner en APK från hemsidan länkad nedan. Avinstallera därefter denna applikation och installera den nerladdade APKn.</string> + <string name="updater_corrupt_navigate">Öppna hemsida</string> + <string name="version_summary">%1$s bakstycke %2$s</string> + <string name="version_summary_checking">Kontrollerar %s backstycke utgåva</string> + <string name="version_summary_unknown">Okänd %s utgåva</string> + <string name="version_title">WireGuard för Android v%s</string> + <string name="vpn_not_authorized_error">VPN-tjänsten är inte godkänd av användaren</string> + <string name="vpn_start_error">Kan inte starta Android VPN-tjänst</string> + <string name="zip_export_error">Kan inte exportera tunnlar: %s</string> + <string name="zip_export_success">Sparad till ”%s”</string> + <string name="zip_export_summary">Zip-filen kommer att sparas till nedladdningskatalogen</string> + <string name="zip_export_title">Exportera tunnlar till zip-fil</string> + <string name="biometric_prompt_zip_exporter_title">Godkänn för att exportera tunnlar</string> + <string name="biometric_prompt_private_key_title">Godkänn för att visa tunnelns privata nycklar</string> + <string name="biometric_auth_error">Fel vid godkännande</string> + <string name="biometric_auth_error_reason">Fel vid godkännande: %s</string> +</resources> diff --git a/ui/src/main/res/values-tr-rTR/strings.xml b/ui/src/main/res/values-tr-rTR/strings.xml new file mode 100644 index 00000000..57bc0ca5 --- /dev/null +++ b/ui/src/main/res/values-tr-rTR/strings.xml @@ -0,0 +1,259 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">%d tüneli silinemiyor: %s</item> + <item quantity="other">%d tünelleri silinemiyor: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">%d tüneli başarıyla silindi</item> + <item quantity="other">%d tünelleri başarıyla silindi</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d tüneli seçildi</item> + <item quantity="other">%d tünelleri seçildi</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">%1$d/%2$d tünel içe aktarıldı</item> + <item quantity="other">%1$d/%2$d tünel içe aktarıldı</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">%d tünel içe aktarıldı</item> + <item quantity="other">%d tünel içe aktarıldı</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d Hariç Tutulan Uygulama</item> + <item quantity="other">%d Hariç Tutulan Uygulamalar</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d Dahil Edilen Uygulama</item> + <item quantity="other">%d Dahil Edilen Uygulamalar</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d hariç tutuldu</item> + <item quantity="other">%d hariç tutuldu</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d dahil edildi</item> + <item quantity="other">%d dahil edildi</item> + </plurals> + <string name="all_applications">Tüm Uygulamalar</string> + <string name="exclude_from_tunnel">Hariç</string> + <string name="include_in_tunnel">Yalnızca dahil</string> + <plurals name="include_n_applications"> + <item quantity="one">%d uygulamasını dahil et</item> + <item quantity="other">%d uygulamalarını dahil et</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">%d uygulamasını hariç tut</item> + <item quantity="other">%d uygulamalarını hariç tut</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">her saniye</item> + <item quantity="other">%d saniyede bir</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">saniye</item> + <item quantity="other">saniye</item> + </plurals> + <string name="use_all_applications">Tüm uygulamaları kullan</string> + <string name="add_peer">Eş ekle</string> + <string name="addresses">Adresler</string> + <string name="applications">Uygulamalar</string> + <string name="allow_remote_control_intents_summary_off">Harici uygulamalar tünelleri değiştiremez (önerilir)</string> + <string name="allow_remote_control_intents_summary_on">Harici uygulamalar tünelleri değiştirebilir (gelişmiş)</string> + <string name="allow_remote_control_intents_title">Uzaktan kontrol uygulamalarına izin ver</string> + <string name="allowed_ips">İzin verilen IP\'ler</string> + <string name="bad_config_context">%1$s\'in %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%2$s içinde %1$s</string> + <string name="bad_config_explanation_pka">: Pozitif olmalı ve 65535\'ten fazla olmamalıdır</string> + <string name="bad_config_explanation_positive_number">: Pozitif olmalıdır</string> + <string name="bad_config_explanation_udp_port">: Geçerli bir UDP Port numarası olmalıdır</string> + <string name="bad_config_reason_invalid_key">Geçersiz anahtar</string> + <string name="bad_config_reason_invalid_number">Geçersiz numara</string> + <string name="bad_config_reason_invalid_value">Geçersiz değer</string> + <string name="bad_config_reason_missing_attribute">Eksik öznitelik</string> + <string name="bad_config_reason_missing_section">Eksik bölüm</string> + <string name="bad_config_reason_syntax_error">Sözdizimi hatası</string> + <string name="bad_config_reason_unknown_attribute">Bilinmeyen öznitelik</string> + <string name="bad_config_reason_unknown_section">Bilinmeyen bölüm</string> + <string name="bad_config_reason_value_out_of_range">Aralık dışı değer</string> + <string name="bad_extension_error">Dosya .conf veya .zip olmalıdır</string> + <string name="error_no_qr_found">Görselde QR kod bulunamadı</string> + <string name="error_qr_checksum">QR kod doğrulaması başarısız</string> + <string name="cancel">İptal</string> + <string name="config_delete_error">%s konfigürasyon dosyası silinemiyor</string> + <string name="config_exists_error">“%s” için konfigürasyon zaten var</string> + <string name="config_file_exists_error">“%s“ için konfigürasyon dosyası zaten var</string> + <string name="config_not_found_error">“%s“ konfigürasyon dosyası bulunamadı</string> + <string name="config_rename_error">“%s” konfigürasyon dosyası yeniden adlandırılamıyor</string> + <string name="config_save_error">“%1$s” için konfigürasyon kaydedilemiyor: %2$s</string> + <string name="config_save_success">“%s“ için konfigürasyon başarıyla kaydedildi</string> + <string name="create_activity_title">WireGuard Tüneli Yarat</string> + <string name="create_bin_dir_error">Yerel ikili dizin oluşturulamıyor</string> + <string name="create_downloads_file_error">İndirilenler klasöründe dosya oluşturulamadı</string> + <string name="create_empty">Sıfırdan oluştur</string> + <string name="create_from_file">Dosya veya arşivden ekle</string> + <string name="create_from_qr_code">QR Kodu Tara</string> + <string name="create_output_dir_error">Çıktı klasörü oluşturulamıyor</string> + <string name="create_temp_dir_error">Yerel geçici dizin oluşturulamıyor</string> + <string name="create_tunnel">Tünel Oluştur</string> + <string name="copied_to_clipboard">%s panoya kopyalandı</string> + <string name="dark_theme_summary_off">Şu anda açık (gündüz) teması kullanılıyor</string> + <string name="dark_theme_summary_on">Şu anda karanlık (gece) teması kullanılıyor</string> + <string name="dark_theme_title">Koyu tema kullan</string> + <string name="delete">Sil</string> + <string name="tv_delete">Silinecek tüneli seçin</string> + <string name="tv_select_a_storage_drive">Bir depolama sürücüsü seçin</string> + <string name="tv_no_file_picker">Dosyalara göz atmak için lütfen bir dosya yönetim aracı yükleyin</string> + <string name="tv_add_tunnel_get_started">Başlamak için bir tünel ekleyin</string> + <string name="donate_title">♥ WireGuard Projesine Bağış Yapın</string> + <string name="donate_summary">Her katkı yardımcı olur</string> + <string name="donate_google_play_disappointment">WireGuard Projesini desteklediğiniz için teşekkür ederiz!\n\nNe yazık ki, Google\'ın politikaları nedeniyle, proje web sayfasının bağış yapabileceğiniz bölümüne bağlantı vermemize izin verilmiyor. Umarım bunu çözebilirsin!\n\nKatkılarınız için tekrar teşekkürler.</string> + <string name="disable_config_export_title">Ayarları dışa aktarmayı kapa</string> + <string name="disable_config_export_description">Ayarları dışa aktarmayı kapamak gizli anahtarları daha az erişilebilir kılar</string> + <string name="dns_servers">DNS sunucuları</string> + <string name="dns_search_domains">Alan adı ara</string> + <string name="edit">Düzenle</string> + <string name="endpoint">Uç nokta</string> + <string name="error_down">Tünel kapatılırken hata oluştu: %s</string> + <string name="error_fetching_apps">Uygulama listesi getirilirken hata oluştu: %s</string> + <string name="error_root">Lütfen root erişimi elde edin ve tekrar deneyin</string> + <string name="error_prepare">Tünel hazırlanırken hata oluştu: %s</string> + <string name="error_up">Tünel açılırken hata oluştu: %s</string> + <string name="exclude_private_ips">Özel IP’leri hariç tut</string> + <string name="generate_new_private_key">Yeni özel anahtar oluştur</string> + <string name="generic_error">Bilinmeyen “%s” hatası</string> + <string name="hint_automatic">(otomatik)</string> + <string name="hint_generated">(oluşturuldu)</string> + <string name="hint_optional">(isteğe bağlı)</string> + <string name="hint_optional_discouraged">(isteğe bağlı, önerilmez)</string> + <string name="hint_random">(rastgele)</string> + <string name="illegal_filename_error">Geçersiz dosya ismi “%s”</string> + <string name="import_error">Tünel içeri aktarılamıyor: %s</string> + <string name="import_from_qr_code">Tüneli QR Kod ile İçe Aktar</string> + <string name="import_success">İçe aktarıldı “%s”</string> + <string name="interface_title">Arayüz</string> + <string name="key_contents_error">Anahtardaki yanlış karakterler</string> + <string name="key_length_error">Yanlış anahtar uzunluğu</string> + <string name="key_length_explanation_base64">: WireGuard base64 anahtarları 44 karakter (32 bayt) olmalıdır</string> + <string name="key_length_explanation_binary">: WireGuard anahtarları 32 bayt olmalıdır</string> + <string name="key_length_explanation_hex">: WireGuard onaltılık anahtarları 64 karakter (32 bayt) olmalıdır</string> + <string name="latest_handshake">En son el sıkışma</string> + <string name="latest_handshake_ago">%s önce</string> + <string name="listen_port">Dinlenen port</string> + <string name="log_export_error">Günlük dışa aktarılamıyor: %s</string> + <string name="log_export_subject">WireGuard Android Günlük Dosyası</string> + <string name="log_export_success">“%s” ’e kaydedildi</string> + <string name="log_export_title">Günlük dosyasını dışa aktar</string> + <string name="log_saver_activity_label">Günlüğü kaydet</string> + <string name="log_viewer_pref_summary">Günlükler hata ayıklamaya yardımcı olabilir</string> + <string name="log_viewer_pref_title">Uygulama günlüğünü görüntüle</string> + <string name="log_viewer_title">Günlük</string> + <string name="logcat_error">Logcat çalıştırılamıyor: </string> + <string name="module_enabler_disabled_summary">Deneysel çekirdek modülü performansı artırabilir</string> + <string name="module_enabler_disabled_title">Çekirdek modülü arka ucunu etkinleştir</string> + <string name="module_enabler_enabled_summary">Daha yavaş kullanıcı alanı arka ucu kararlılığı artırabilir</string> + <string name="module_enabler_enabled_title">Çekirdek modülü arka ucunu devre dışı bırak</string> + <string name="module_installer_error">Bir şeyler yanlış gitti. Lütfen tekrar deneyin</string> + <string name="module_installer_initial">Deneysel çekirdek modülü performansı artırabilir</string> + <string name="module_installer_not_found">Cihazınız için uygun modül yok</string> + <string name="module_installer_title">Çekirdek modülünü indir ve yükle</string> + <string name="module_installer_working">İndiriliyor ve yükleniyor…</string> + <string name="module_version_error">Çekirdek modülü sürümü belirlenemiyor</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Bir tüneli açmak diğerlerini kapatır</string> + <string name="multiple_tunnels_summary_on">Aynı anda birden fazla tünel açılabilir</string> + <string name="multiple_tunnels_title">Birden çok eşzamanlı tünele izin verin</string> + <string name="name">İsim</string> + <string name="no_config_error">Konfigürasyonsuz bir tünel açmaya çalışılıyor</string> + <string name="no_configs_error">Konfigürasyon bulunamadı</string> + <string name="no_tunnels_error">Tünel yok</string> + <string name="parse_error_generic">dizi</string> + <string name="parse_error_inet_address">IP adresi</string> + <string name="parse_error_inet_endpoint">uç nokta</string> + <string name="parse_error_inet_network">IP ağı</string> + <string name="parse_error_integer">numara</string> + <string name="parse_error_reason">%1$s “%2$s” ayrıştırılamıyor</string> + <string name="peer">Eş</string> + <string name="permission_description">WireGuard tünellerini kontrol edin, tünelleri istediğiniz zaman etkinleştirin ve devre dışı bırakın, İnternet trafiğini potansiyel olarak yanlış yönlendirin</string> + <string name="permission_label">WireGuard tünellerini kontrol edin</string> + <string name="persistent_keepalive">Kalıcı canlı tutma</string> + <string name="pre_shared_key">Önceden paylaşılan anahtar</string> + <string name="pre_shared_key_enabled">etkinleştirildi</string> + <string name="private_key">Özel anahtar</string> + <string name="public_key">Genel anahtar</string> + <string name="qr_code_hint">İpucu: `qrencode -t ansiutf8 < tunnel.conf` ile oluşturun.</string> + <string name="quick_settings_tile_add_title">Hızlı ayarlar paneline kutucuk ekle</string> + <string name="quick_settings_tile_add_summary">Kısayol kutucuğu en son tüneli değiştirir</string> + <string name="quick_settings_tile_add_failure">Kısayol kutucuğu eklenemiyor: hata %d</string> + <string name="quick_settings_tile_action">Tüneli aç/kapat</string> + <string name="restore_on_boot_summary_off">Önyüklemede etkin tünelleri açmayacak</string> + <string name="restore_on_boot_summary_on">Önyüklemede etkin tünelleri açacak</string> + <string name="restore_on_boot_title">Cihaz açılırken başlat</string> + <string name="save">Kaydet</string> + <string name="select_all">Tümünü seç</string> + <string name="settings">Ayarlar</string> + <string name="shell_exit_status_read_error">Kabuk, çıktı durumunu okuyamıyor</string> + <string name="shell_marker_count_error">Kabuk 4 işaret bekledi, %d aldı</string> + <string name="shell_start_error">Kabuk başlatılamadı: %d</string> + <string name="success_application_will_restart">Başarı. Uygulama şimdi yeniden başlayacak…</string> + <string name="toggle_all">Tümünü Değiştir</string> + <string name="toggle_error">WireGuard tüneli değiştirilirken hata oluştu: %s</string> + <string name="tools_installer_already">wg ve wg-quick zaten kurulu</string> + <string name="tools_installer_failure">Komut satırı araçları yüklenemiyor (root yok mu?)</string> + <string name="tools_installer_initial">Komut dosyası oluşturmak için isteğe bağlı araçları yükleyin</string> + <string name="tools_installer_initial_magisk">Magisk modülü olarak komut dosyası oluşturmak için isteğe bağlı araçları yükleyin</string> + <string name="tools_installer_initial_system">Sistem bölümüne komut dosyası oluşturmak için isteğe bağlı araçlar yükleyin</string> + <string name="tools_installer_success_magisk">wg ve wg-quick bir Magisk modülü olarak kuruldu (yeniden başlatma gerekir)</string> + <string name="tools_installer_success_system">wg ve wg-quick, sistem bölümüne yüklendi</string> + <string name="tools_installer_title">Komut satırı araçlarını yükleyin</string> + <string name="tools_installer_working">wg ve wg-quick kuruluyor</string> + <string name="tools_unavailable_error">Gerekli araçlar mevcut değil</string> + <string name="transfer">Transfer</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Tun cihazı oluşturulamıyor</string> + <string name="tunnel_config_error">Tünel yapılandırılamıyor (wg-quick döndürdü: %d)</string> + <string name="tunnel_create_error">Tünel oluşturulamıyor: %s</string> + <string name="tunnel_create_success">Tünel başarıyla oluşturuldu “%s”</string> + <string name="tunnel_error_already_exists">“%s” tüneli zaten mevcut</string> + <string name="tunnel_error_invalid_name">Geçersiz isim</string> + <string name="tunnel_list_placeholder">Aşağıdaki düğmeyi kullanarak bir tünel ekleyin</string> + <string name="tunnel_name">Tünel İsmi</string> + <string name="tunnel_on_error">Tünel aktif edilemiyor (wgTornOn döndürdü: %d)</string> + <string name="tunnel_dns_failure">DNS adı çözülemedi: \"%s\"</string> + <string name="tunnel_rename_error">Tünel yeniden adlandırılamıyor: %s</string> + <string name="tunnel_rename_success">Tünel başarıyla yeniden adlandırıldı “%s”</string> + <string name="type_name_go_userspace">Kullanıcı alanına git</string> + <string name="type_name_kernel_module">Çekirdek modülü</string> + <string name="unknown_error">Bilinmeyen hata</string> + <string name="updater_avalable">Bir uygulama güncellemesi mevcut. Lütfen şimdi güncelleyin.</string> + <string name="updater_action">İndir & Güncelle</string> + <string name="updater_rechecking">Güncelleme meta verileri getiriliyor…</string> + <string name="updater_download_progress">Güncelleme indiriliyor: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Güncelleme indiriliyor: %s</string> + <string name="updater_installing">Güncelleme yükleniyor…</string> + <string name="updater_failure">Güncelleme hatası: %s. Kısa bir süre sonra tekrar denenecek…</string> + <string name="updater_corrupt_title">Uygulama Bozuk</string> + <string name="updater_corrupt_message">Bu uygulama bozuk. Lütfen APK\'yı aşağıda bağlantısı verilen web sitesinden yeniden indirin. Daha sonra bu uygulamayı kaldırın ve indirilen APK\'dan yeniden yükleyin.</string> + <string name="updater_corrupt_navigate">Web Sitesini Aç</string> + <string name="version_summary">%1$s arka uç %2$s</string> + <string name="version_summary_checking">%s arka uç sürümü kontrol ediliyor</string> + <string name="version_summary_unknown">Bilinmeyen %s sürümü</string> + <string name="version_title">Android için WireGuard v%s</string> + <string name="vpn_not_authorized_error">VPN hizmeti kullanıcı tarafından yetkilendirilmemiş</string> + <string name="vpn_start_error">Android VPN hizmeti başlatılamıyor</string> + <string name="zip_export_error">Tüneller dışa aktarılamıyor: %s</string> + <string name="zip_export_success">“%s” ’e kaydedildi</string> + <string name="zip_export_summary">Zip dosyası indirilenler klasörüne kaydedilecek</string> + <string name="zip_export_title">Tünelleri zip dosyasına aktar</string> + <string name="biometric_prompt_zip_exporter_title">Tünelleri dışa aktarmak için kimlik doğrulama</string> + <string name="biometric_prompt_private_key_title">Özel anahtarı görüntülemek için kimlik doğrulaması</string> + <string name="biometric_auth_error">Kimlik doğrulama hatası</string> + <string name="biometric_auth_error_reason">Kimlik doğrulama hatası: %s</string> +</resources> diff --git a/ui/src/main/res/values-uk-rUA/strings.xml b/ui/src/main/res/values-uk-rUA/strings.xml new file mode 100644 index 00000000..15b51b90 --- /dev/null +++ b/ui/src/main/res/values-uk-rUA/strings.xml @@ -0,0 +1,270 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="one">Неможливо видалити %d тунель: %s</item> + <item quantity="few">Неможливо видалити %d тунелі: %s</item> + <item quantity="many">Неможливо видалити %d тунелів: %s</item> + <item quantity="other">Неможливо видалити %d тунелів: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="one">Успішно видалено %d тунель</item> + <item quantity="few">Успішно видалено %d тунелі</item> + <item quantity="many">Успішно видалено %d тунелів</item> + <item quantity="other">Успішно видалено %d тунелів</item> + </plurals> + <plurals name="delete_title"> + <item quantity="one">%d тунель вибрано</item> + <item quantity="few">%d тунелі вибрано</item> + <item quantity="many">%d тунелів вибрано</item> + <item quantity="other">%d тунелів вибрано</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="one">Імпортовано %1$d з %2$d тунелів</item> + <item quantity="few">Імпортовано %1$d з %2$d тунелів</item> + <item quantity="many">Імпортовано %1$d з %2$d тунелів</item> + <item quantity="other">Імпортовано %1$d з %2$d тунелів</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="one">Імпортовано %d тунель</item> + <item quantity="few">Імпортовано %d тунелі</item> + <item quantity="many">Імпортовано %d тунелів</item> + <item quantity="other">Імпортовано %d тунелів</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="one">%d Виключений додаток</item> + <item quantity="few">%d Виключених додатки</item> + <item quantity="many">%d Виключені додатки</item> + <item quantity="other">%d Виключених додатків</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="one">%d Включений додаток</item> + <item quantity="few">%d Включені додатки</item> + <item quantity="many">%d Включених додатків</item> + <item quantity="other">%d Включених додатків</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="one">%d виключений</item> + <item quantity="few">%d виключені</item> + <item quantity="many">%d виключені</item> + <item quantity="other">%d виключені</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="one">%d включено</item> + <item quantity="few">%d включено</item> + <item quantity="many">%d включено</item> + <item quantity="other">%d включено</item> + </plurals> + <string name="all_applications">Всі додатки</string> + <string name="exclude_from_tunnel">Виключити</string> + <string name="include_in_tunnel">Включити тільки</string> + <plurals name="include_n_applications"> + <item quantity="one">Включити %d додаток</item> + <item quantity="few">Включити %d додатки</item> + <item quantity="many">Включити %d додатків</item> + <item quantity="other">Включити %d додатків</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="one">Виключити %d додаток</item> + <item quantity="few">Виключити %d додатки</item> + <item quantity="many">Виключити %d додатків</item> + <item quantity="other">Виключити %d додатків</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="one">кожну секунду</item> + <item quantity="few">кожні %d секунди</item> + <item quantity="many">кожних %d секунд</item> + <item quantity="other">кожних %d секунд</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="one">секунда</item> + <item quantity="few">секунди</item> + <item quantity="many">секунд</item> + <item quantity="other">секунд</item> + </plurals> + <string name="use_all_applications">Використовувати всі додатки</string> + <string name="add_peer">Додати пір</string> + <string name="addresses">Адреси</string> + <string name="applications">Додатки</string> + <string name="allow_remote_control_intents_summary_off">Зовнішні додатки не можуть перемикати тунелі (рекомендовано)</string> + <string name="allow_remote_control_intents_summary_on">Зовнішні додатки можуть перемикати тунелі (для досвідчених)</string> + <string name="allow_remote_control_intents_title">Дозволити керування через інші додатки</string> + <string name="allowed_ips">Дозволені IP адреси</string> + <string name="bad_config_context">%1$s з %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s в %2$s</string> + <string name="bad_config_explanation_pka">: Повинно бути додатним і не більше 65535</string> + <string name="bad_config_explanation_positive_number">: Повинно бути додатним</string> + <string name="bad_config_explanation_udp_port">: Повинен бути дійсним номером UDP порту</string> + <string name="bad_config_reason_invalid_key">Невірний ключ</string> + <string name="bad_config_reason_invalid_number">Недійсний номер</string> + <string name="bad_config_reason_invalid_value">Неприпустиме значення</string> + <string name="bad_config_reason_missing_attribute">Відсутній атрибут</string> + <string name="bad_config_reason_missing_section">Розділ відсутній</string> + <string name="bad_config_reason_syntax_error">Синтаксична помилка</string> + <string name="bad_config_reason_unknown_attribute">Невідомий атрибут</string> + <string name="bad_config_reason_unknown_section">Невідома секція</string> + <string name="bad_config_reason_value_out_of_range">Значення поза діапазоном</string> + <string name="bad_extension_error">Файл повинен мати розширення .conf або .zip</string> + <string name="error_no_qr_found">QR-код не знайдено на зображенні</string> + <string name="error_qr_checksum">Не вдалося перевірити контрольну суму QR-коду</string> + <string name="cancel">Скасувати</string> + <string name="config_delete_error">Не вдалося видалити файл конфігурації %s</string> + <string name="config_exists_error">Конфігурація для \"%s\" вже існує</string> + <string name="config_file_exists_error">Файл конфігурації \"%s\" вже існує</string> + <string name="config_not_found_error">Файл конфігурації \"%s\" не знайдено</string> + <string name="config_rename_error">Не вдалося перейменувати файл конфігурації \"%s\"</string> + <string name="config_save_error">Не вдалося зберегти конфігурацію для \"%1$s\": %2$s</string> + <string name="config_save_success">Конфігурацію успішно збережено для \"%s\"</string> + <string name="create_activity_title">Створити тунель WireGuard</string> + <string name="create_bin_dir_error">Не вдалося створити локальну бінарну теку</string> + <string name="create_downloads_file_error">Не вдалося створити файл в папці завантажень</string> + <string name="create_empty">Створити з нуля</string> + <string name="create_from_file">Імпортувати з файлу або архіву</string> + <string name="create_from_qr_code">Сканувати з QR-коду</string> + <string name="create_output_dir_error">Неможливо створити вихідний каталог</string> + <string name="create_temp_dir_error">Не вдалося створити локальну тимчасову папку</string> + <string name="create_tunnel">Створити тунель</string> + <string name="copied_to_clipboard">%s скопійовано в буфер обміну</string> + <string name="dark_theme_summary_off">Зараз використовується світла (денна) тема</string> + <string name="dark_theme_summary_on">Зараз використовується темна (нічна) тема</string> + <string name="dark_theme_title">Використовувати темну тему</string> + <string name="delete">Видалити</string> + <string name="tv_delete">Оберіть тунель для видалення</string> + <string name="tv_select_a_storage_drive">Виберіть диск зберігання</string> + <string name="tv_no_file_picker">Будь ласка, встановіть провідник для перегляду файлів</string> + <string name="tv_add_tunnel_get_started">Додайте тунель, щоб почати</string> + <string name="donate_title">♥️ Пожертвуйте на проект WireGuard</string> + <string name="donate_summary">Кожен внесок допомагає</string> + <string name="disable_config_export_title">Вимкнути експорт конфігурації</string> + <string name="disable_config_export_description">Вимкнення експорту налаштувань робить приватні ключі менш доступними</string> + <string name="dns_servers">DNS-сервери</string> + <string name="dns_search_domains">Пошук доменів</string> + <string name="edit">Редагувати</string> + <string name="endpoint">Endpoint</string> + <string name="error_down">Помилка вимкнення тунелю: %s</string> + <string name="error_fetching_apps">Помилка при отриманні списку додатків: %s</string> + <string name="error_root">Будь ласка, отримайте root-доступ і спробуйте ще раз</string> + <string name="error_prepare">Помилка підготовки тунелю: %s</string> + <string name="error_up">Помилка при увімкненні тунелю: %s</string> + <string name="exclude_private_ips">Виключити приватні IP</string> + <string name="generate_new_private_key">Згенерувати новий приватний ключ</string> + <string name="generic_error">Невідома помилка “%s”</string> + <string name="hint_automatic">(авто)</string> + <string name="hint_generated">(згенеровано)</string> + <string name="hint_optional">(необов\'язково)</string> + <string name="hint_optional_discouraged">(необов\'язково, не рекомендується)</string> + <string name="hint_random">(випадковий)</string> + <string name="illegal_filename_error">Некоректна назва файлу“%s”</string> + <string name="import_error">Не вдалося імпортувати тунель: %s</string> + <string name="import_from_qr_code">Імпортувати тунель з QR-коду</string> + <string name="import_success">Імпортовано “%s”</string> + <string name="interface_title">Інтерфейс</string> + <string name="key_contents_error">Недопустимі символи в ключі</string> + <string name="key_length_error">Неправильна довжина ключа</string> + <string name="key_length_explanation_base64">: Ключі WireGuard base64 повинні мати довжину 44 символи (32 байти)</string> + <string name="key_length_explanation_binary">: Ключі WireGuard повинні мати довжину 32 байти</string> + <string name="key_length_explanation_hex">: hex ключі WireGuard повинні мати довжину 64 символи (32 байти)</string> + <string name="latest_handshake">Останнє рукостискання</string> + <string name="latest_handshake_ago">%s тому</string> + <string name="listen_port">Порт</string> + <string name="log_export_error">Не вдалося експортувати журнал: %s</string> + <string name="log_export_subject">Файл журналу WireGuard</string> + <string name="log_export_success">Збережено до “%s”</string> + <string name="log_export_title">Експорт файлу журналу</string> + <string name="log_saver_activity_label">Зберегти лог</string> + <string name="log_viewer_pref_summary">Логи можуть допомогти в налагодженні</string> + <string name="log_viewer_pref_title">Переглянути журнал програми</string> + <string name="log_viewer_title">Журнал</string> + <string name="logcat_error">Не вдалося запустити logcat: </string> + <string name="module_enabler_disabled_summary">Експериментальний модуль ядра може підвищити продуктивність</string> + <string name="module_enabler_disabled_title">Увімкнути модуль ядра</string> + <string name="module_enabler_enabled_summary">Користувацький простір повільніший, проте може покращити стабільність</string> + <string name="module_enabler_enabled_title">Вимкнути модуль ядра</string> + <string name="module_installer_error">Щось пішло не так. Спробуйте ще раз</string> + <string name="module_installer_initial">Експериментальний модуль ядра може підвищити продуктивність</string> + <string name="module_installer_not_found">Немає доступних модулів для вашого пристрою</string> + <string name="module_installer_title">Завантажити та встановити модуль ядра</string> + <string name="module_installer_working">Завантаження та встановлення…</string> + <string name="module_version_error">Не вдалося визначити версію модуля ядра</string> + <string name="mtu">MTU</string> + <string name="multiple_tunnels_summary_off">Увімкнення одного тунелю призведе до вимкнення інших</string> + <string name="multiple_tunnels_summary_on">Декілька тунелів можуть бути увімкнені одночасно</string> + <string name="multiple_tunnels_title">Дозволити кілька одночасних тунелів</string> + <string name="name">Назва</string> + <string name="no_config_error">Спроба підняти тунель без конфігурації</string> + <string name="no_configs_error">Немає конфігурацій</string> + <string name="no_tunnels_error">Немає тунелів</string> + <string name="parse_error_generic">рядок</string> + <string name="parse_error_inet_address">ІР-адреса</string> + <string name="parse_error_inet_endpoint">кінцева точка</string> + <string name="parse_error_inet_network">IP мережа</string> + <string name="parse_error_integer">число</string> + <string name="parse_error_reason">Не вдалося обробити %1$s \"%2$s\"</string> + <string name="peer">Пір</string> + <string name="permission_description">керувати тунелями WireGuard, вмикати та вимикати тунелі на свій розсуд, потенційно перешкоджаючи інтернет-трафіку</string> + <string name="permission_label">керування тунелями WireGuard</string> + <string name="persistent_keepalive">Постійне з\'єднання</string> + <string name="pre_shared_key">Pre-shared ключ</string> + <string name="pre_shared_key_enabled">увімкнений</string> + <string name="private_key">Приватний ключ</string> + <string name="public_key">Публічний ключ</string> + <string name="qr_code_hint">Порада: згенеруйте за допомогою `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="restore_on_boot_summary_off">Не піднімати увімкнені тунелі при запуску</string> + <string name="restore_on_boot_summary_on">Піднімати увімкнені тунелі при запуску</string> + <string name="restore_on_boot_title">Відновлювати при запуску</string> + <string name="save">Зберегти</string> + <string name="select_all">Вибрати всі</string> + <string name="settings">Налаштування</string> + <string name="shell_exit_status_read_error">Shell не може прочитати статус виходу</string> + <string name="shell_marker_count_error">Очікувалось 4 маркери, отримано %d</string> + <string name="shell_start_error">Не вдалося запустити в оболонці: %d</string> + <string name="success_application_will_restart">Успішно виконано. Додаток буде перезапущено…</string> + <string name="toggle_all">Перемкнути всі</string> + <string name="toggle_error">Помилка перемикання тунелю: %s</string> + <string name="tools_installer_already">wg та wg-quick вже встановлено</string> + <string name="tools_installer_failure">Не вдалося встановити інструменти командного рядка (немає root?)</string> + <string name="tools_installer_initial">Встановити додаткові інструменти для сценаріїв</string> + <string name="tools_installer_initial_magisk">Встановити додаткові інструменти для сценаріїв в якості Magisk модуля</string> + <string name="tools_installer_initial_system">Встановити додаткові інструменти для сценаріїв в системний розділ</string> + <string name="tools_installer_success_magisk">wg і wg-quick встагновлено як Magisk модуль (необхідне перезавантаження)</string> + <string name="tools_installer_success_system">wg та wg-quick встановлено у системній розділ</string> + <string name="tools_installer_title">Встановити інструменти командного рядка</string> + <string name="tools_installer_working">Встановити wg та wg-quick</string> + <string name="tools_unavailable_error">Необхідні інструменти недоступні</string> + <string name="transfer">Передано</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">rx: %1$s, tx: %2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">Не вдалося створити tun інтерфейс</string> + <string name="tunnel_config_error">Не вдалося налаштувати тунель (wg-quick return %d)</string> + <string name="tunnel_create_error">Не вдалося створити тунель: %s</string> + <string name="tunnel_create_success">Тунель успішно створено “%s”</string> + <string name="tunnel_error_already_exists">Тунель \"%s\" вже існує</string> + <string name="tunnel_error_invalid_name">Неприпустиме ім\'я</string> + <string name="tunnel_list_placeholder">Додайте тунель, використовуючи кнопку нижче</string> + <string name="tunnel_name">Назва тунелю</string> + <string name="tunnel_on_error">Неможливо ввімкнути тунель (wgTurnon returned %d)</string> + <string name="tunnel_dns_failure">Не вдалося знайти DNS хост: “%s</string> + <string name="tunnel_rename_error">Не вдалося перейменувати тунель: %s</string> + <string name="tunnel_rename_success">Тунель успішно перейменовано на \"%s\"</string> + <string name="type_name_go_userspace">Go userspace</string> + <string name="type_name_kernel_module">Модуль ядра</string> + <string name="unknown_error">Невідома помилка</string> + <string name="version_summary">%1$s backend %2$s</string> + <string name="version_summary_checking">Перевірка %s backend версії</string> + <string name="version_summary_unknown">Невідома версія %s</string> + <string name="version_title">WireGuard for Android v%s</string> + <string name="vpn_not_authorized_error">Служба VPN не авторизована користувачем</string> + <string name="vpn_start_error">Не вдалося запустити службу Android VPN</string> + <string name="zip_export_error">Не вдалося експортувати тунелі: %s</string> + <string name="zip_export_success">Збережено до “%s”</string> + <string name="zip_export_summary">Zip-файл буде збережено до теки завантажень</string> + <string name="zip_export_title">Експортувати тунелі в zip-файл</string> + <string name="biometric_prompt_zip_exporter_title">Авторизуватись для експорту тунелів</string> + <string name="biometric_prompt_private_key_title">Авторизуйтеся для перегляду закритого ключа</string> + <string name="biometric_auth_error">Помилка автентифікації</string> + <string name="biometric_auth_error_reason">Помилка автентифікації: %s</string> +</resources> diff --git a/ui/src/main/res/values-v21/styles.xml b/ui/src/main/res/values-v21/styles.xml deleted file mode 100644 index 7119a147..00000000 --- a/ui/src/main/res/values-v21/styles.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - - <style name="AppTheme" parent="Theme.MaterialComponents.DayNight"> - <item name="colorPrimary">@color/primary_color</item> - <item name="colorOnPrimary">@color/color_control_normal</item> - <item name="colorPrimaryDark">@color/primary_color</item> - <item name="colorPrimaryVariant">@color/primary_light_color</item> - <item name="colorSecondary">@color/secondary_color</item> - <item name="colorOnSecondary">@color/secondary_text_color</item> - <item name="colorSurface">@color/primary_color</item> - <item name="colorOnSurface">@color/color_control_normal</item> - <item name="colorBackground">@color/primary_color</item> - <item name="colorMultiselectActiveBackground">@color/list_multiselect_background</item> - <item name="colorControlNormal">@color/color_control_normal</item> - <item name="elevationOverlayColor">@color/primary_light_color</item> - <item name="elevationOverlayEnabled">true</item> - <item name="android:statusBarColor">#000000</item> - <item name="android:navigationBarColor">#000000</item> - <item name="android:windowBackground">@color/primary_color</item> - <item name="alertDialogTheme">@style/AppTheme.Dialog</item> - <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item> - <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item> - <item name="textInputStyle">@style/TextInputLayoutBase</item> - <item name="materialCardViewStyle">@style/AppTheme.MaterialCardView</item> - </style> -</resources> diff --git a/ui/src/main/res/values-v23/styles.xml b/ui/src/main/res/values-v23/styles.xml new file mode 100644 index 00000000..13feb8c3 --- /dev/null +++ b/ui/src/main/res/values-v23/styles.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <style name="AppTheme" parent="AppThemeBase"> + <item name="android:statusBarColor">?android:colorBackground</item> + <item name="android:windowLightStatusBar">@bool/light_status_bar</item> + </style> +</resources> diff --git a/ui/src/main/res/values-v27/styles.xml b/ui/src/main/res/values-v27/styles.xml index 03f0da86..f94cadb1 100644 --- a/ui/src/main/res/values-v27/styles.xml +++ b/ui/src/main/res/values-v27/styles.xml @@ -1,30 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="AppTheme" parent="Theme.MaterialComponents.DayNight"> - <item name="colorPrimary">@color/primary_color</item> - <item name="colorOnPrimary">@color/color_control_normal</item> - <item name="colorPrimaryDark">@color/primary_color</item> - <item name="colorPrimaryVariant">@color/primary_light_color</item> - <item name="colorSecondary">@color/secondary_color</item> - <item name="colorOnSecondary">@color/secondary_text_color</item> - <item name="colorSurface">@color/primary_color</item> - <item name="colorOnSurface">@color/color_control_normal</item> - <item name="colorBackground">@color/primary_color</item> - <item name="colorControlNormal">@color/color_control_normal</item> - <item name="colorMultiselectActiveBackground">@color/list_multiselect_background</item> - <item name="elevationOverlayColor">@color/primary_light_color</item> - <item name="elevationOverlayEnabled">true</item> - <item name="android:colorBackground">@color/primary_color</item> - <item name="android:navigationBarColor">@color/navigation_bar_color</item> - <item name="android:statusBarColor">@color/status_bar_color</item> - <item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item> + <style name="AppTheme" parent="AppThemeBase"> + <item name="android:statusBarColor">?android:colorBackground</item> <item name="android:windowLightStatusBar">@bool/light_status_bar</item> - <item name="android:windowBackground">@color/primary_color</item> - <item name="alertDialogTheme">@style/AppTheme.Dialog</item> - <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item> - <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item> - <item name="textInputStyle">@style/TextInputLayoutBase</item> - <item name="materialCardViewStyle">@style/AppTheme.MaterialCardView</item> + <item name="android:navigationBarColor">?android:colorBackground</item> + <item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item> </style> </resources> diff --git a/ui/src/main/res/values-vi-rVN/strings.xml b/ui/src/main/res/values-vi-rVN/strings.xml new file mode 100644 index 00000000..79d8d6c3 --- /dev/null +++ b/ui/src/main/res/values-vi-rVN/strings.xml @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="other">Không thể xóa %d tunnel(s): %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="other">Đã xóa thành công %d tunnel(s)</item> + </plurals> + <plurals name="delete_title"> + <item quantity="other">Đã chọn %d tunnel(s)</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="other">Đã nhập %1$d trong số %2$d tunnel(s)</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="other">Đã nhập %d tunnel(s)</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="other">%d Ứng dụng được loại trừ</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="other">%d Ứng dụng được bao gồm</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="other">Đã loại trừ %d</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="other">Đã thêm vào %d</item> + </plurals> + <string name="all_applications">Tất cả các ứng dụng</string> + <string name="exclude_from_tunnel">Ngoại trừ</string> + <string name="include_in_tunnel">Chỉ bao gồm</string> + <plurals name="include_n_applications"> + <item quantity="other">Thêm vào %d ứng dụng</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="other">Loại trừ %d ứng dụng</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="other">Mỗi %d giây</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="other">Giây</item> + </plurals> + <string name="use_all_applications">Xài dùng tất cả app</string> + <string name="add_peer">Thêm cộng tác viên</string> + <string name="addresses">Địa chỉ</string> + <string name="applications">Ứng dụng</string> + <string name="allow_remote_control_intents_summary_off">Các ứng dụng bên ngoài không thể bật/tắt tunnels (khuyến nghị)</string> + <string name="allow_remote_control_intents_summary_on">Các ứng dụng bên ngoài có thể bật/tắt tunnels (nâng cao)</string> + <string name="allow_remote_control_intents_title">Cho phép điều khiển ứng dụng từ xa</string> + <string name="allowed_ips">IP Cho phép </string> + <string name="bad_config_context">%1$s / %2$s</string> + <string name="bad_config_context_top_level">%s</string> + <string name="bad_config_error">%1$s trong %2$s</string> + <string name="bad_config_explanation_pka">: Phải là số dương và không lớn hơn 65535</string> + <string name="bad_config_explanation_positive_number">Giá trị phải là số dương</string> + <string name="bad_config_explanation_udp_port">: Phải là port UDP hợp lý</string> + <string name="bad_config_reason_invalid_key">Khoá không hợp lệ</string> + <string name="bad_config_reason_invalid_number">Số không hợp lệ</string> + <string name="bad_config_reason_invalid_value">Giá trị không hợp lệ</string> + <string name="bad_config_reason_missing_attribute">Thuộc tính bị thiếu</string> + <string name="bad_config_reason_missing_section">Phần bị thiếu</string> + <string name="bad_config_reason_syntax_error">Lỗi cú pháp</string> + <string name="bad_config_reason_unknown_attribute">Thuộc tính không tồn tại</string> + <string name="bad_config_reason_unknown_section">Mục không xác định</string> + <string name="bad_config_reason_value_out_of_range">Giá trị vượt ngoài khoảng cho phép</string> + <string name="bad_extension_error">File phải là .conf hoặc .zip</string> + <string name="error_no_qr_found">Không tìm thấy QR code trong ảnh</string> + <string name="error_qr_checksum">Kiểm tra checksum QR code không thành công</string> + <string name="cancel">Hủy</string> + <string name="config_delete_error">Không thể xóa file cấu hình \"%s\"</string> + <string name="config_exists_error">Cấu hình cho \"%s\" đã tồn tại</string> + <string name="config_file_exists_error">File cấu hình cho \"%s\" đã tồn tại</string> + <string name="config_not_found_error">Không tìm thấy file cấu hình \"%s\"</string> + <string name="config_rename_error">Không thể xóa file cấu hình \"%s\"</string> + <string name="config_save_error">Không thể lưu cấu hình cho \"%1$s\": %2$s</string> + <string name="config_save_success">Đã lưu cấu hình thành công cho \"%s\"</string> + <string name="create_activity_title">Tạo ra Wireguard VPN</string> + <string name="create_bin_dir_error">Không thế tạo local binary directory</string> + <string name="create_downloads_file_error">Không thể tạo file trong thư mục download</string> + <string name="create_empty">Làm lại từ đầu</string> + <string name="create_from_file">Nhập từ file hoặc archive</string> + <string name="create_from_qr_code">Quét mã QR</string> + <string name="create_output_dir_error">Không thể tạo tập tin xuất ra</string> + <string name="create_temp_dir_error">Không thế tạo local binary directory</string> + <string name="create_tunnel">Tạo VPN</string> + <string name="copied_to_clipboard">%s đã sao chép vào bộ nhớ tạm</string> + <string name="dark_theme_summary_off">Đang sử dụng ánh sáng (ngày)</string> + <string name="dark_theme_summary_on">Đang sử dụng đề tối (ban đêm)</string> + <string name="dark_theme_title">Sử dụng đề tối</string> + <string name="delete">Xóa</string> + <string name="tv_delete">Chọn tunnel để xóa</string> + <string name="tv_select_a_storage_drive">Chọn bộ lưu trữ</string> + <string name="tv_no_file_picker">Vui lòng cài đặt tệp tiện ích lưu trữ để tìm kiếm các tệp</string> + <string name="tv_add_tunnel_get_started">Thêm một tunnel để bắt đầu</string> + <string name="donate_title">❤️ Đóng góp cho Dự án Wireguard</string> + <string name="donate_summary">Mọi đóng góp đều giúp ích</string> + <string name="donate_google_play_disappointment">Cảm ơn bạn đã ủng hộ WireGuard!\n\nThật tiếc, dựa trên điều khoản của Google, chúng tôi không thể đưa vào liên kết dẫn đến trang đóng góp ở trang chủ của dự án. Mong rằng bạn có thể tìm cách cho việc này!\n\nXin cảm ơn bạn một lần nữa vì đã đóng góp.</string> + <string name="disable_config_export_title">Vô hiệu hóa xuất cấu hình</string> + <string name="disable_config_export_description">Vô hiệu hóa xuất cấu hình sẽ giúp giảm khả năng truy cập vào private keys</string> + <string name="dns_servers">DNS servers</string> + <string name="dns_search_domains">Tên miền của DNS tìm kiếm</string> + <string name="edit">Chỉnh sửa</string> + <string name="endpoint">Đầu cuối</string> + <string name="error_down">Có lỗi khi tắt tunnel: %s</string> + <string name="error_fetching_apps">Lỗi khi lấy danh sách ứng dụng: %s</string> + <string name="error_root">Vui lòng truy cập bằng quyền root và thử lại</string> + <string name="error_prepare">Lỗi khi chuẩn bị tunnel: %s</string> + <string name="error_up">Có lỗi khi bật tunnel: %s</string> + <string name="exclude_private_ips">Loại trừ IPs private</string> + <string name="generate_new_private_key">Tạo private key mới</string> + <string name="generic_error">Lỗi \"%s\" không xác định</string> + <string name="hint_automatic">(tự động)</string> + <string name="hint_generated">(được tạo tự động)</string> + <string name="hint_optional">(tùy chọn)</string> + <string name="hint_optional_discouraged">(tùy chọn, không khuyến khích)</string> + <string name="hint_random">(ngẫu nhiên)</string> + <string name="illegal_filename_error">Tên file không hợp lệ \"%s\"</string> + <string name="import_error">Không thể nhập tunnel: %s</string> + <string name="import_from_qr_code">Nhập tunnel từ mã QR</string> + <string name="import_success">Đã nhập \"%s\"</string> + <string name="interface_title">Giao diện</string> + <string name="key_contents_error">Kí tự không hợp lệ trong khoá</string> + <string name="key_length_error">Độ dài khoá không hợp lệ</string> + <string name="key_length_explanation_base64">: Khoá WireGuard base64 phải đủ 44 ký tự (32 bytes)</string> + <string name="key_length_explanation_binary">: Khoá WireGuard phải đủ 32 bytes</string> + <string name="key_length_explanation_hex">: Khoá WireGuard hex phải đủ 64 ký tự (32 bytes)</string> + <string name="latest_handshake">Lần bắt tay cuối</string> + <string name="latest_handshake_ago">%s giây trước</string> + <string name="listen_port">Cổng</string> + <string name="log_export_error">Không thể xuất nhật ký: %s</string> + <string name="log_export_subject">File nhật ký WireGuard Android</string> + <string name="log_export_success">Đã lưu vào \"%s\"</string> + <string name="log_export_title">Xuất file nhật ký</string> + <string name="log_saver_activity_label">Lưu nhật ký</string> + <string name="parse_error_inet_address">Địa chỉ IP</string> + <string name="peer">Đồng trang lứa</string> +</resources> diff --git a/ui/src/main/res/values-zh-rCN/strings.xml b/ui/src/main/res/values-zh-rCN/strings.xml index 38933b2f..7757e2fe 100644 --- a/ui/src/main/res/values-zh-rCN/strings.xml +++ b/ui/src/main/res/values-zh-rCN/strings.xml @@ -4,16 +4,16 @@ <item quantity="other">无法删除 %d 项：%s</item> </plurals> <plurals name="delete_success"> - <item quantity="other">删除了 %d 项</item> + <item quantity="other">成功删除了 %d 项</item> </plurals> <plurals name="delete_title"> - <item quantity="other">已选择 %d 项</item> + <item quantity="other">已选择 %d 个隧道</item> </plurals> <plurals name="import_partial_success"> <item quantity="other">导入了 %2$d 项中的 %1$d 项</item> </plurals> <plurals name="import_total_success"> - <item quantity="other">导入了 %d 项</item> + <item quantity="other">导入了 %d 个隧道</item> </plurals> <plurals name="set_excluded_applications"> <item quantity="other">对 %d 个应用不生效</item> @@ -27,14 +27,14 @@ <plurals name="n_included_applications"> <item quantity="other">对 %d 个应用生效</item> </plurals> - <string name="all_applications">对全部应用生效</string> + <string name="all_applications">应用过滤</string> <string name="exclude_from_tunnel">不生效</string> <string name="include_in_tunnel">生效</string> <plurals name="include_n_applications"> - <item quantity="other">设定 %d 个应用</item> + <item quantity="other">选定 %d 个应用</item> </plurals> <plurals name="exclude_n_applications"> - <item quantity="other">设定 %d 个应用</item> + <item quantity="other">选定 %d 个应用</item> </plurals> <plurals name="persistent_keepalive_seconds_unit"> <item quantity="other">每隔 %d 秒</item> @@ -46,15 +46,14 @@ <string name="add_peer">添加节点</string> <string name="addresses">局域网 IP 地址</string> <string name="applications">应用过滤</string> - <string name="allow_remote_control_intents_summary_off">外部应用当前不能控制隧道（不建议勾选）</string> - <string name="allow_remote_control_intents_summary_on">外部应用当前能够控制隧道（面向高级用户）</string> + <string name="allow_remote_control_intents_summary_off">不允许外部应用控制隧道（推荐）</string> + <string name="allow_remote_control_intents_summary_on">允许外部应用控制隧道（面向高级用户）</string> <string name="allow_remote_control_intents_title">授权外部控制</string> <string name="allowed_ips">路由的 IP 地址（段）</string> - <string name="app_name">WireGuard</string> <string name="bad_config_context">%1$s 的 %2$s 字段</string> <string name="bad_config_context_top_level">%s</string> <string name="bad_config_error">在 %2$s发生了%1$s的问题</string> - <string name="bad_config_explanation_pka">：必须为正整数且不超过 65535</string> + <string name="bad_config_explanation_pka">：必须为不超过 65535 的正整数</string> <string name="bad_config_explanation_positive_number">：必须为正整数</string> <string name="bad_config_explanation_udp_port">：必须为有效的 UDP 端口号</string> <string name="bad_config_reason_invalid_key">密钥无效</string> @@ -67,6 +66,8 @@ <string name="bad_config_reason_unknown_section">节未知</string> <string name="bad_config_reason_value_out_of_range">数值超出范围</string> <string name="bad_extension_error">扩展名必须为 .conf 或 .zip</string> + <string name="error_no_qr_found">图片中未发现二维码</string> + <string name="error_qr_checksum">二维码校验失败</string> <string name="cancel">取消</string> <string name="config_delete_error">无法删除配置 “%s”</string> <string name="config_exists_error">“%s” 的配置已存在</string> @@ -84,16 +85,28 @@ <string name="create_output_dir_error">无法创建输出目录</string> <string name="create_temp_dir_error">无法创建本地临时目录</string> <string name="create_tunnel">创建隧道</string> + <string name="copied_to_clipboard">%s 已复制到剪贴板</string> <string name="dark_theme_summary_off">正在使用亮色（白昼）主题</string> <string name="dark_theme_summary_on">正在使用暗色（黑夜）主题</string> <string name="dark_theme_title">使用暗色主题</string> <string name="delete">删除</string> + <string name="tv_delete">选择要删除的隧道</string> + <string name="tv_select_a_storage_drive">选择一个存储驱动器</string> + <string name="tv_no_file_picker">请安装一个文件管理工具以浏览文件</string> + <string name="tv_add_tunnel_get_started">添加第一条网络隧道</string> + <string name="donate_title">♥ 为 WireGuard 捐赠</string> + <string name="donate_summary">无论多寡，聚沙成塔</string> + <string name="donate_google_play_disappointment">感谢您对 WireGuard 项目的支持！\n\n只可惜，受谷歌的政策所限，我们不能在此展示项目捐赠页面的链接，还望您自行访问捐赠页面！\n\n再次感谢您的贡献。</string> + <string name="disable_config_export_title">禁止导出配置</string> + <string name="disable_config_export_description">禁止导出配置可降低私钥泄露的风险</string> <string name="dns_servers">DNS 服务器</string> + <string name="dns_search_domains">搜索域名</string> <string name="edit">编辑</string> <string name="endpoint">对端</string> <string name="error_down">断开连接时出错：%s</string> <string name="error_fetching_apps">获取应用列表时出错：%s</string> <string name="error_root">请获取 root 权限并重试</string> + <string name="error_prepare">准备连接时出错：%s</string> <string name="error_up">建立连接时出错：%s</string> <string name="exclude_private_ips">排除局域网</string> <string name="generate_new_private_key">生成新的私钥</string> @@ -107,12 +120,14 @@ <string name="import_error">无法导入隧道：%s</string> <string name="import_from_qr_code">从二维码导入隧道</string> <string name="import_success">导入了 “%s”</string> - <string name="interface_title">接口 / Interface</string> + <string name="interface_title">本地（Interface）</string> <string name="key_contents_error">密钥中含有错误字符</string> <string name="key_length_error">密钥长度错误</string> <string name="key_length_explanation_base64">：WireGuard 的 Base64 密钥长度必须为 44 个字符（32 字节）</string> <string name="key_length_explanation_binary">：WireGuard 密钥大小必须为 32 字节</string> <string name="key_length_explanation_hex">：WireGuard 的十六进制密钥长度必须为 64 个字符（32 字节）</string> + <string name="latest_handshake">上次握手时间</string> + <string name="latest_handshake_ago">%s之前</string> <string name="listen_port">监听端口</string> <string name="log_export_error">无法导出日志：%s</string> <string name="log_export_subject">WireGuard 日志文件</string> @@ -123,15 +138,15 @@ <string name="log_viewer_pref_title">查看应用日志</string> <string name="log_viewer_title">日志</string> <string name="logcat_error">无法运行 logcat： </string> - <string name="module_disabler_disabled_summary">内核空间的模块性能较强，但可能不稳定</string> - <string name="module_disabler_disabled_title">启用内核模块</string> - <string name="module_disabler_enabled_summary">用户空间的模块性能较弱，但稳定性更好</string> - <string name="module_disabler_enabled_title">停用内核模块</string> + <string name="module_enabler_disabled_summary">内核模块（实验性）能够增强性能，启用时需谨慎</string> + <string name="module_enabler_disabled_title">启用内核模块</string> + <string name="module_enabler_enabled_summary">用户空间的模块性能较弱，但稳定性更好</string> + <string name="module_enabler_enabled_title">停用内核模块</string> <string name="module_installer_error">发生错误，请重试</string> <string name="module_installer_initial">使用内核模块可以提升性能（实验性）</string> <string name="module_installer_not_found">没有可用于此设备的模块</string> <string name="module_installer_title">下载并安装内核模块</string> - <string name="module_installer_working">正在下载安装...</string> + <string name="module_installer_working">正在下载安装…</string> <string name="module_version_error">无法确定内核模块版本</string> <string name="mtu">MTU</string> <string name="multiple_tunnels_summary_off">当前一次只能开启一条隧道</string> @@ -147,7 +162,7 @@ <string name="parse_error_inet_network">\u0020IP 网络</string> <string name="parse_error_integer">数字</string> <string name="parse_error_reason">无法解析%1$s “%2$s”\u0020</string> - <string name="peer">节点 / Peer</string> + <string name="peer">远程（Peer）</string> <string name="permission_description">自由控制 WireGuard 隧道的开启或关闭，但可能会导致流量误传</string> <string name="permission_label">控制 WireGuard 隧道</string> <string name="persistent_keepalive">连接保活间隔</string> @@ -156,6 +171,10 @@ <string name="private_key">私钥</string> <string name="public_key">公钥</string> <string name="qr_code_hint">提示：使用命令 `qrencode -t ansiutf8 < tunnel.conf` 生成二维码</string> + <string name="quick_settings_tile_add_title">添加磁贴到快速设置面板</string> + <string name="quick_settings_tile_add_summary">通过快捷磁贴开启/关闭上次使用的隧道</string> + <string name="quick_settings_tile_add_failure">无法添加快捷磁贴：错误 %d</string> + <string name="quick_settings_tile_action">开启/关闭隧道</string> <string name="restore_on_boot_summary_off">未启用</string> <string name="restore_on_boot_summary_on">设备启动时自动开启上次使用的隧道</string> <string name="restore_on_boot_title">启动时恢复</string> @@ -165,8 +184,8 @@ <string name="shell_exit_status_read_error">Shell 无法读取退出状态</string> <string name="shell_marker_count_error">Shell 应获取 4 个标记，获取到 %d 个</string> <string name="shell_start_error">Shell 启动失败：%d</string> - <string name="success_application_will_restart">成功，应用即将重启...</string> - <string name="toggle_all">反选</string> + <string name="success_application_will_restart">成功，应用即将重启…</string> + <string name="toggle_all">全选</string> <string name="toggle_error">切换隧道状态时出错：%s</string> <string name="tools_installer_already">wg 与 wg-quick 已安装</string> <string name="tools_installer_failure">无法安装命令行工具（尚未获取 root 权限？）</string> @@ -176,7 +195,7 @@ <string name="tools_installer_success_magisk">wg 与 wg-quick 已安装为 Magisk 模块（重启后生效）</string> <string name="tools_installer_success_system">wg 与 wg-quick 已安装至系统分区</string> <string name="tools_installer_title">安装命令行工具</string> - <string name="tools_installer_working">正在安装 wg 与 wg-quick...</string> + <string name="tools_installer_working">正在安装 wg 与 wg-quick…</string> <string name="tools_unavailable_error">所需工具不可用</string> <string name="transfer">流量</string> <string name="transfer_bytes">%d B</string> @@ -194,12 +213,23 @@ <string name="tunnel_list_placeholder">点击下方按钮添加隧道</string> <string name="tunnel_name">隧道名称</string> <string name="tunnel_on_error">无法开启隧道（wgTurnOn returned %d）</string> + <string name="tunnel_dns_failure">无法解析 DNS 主机名：“%s”</string> <string name="tunnel_rename_error">无法重命名隧道：%s</string> <string name="tunnel_rename_success">隧道已重命名为 “%s”</string> <string name="type_name_go_userspace">Go userspace</string> <string name="type_name_kernel_module">Kernel module</string> <string name="unknown_error">未知错误</string> - <string name="version_summary">%1$s backend v%2$s</string> + <string name="updater_avalable">WireGuard 可以更新了，请立即更新。</string> + <string name="updater_action">下载 & 更新</string> + <string name="updater_rechecking">正在获取更新元数据…</string> + <string name="updater_download_progress">正在下载更新：%1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">正在下载更新：%s</string> + <string name="updater_installing">正在安装更新…</string> + <string name="updater_failure">更新失败：%s。将在稍后重试…</string> + <string name="updater_corrupt_title">应用损坏</string> + <string name="updater_corrupt_message">此应用已损坏。请从下方链接的网站中重新下载 APK，然后卸载此应用并重新安装。</string> + <string name="updater_corrupt_navigate">打开网站</string> + <string name="version_summary">%1$s backend %2$s</string> <string name="version_summary_checking">正在检查 %s backend 版本</string> <string name="version_summary_unknown">未知的 %s 版本</string> <string name="version_title">WireGuard for Android v%s</string> @@ -209,8 +239,8 @@ <string name="zip_export_success">已保存至 “%s”</string> <string name="zip_export_summary">zip 压缩包将保存至下载文件夹</string> <string name="zip_export_title">导出隧道配置</string> - <string name="biometric_prompt_zip_exporter_title">导出配置需要认证指纹</string> - <string name="biometric_prompt_private_key_title">查看私钥需要认证指纹</string> + <string name="biometric_prompt_zip_exporter_title">导出配置前需要通过认证</string> + <string name="biometric_prompt_private_key_title">查看私钥前需要通过认证</string> <string name="biometric_auth_error">认证失败</string> <string name="biometric_auth_error_reason">认证失败：%s</string> </resources> diff --git a/ui/src/main/res/values-zh-rTW/strings.xml b/ui/src/main/res/values-zh-rTW/strings.xml new file mode 100644 index 00000000..14e83a20 --- /dev/null +++ b/ui/src/main/res/values-zh-rTW/strings.xml @@ -0,0 +1,225 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <plurals name="delete_error"> + <item quantity="other">無法刪除 %d 個通道: %s</item> + </plurals> + <plurals name="delete_success"> + <item quantity="other">成功刪除 %d 個通道</item> + </plurals> + <plurals name="delete_title"> + <item quantity="other">已選擇 %d 個通道</item> + </plurals> + <plurals name="import_partial_success"> + <item quantity="other">已匯入 %1$d 個通道 (共 %2$d 個)</item> + </plurals> + <plurals name="import_total_success"> + <item quantity="other">已匯入 %d 個通道</item> + </plurals> + <plurals name="set_excluded_applications"> + <item quantity="other">已排除 %d 個應用程式</item> + </plurals> + <plurals name="set_included_applications"> + <item quantity="other">套用到 %d 個應用程式</item> + </plurals> + <plurals name="n_excluded_applications"> + <item quantity="other">已排除 %d</item> + </plurals> + <plurals name="n_included_applications"> + <item quantity="other">已套用 %d</item> + </plurals> + <string name="all_applications">套用到所有應用程式</string> + <string name="exclude_from_tunnel">排除</string> + <string name="include_in_tunnel">只套用到</string> + <plurals name="include_n_applications"> + <item quantity="other">已套用 %d 個應用程式</item> + </plurals> + <plurals name="exclude_n_applications"> + <item quantity="other">已排除 %d 個應用程式</item> + </plurals> + <plurals name="persistent_keepalive_seconds_unit"> + <item quantity="other">每隔 %d 秒</item> + </plurals> + <plurals name="persistent_keepalive_seconds_suffix"> + <item quantity="other">秒</item> + </plurals> + <string name="use_all_applications">套用到所有應用程式</string> + <string name="add_peer">新增端點</string> + <string name="addresses">位址</string> + <string name="applications">應用程式</string> + <string name="allow_remote_control_intents_summary_off">外部程式無法控制通道 (推薦)</string> + <string name="allow_remote_control_intents_summary_on">外部程式可以控制通道 (進階)</string> + <string name="allow_remote_control_intents_title">允許遠端控制應用程式</string> + <string name="allowed_ips">允許的 IPs</string> + <string name="bad_config_context">錯誤設定: %1$s 的 %2$s</string> + <string name="bad_config_context_top_level">頂層錯誤設定: %s</string> + <string name="bad_config_error">設定有誤: %1$s 在 %2$s</string> + <string name="bad_config_explanation_pka">: 必須是不大於 65535 的正整數</string> + <string name="bad_config_explanation_positive_number">: 必須是正整數</string> + <string name="bad_config_explanation_udp_port">: 必須是一個有效的 UDP 埠號</string> + <string name="bad_config_reason_invalid_key">無效的密鑰</string> + <string name="bad_config_reason_invalid_number">無效的號碼</string> + <string name="bad_config_reason_invalid_value">無效值</string> + <string name="bad_config_reason_missing_attribute">缺少屬性</string> + <string name="bad_config_reason_missing_section">缺少章節</string> + <string name="bad_config_reason_syntax_error">語法錯誤</string> + <string name="bad_config_reason_unknown_attribute">未知屬性</string> + <string name="bad_config_reason_unknown_section">未知章節</string> + <string name="bad_config_reason_value_out_of_range">內容值超出範圍</string> + <string name="bad_extension_error">必須是 .conf 或 .zip 的檔案</string> + <string name="error_no_qr_found">圖片中找不到二維碼</string> + <string name="error_qr_checksum">二維碼校驗和驗證失敗</string> + <string name="cancel">取消</string> + <string name="config_delete_error">無法刪除設定檔 %s</string> + <string name="config_exists_error">設定「%s」已經存在</string> + <string name="config_file_exists_error">設定檔「%s」已經存在</string> + <string name="config_not_found_error">找不到設定檔 「%s」</string> + <string name="config_rename_error">無法重新命名設定檔「%s」</string> + <string name="config_save_error">無法儲存設定「%1$s」: %2$s</string> + <string name="config_save_success">成功儲存設定「%s」</string> + <string name="create_activity_title">新建 WireGuard 通道</string> + <string name="create_bin_dir_error">無法建立本地二進位目錄</string> + <string name="create_downloads_file_error">無法在下載目錄建立檔案</string> + <string name="create_empty">從空白開始建立</string> + <string name="create_from_file">從檔案或壓縮檔匯入</string> + <string name="create_from_qr_code">掃描 QR code</string> + <string name="create_output_dir_error">無法建立輸出目錄</string> + <string name="create_temp_dir_error">無法建立本地暫存目錄</string> + <string name="create_tunnel">新建通道</string> + <string name="copied_to_clipboard">%s 已複製到剪貼簿</string> + <string name="dark_theme_summary_off">目前使用明亮(白晝)主題</string> + <string name="dark_theme_summary_on">目前使用暗黑(夜晚)主題</string> + <string name="dark_theme_title">使用暗黑主題</string> + <string name="delete">刪除</string> + <string name="tv_delete">選擇要刪除的通道</string> + <string name="tv_select_a_storage_drive">選擇一個儲存裝置</string> + <string name="tv_no_file_picker">請安裝一個檔案管理程式以便瀏覽檔案</string> + <string name="tv_add_tunnel_get_started">新增第一個通道</string> + <string name="disable_config_export_title">禁止匯出設定檔</string> + <string name="disable_config_export_description">禁止匯出設定檔可以降低私鑰被存取的機會</string> + <string name="dns_servers">DNS 伺服器</string> + <string name="dns_search_domains">搜尋網域</string> + <string name="edit">編輯</string> + <string name="endpoint">終端點</string> + <string name="error_down">徹下通道錯誤: %s</string> + <string name="error_fetching_apps">汲取應用程式清單錯誤: %s</string> + <string name="error_root">請取得 root 存取權後再試一次</string> + <string name="error_up">啟動通道錯誤: %s</string> + <string name="exclude_private_ips">排除私有 IPs</string> + <string name="generate_new_private_key">產生新的私鑰</string> + <string name="generic_error">未知錯誤「%s」</string> + <string name="hint_automatic">(自動)</string> + <string name="hint_generated">(產生的)</string> + <string name="hint_optional">(可選的)</string> + <string name="hint_optional_discouraged">(選填，不建議)</string> + <string name="hint_random">(隨機)</string> + <string name="illegal_filename_error">不合規定的檔名「%s」</string> + <string name="import_error">無法匯入通道: %s</string> + <string name="import_from_qr_code">從 QR Code 匯入通道</string> + <string name="import_success">已匯入「%s」</string> + <string name="interface_title">界面</string> + <string name="key_contents_error">密鑰包含錯誤的字元</string> + <string name="key_length_error">密鑰長度不正確</string> + <string name="key_length_explanation_base64">: WireGuard 的 base64 密鑰必須是 44 個字元 (32 個位元組)</string> + <string name="key_length_explanation_binary">: WireGuard 密鑰必須是 32 個位元組</string> + <string name="key_length_explanation_hex">: WireGuard 的16進位密鑰必須是 64 個字元 (32 個位元組)</string> + <string name="listen_port">監聽連接埠</string> + <string name="log_export_error">無法匯出日誌: %s</string> + <string name="log_export_subject">WireGuard Android 日誌檔</string> + <string name="log_export_success">儲存到「%s」</string> + <string name="log_export_title">匯出日誌檔</string> + <string name="log_saver_activity_label">儲存日誌</string> + <string name="log_viewer_pref_summary">程式的日誌對除錯有幫助</string> + <string name="log_viewer_pref_title">檢視應用程式日誌</string> + <string name="log_viewer_title">日誌</string> + <string name="logcat_error">無法執行 logcat: </string> + <string name="module_enabler_disabled_summary">使用實驗階段的核心模組以提升效能</string> + <string name="module_enabler_disabled_title">啟用後端核心模組</string> + <string name="module_enabler_enabled_summary">較慢的用戶空間後端可以提升穩定性</string> + <string name="module_enabler_enabled_title">停用後端核心模組</string> + <string name="module_installer_error">未知錯誤，請重試﹗</string> + <string name="module_installer_initial">使用實驗階段的核心模組以提升效能</string> + <string name="module_installer_not_found">此裝置沒有可用的模組</string> + <string name="module_installer_title">下載並安裝核心模組</string> + <string name="module_installer_working">下載並安裝中...</string> + <string name="module_version_error">無法確認核心模組版本</string> + <string name="mtu">最大傳輸單元</string> + <string name="multiple_tunnels_summary_off">開啟通道將自動停用其它的通道</string> + <string name="multiple_tunnels_summary_on">多個通道可能同時被開啟</string> + <string name="multiple_tunnels_title">允許同時使用多個通道</string> + <string name="name">名稱</string> + <string name="no_config_error">嘗試在沒有設定檔的情況下啟動通道</string> + <string name="no_configs_error">找不到設定檔</string> + <string name="no_tunnels_error">沒有任何通道</string> + <string name="parse_error_generic">字串</string> + <string name="parse_error_inet_address">IP 位址</string> + <string name="parse_error_inet_endpoint">連接點</string> + <string name="parse_error_inet_network">IP 網路</string> + <string name="parse_error_integer">號碼</string> + <string name="parse_error_reason">無法解析 %1$s “%2$s”</string> + <string name="peer">用戶</string> + <string name="permission_description">允許控制 WireGuard 隧道，這將隨意啟用和禁用隧道，可能會誤導 Internet 流量</string> + <string name="permission_label">控制 WireGuard 通道</string> + <string name="persistent_keepalive">保持連線</string> + <string name="pre_shared_key">預分享金鑰</string> + <string name="pre_shared_key_enabled">已啟用</string> + <string name="private_key">私鑰</string> + <string name="public_key">公鑰</string> + <string name="qr_code_hint">提示: 使用 `qrencode -t ansiutf8 < tunnel.conf` 來產生</string> + <string name="restore_on_boot_summary_off">開機時不會啟動已啟用的通道</string> + <string name="restore_on_boot_summary_on">開機時啟動已啟用的通道</string> + <string name="restore_on_boot_title">開機時復原</string> + <string name="save">儲存</string> + <string name="select_all">全選</string> + <string name="settings">設定</string> + <string name="shell_exit_status_read_error">Shell 無法讀取停止狀態</string> + <string name="shell_marker_count_error">殼牌預計有 4 個標記，但收到了 %d</string> + <string name="shell_start_error">Shell 啟動失敗: %d</string> + <string name="success_application_will_restart">成功。 應用程式即將重新啟動…</string> + <string name="toggle_all">切換全部</string> + <string name="toggle_error">切換 WireGuard 通道時發生錯誤：%s</string> + <string name="tools_installer_already">wg 及 wg-quick 已安裝</string> + <string name="tools_installer_failure">無法安裝命令行工具 (沒有 root 存取權？)</string> + <string name="tools_installer_initial">安裝額外的腳本工具</string> + <string name="tools_installer_initial_magisk">安裝額外的腳本工具作為 Magisk 模組</string> + <string name="tools_installer_initial_system">安裝額外的腳本工具到系統分區</string> + <string name="tools_installer_success_magisk">將 wg 及 wg-quick 安裝為 Magisk 模組 (需要重新開機)</string> + <string name="tools_installer_success_system">將 wg 及 wg-quick 安裝到系統分區</string> + <string name="tools_installer_title">安裝命令行工具</string> + <string name="tools_installer_working">正在安裝 wg 及 wg-quick</string> + <string name="tools_unavailable_error">所需的工具不可用</string> + <string name="transfer">傳輸</string> + <string name="transfer_bytes">%d B</string> + <string name="transfer_gibibytes">%.2f GiB</string> + <string name="transfer_kibibytes">%.2f KiB</string> + <string name="transfer_mibibytes">%.2f MiB</string> + <string name="transfer_rx_tx">已接收：%1$s, 已傳送：%2$s</string> + <string name="transfer_tibibytes">%.2f TiB</string> + <string name="tun_create_error">無法建立通道裝置</string> + <string name="tunnel_config_error">無法設定通道 (wg-quick 回傳值：%d)</string> + <string name="tunnel_create_error">無法建立通道: %s</string> + <string name="tunnel_create_success">成功建立通道 \"%s\"</string> + <string name="tunnel_error_already_exists">通道 \"%s\" 已經存在</string> + <string name="tunnel_error_invalid_name">無效的名稱</string> + <string name="tunnel_name">通道名稱</string> + <string name="tunnel_on_error">無法開啟通道 (wgTurnOn 回傳值: %d)</string> + <string name="tunnel_dns_failure">無法解析 DNS 主機名稱: \"%s\"</string> + <string name="tunnel_rename_error">無法重新命名通道: %s</string> + <string name="tunnel_rename_success">成功重新命名通道 \"%s\"</string> + <string name="type_name_go_userspace">去用戶空間</string> + <string name="type_name_kernel_module">核心模組</string> + <string name="unknown_error">未知的錯誤</string> + <string name="version_summary">%1$s 後端 %2$s</string> + <string name="version_summary_checking">檢查 %s 後端版本</string> + <string name="version_summary_unknown">未知的版本 %s</string> + <string name="version_title">WireGuard 於 Android 版本 %s</string> + <string name="vpn_not_authorized_error">使用者未授權 VPN 服務</string> + <string name="vpn_start_error">無法開啟 Android VPN 服務</string> + <string name="zip_export_error">無法匯入通道: %s</string> + <string name="zip_export_success">儲存到「%s」</string> + <string name="zip_export_summary">Zip 檔將被儲存到「下載」資料夾內</string> + <string name="zip_export_title">匯出通道設定至 zip 檔</string> + <string name="biometric_prompt_zip_exporter_title">驗證匯出的通道</string> + <string name="biometric_prompt_private_key_title">驗證私鑰</string> + <string name="biometric_auth_error">驗證失敗</string> + <string name="biometric_auth_error_reason">驗證失敗: %s</string> +</resources> diff --git a/ui/src/main/res/values/attrs.xml b/ui/src/main/res/values/attrs.xml index b5b614e9..b91ac60e 100644 --- a/ui/src/main/res/values/attrs.xml +++ b/ui/src/main/res/values/attrs.xml @@ -2,10 +2,9 @@ <resources> <declare-styleable name="Multiselected"> <attr name="state_multiselected" format="boolean" /> - <attr name="colorMultiselectActiveBackground" format="reference|color" /> </declare-styleable> - - <declare-styleable name="custom_color"> - <attr name="colorBackground" format="reference|color" /> + <declare-styleable name="TvCardView"> + <attr name="state_isUp" format="boolean" /> + <attr name="state_isDeleting" format="boolean" /> </declare-styleable> </resources> diff --git a/ui/src/main/res/values/colors.xml b/ui/src/main/res/values/colors.xml index 989c6fc1..65e82389 100644 --- a/ui/src/main/res/values/colors.xml +++ b/ui/src/main/res/values/colors.xml @@ -1,28 +1,63 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources xmlns:tools="http://schemas.android.com/tools"> - <!-- Base palette --> - <color name="primary_color">#ffffffff</color> - <color name="primary_light_color">#ffffffff</color> - <color name="primary_dark_color">#ffcccccc</color> - <color name="secondary_color">#ff1a73e8</color> - <color name="secondary_light_color">#ff1a73e8</color> - <color name="secondary_dark_color">#ff1a73e8</color> - <color name="primary_text_color">#ff000000</color> - <color name="secondary_text_color">#ffffffff</color> - - <!-- Theme variables --> - <color name="color_control_normal">@color/primary_text_color</color> - <color name="status_bar_color">@color/primary_color</color> - <color name="navigation_bar_color">#aaffffff</color> - <color name="list_multiselect_background">#ffeeeeee</color> - <color name="mtrl_textinput_default_box_stroke_color" tools:override="true"> - @color/secondary_color - </color> - <color name="white">#ffffffff</color> - - <!-- Log viewer tag colors --> - <color name="debug_tag_color">#444444</color> - <color name="error_tag_color">#aa0000</color> - <color name="info_tag_color">#00aa00</color> - <color name="warning_tag_color">#aaaa00</color> +<resources> + <color name="seed">#1a73e8</color> + <color name="md_theme_light_primary">#005BC0</color> + <color name="md_theme_light_onPrimary">#FFFFFF</color> + <color name="md_theme_light_primaryContainer">#D8E2FF</color> + <color name="md_theme_light_onPrimaryContainer">#001A41</color> + <color name="md_theme_light_secondary">#565E71</color> + <color name="md_theme_light_onSecondary">#FFFFFF</color> + <color name="md_theme_light_secondaryContainer">#DBE2F9</color> + <color name="md_theme_light_onSecondaryContainer">#131B2C</color> + <color name="md_theme_light_tertiary">#715574</color> + <color name="md_theme_light_onTertiary">#FFFFFF</color> + <color name="md_theme_light_tertiaryContainer">#FBD7FC</color> + <color name="md_theme_light_onTertiaryContainer">#29132D</color> + <color name="md_theme_light_error">#BA1A1A</color> + <color name="md_theme_light_errorContainer">#FFDAD6</color> + <color name="md_theme_light_onError">#FFFFFF</color> + <color name="md_theme_light_onErrorContainer">#410002</color> + <color name="md_theme_light_background">#FEFBFF</color> + <color name="md_theme_light_onBackground">#1B1B1F</color> + <color name="md_theme_light_surface">#FEFBFF</color> + <color name="md_theme_light_onSurface">#1B1B1F</color> + <color name="md_theme_light_surfaceVariant">#E1E2EC</color> + <color name="md_theme_light_onSurfaceVariant">#44474F</color> + <color name="md_theme_light_outline">#74777F</color> + <color name="md_theme_light_inverseOnSurface">#F2F0F4</color> + <color name="md_theme_light_inverseSurface">#303033</color> + <color name="md_theme_light_inversePrimary">#ADC7FF</color> + <color name="md_theme_light_shadow">#000000</color> + <color name="md_theme_light_surfaceTint">#005BC0</color> + <color name="md_theme_light_outlineVariant">#C4C6D0</color> + <color name="md_theme_light_scrim">#000000</color> + <color name="md_theme_dark_primary">#ADC7FF</color> + <color name="md_theme_dark_onPrimary">#002E68</color> + <color name="md_theme_dark_primaryContainer">#004493</color> + <color name="md_theme_dark_onPrimaryContainer">#D8E2FF</color> + <color name="md_theme_dark_secondary">#BFC6DC</color> + <color name="md_theme_dark_onSecondary">#283041</color> + <color name="md_theme_dark_secondaryContainer">#3F4759</color> + <color name="md_theme_dark_onSecondaryContainer">#DBE2F9</color> + <color name="md_theme_dark_tertiary">#DEBCDF</color> + <color name="md_theme_dark_onTertiary">#402843</color> + <color name="md_theme_dark_tertiaryContainer">#583E5B</color> + <color name="md_theme_dark_onTertiaryContainer">#FBD7FC</color> + <color name="md_theme_dark_error">#FFB4AB</color> + <color name="md_theme_dark_errorContainer">#93000A</color> + <color name="md_theme_dark_onError">#690005</color> + <color name="md_theme_dark_onErrorContainer">#FFDAD6</color> + <color name="md_theme_dark_background">#1B1B1F</color> + <color name="md_theme_dark_onBackground">#E3E2E6</color> + <color name="md_theme_dark_surface">#1B1B1F</color> + <color name="md_theme_dark_onSurface">#E3E2E6</color> + <color name="md_theme_dark_surfaceVariant">#44474F</color> + <color name="md_theme_dark_onSurfaceVariant">#C4C6D0</color> + <color name="md_theme_dark_outline">#8E9099</color> + <color name="md_theme_dark_inverseOnSurface">#1B1B1F</color> + <color name="md_theme_dark_inverseSurface">#E3E2E6</color> + <color name="md_theme_dark_inversePrimary">#005BC0</color> + <color name="md_theme_dark_shadow">#000000</color> + <color name="md_theme_dark_surfaceTint">#ADC7FF</color> + <color name="md_theme_dark_outlineVariant">#44474F</color> + <color name="md_theme_dark_scrim">#000000</color> </resources> diff --git a/ui/src/main/res/values/dimens.xml b/ui/src/main/res/values/dimens.xml index c6abf8eb..8ea07dfb 100644 --- a/ui/src/main/res/values/dimens.xml +++ b/ui/src/main/res/values/dimens.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <dimen name="fab_margin">16dp</dimen> - <dimen name="extra_margin">12dp</dimen> <dimen name="bottom_sheet_item_height">56dp</dimen> <dimen name="normal_margin">8dp</dimen> <dimen name="bottom_sheet_top_padding">8dp</dimen> <dimen name="bottom_sheet_icon_padding">16dp</dimen> + <dimen name="tunnel_list_placeholder_margin">16dp</dimen> </resources> diff --git a/ui/src/main/res/values/logviewer_colors.xml b/ui/src/main/res/values/logviewer_colors.xml new file mode 100644 index 00000000..0d4b1a0d --- /dev/null +++ b/ui/src/main/res/values/logviewer_colors.xml @@ -0,0 +1,6 @@ +<resources> + <color name="debug_tag_color">#444444</color> + <color name="error_tag_color">#aa0000</color> + <color name="info_tag_color">#00aa00</color> + <color name="warning_tag_color">#aaaa00</color> +</resources> diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index f3c4eb4e..df3d3340 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -63,7 +63,7 @@ <string name="allow_remote_control_intents_summary_on">External apps may toggle tunnels (advanced)</string> <string name="allow_remote_control_intents_title">Allow remote control apps</string> <string name="allowed_ips">Allowed IPs</string> - <string name="app_name">WireGuard</string> + <string name="app_name" translatable="false">WireGuard</string> <string name="bad_config_context">%1$s\'s %2$s</string> <string name="bad_config_context_top_level">%s</string> <string name="bad_config_error">%1$s in %2$s</string> @@ -80,6 +80,8 @@ <string name="bad_config_reason_unknown_section">Unknown section</string> <string name="bad_config_reason_value_out_of_range">Value out of range</string> <string name="bad_extension_error">File must be .conf or .zip</string> + <string name="error_no_qr_found">QR code not found in image</string> + <string name="error_qr_checksum">QR code checksum verification failed</string> <string name="cancel">Cancel</string> <string name="config_delete_error">Cannot delete configuration file %s</string> <string name="config_exists_error">Configuration for “%s” already exists</string> @@ -97,16 +99,28 @@ <string name="create_output_dir_error">Cannot create output directory</string> <string name="create_temp_dir_error">Cannot create local temporary directory</string> <string name="create_tunnel">Create Tunnel</string> + <string name="copied_to_clipboard">%s copied to clipboard</string> <string name="dark_theme_summary_off">Currently using light (day) theme</string> <string name="dark_theme_summary_on">Currently using dark (night) theme</string> <string name="dark_theme_title">Use dark theme</string> <string name="delete">Delete</string> + <string name="tv_delete">Select tunnel to delete</string> + <string name="tv_select_a_storage_drive">Select a storage drive</string> + <string name="tv_no_file_picker">Please install a file management utility to browse files</string> + <string name="tv_add_tunnel_get_started">Add a tunnel to get started</string> + <string name="donate_title">♥ Donate to the WireGuard Project</string> + <string name="donate_summary">Every contribution helps</string> + <string name="donate_google_play_disappointment">Thank you for supporting the WireGuard Project!\n\nUnfortunately, due to Google\'s policies, we\'re not allowed to link to the part of the project webpage where you can make a donation. Hopefully you can figure this out!\n\nThanks again for your contribution.</string> + <string name="disable_config_export_title">Disable config exporting</string> + <string name="disable_config_export_description">Disabling config exporting makes private keys less accessible</string> <string name="dns_servers">DNS servers</string> + <string name="dns_search_domains">Search domains</string> <string name="edit">Edit</string> <string name="endpoint">Endpoint</string> <string name="error_down">Error bringing down tunnel: %s</string> <string name="error_fetching_apps">Error fetching apps list: %s</string> <string name="error_root">Please obtain root access and try again</string> + <string name="error_prepare">Error preparing tunnel: %s</string> <string name="error_up">Error bringing up tunnel: %s</string> <string name="exclude_private_ips">Exclude private IPs</string> <string name="generate_new_private_key">Generate new private key</string> @@ -126,6 +140,8 @@ <string name="key_length_explanation_base64">: WireGuard base64 keys must be 44 characters (32 bytes)</string> <string name="key_length_explanation_binary">: WireGuard keys must be 32 bytes</string> <string name="key_length_explanation_hex">: WireGuard hex keys must be 64 characters (32 bytes)</string> + <string name="latest_handshake">Latest handshake</string> + <string name="latest_handshake_ago">%s ago</string> <string name="listen_port">Listen port</string> <string name="log_export_error">Unable to export log: %s</string> <string name="log_export_subject">WireGuard Android Log File</string> @@ -136,10 +152,10 @@ <string name="log_viewer_pref_title">View application log</string> <string name="log_viewer_title">Log</string> <string name="logcat_error">Unable to run logcat: </string> - <string name="module_disabler_disabled_summary">The experimental kernel module can improve performance</string> - <string name="module_disabler_disabled_title">Enable kernel module backend</string> - <string name="module_disabler_enabled_summary">The slower userspace backend may improve stability</string> - <string name="module_disabler_enabled_title">Disable kernel module backend</string> + <string name="module_enabler_disabled_summary">The experimental kernel module can improve performance</string> + <string name="module_enabler_disabled_title">Enable kernel module backend</string> + <string name="module_enabler_enabled_summary">The slower userspace backend may improve stability</string> + <string name="module_enabler_enabled_title">Disable kernel module backend</string> <string name="module_installer_error">Something went wrong. Please try again</string> <string name="module_installer_initial">The experimental kernel module can improve performance</string> <string name="module_installer_not_found">No modules are available for your device</string> @@ -169,6 +185,10 @@ <string name="private_key">Private key</string> <string name="public_key">Public key</string> <string name="qr_code_hint">Tip: generate with `qrencode -t ansiutf8 < tunnel.conf`.</string> + <string name="quick_settings_tile_add_title">Add tile to quick settings panel</string> + <string name="quick_settings_tile_add_summary">The shortcut tile toggles the most recent tunnel</string> + <string name="quick_settings_tile_add_failure">Unable to add shortcut tile: error %d</string> + <string name="quick_settings_tile_action">Toggle tunnel</string> <string name="restore_on_boot_summary_off">Will not bring up enabled tunnels at boot</string> <string name="restore_on_boot_summary_on">Will bring up enabled tunnels at boot</string> <string name="restore_on_boot_title">Restore on boot</string> @@ -204,15 +224,26 @@ <string name="tunnel_create_success">Successfully created tunnel “%s”</string> <string name="tunnel_error_already_exists">Tunnel “%s” already exists</string> <string name="tunnel_error_invalid_name">Invalid name</string> - <string name="tunnel_list_placeholder">Add a tunnel using the blue button</string> + <string name="tunnel_list_placeholder">Add a tunnel using the button below</string> <string name="tunnel_name">Tunnel Name</string> <string name="tunnel_on_error">Unable to turn tunnel on (wgTurnOn returned %d)</string> + <string name="tunnel_dns_failure">Unable to resolve DNS hostname: “%s”</string> <string name="tunnel_rename_error">Unable to rename tunnel: %s</string> <string name="tunnel_rename_success">Successfully renamed tunnel to “%s”</string> <string name="type_name_go_userspace">Go userspace</string> <string name="type_name_kernel_module">Kernel module</string> <string name="unknown_error">Unknown error</string> - <string name="version_summary">%1$s backend v%2$s</string> + <string name="updater_avalable">An application update is available. Please update now.</string> + <string name="updater_action">Download & Update</string> + <string name="updater_rechecking">Fetching update metadata…</string> + <string name="updater_download_progress">Downloading update: %1$s / %2$s (%3$.2f%%)</string> + <string name="updater_download_progress_nototal">Downloading update: %s</string> + <string name="updater_installing">Installing update…</string> + <string name="updater_failure">Update failure: %s. Will retry momentarily…</string> + <string name="updater_corrupt_title">Application Corrupt</string> + <string name="updater_corrupt_message">This application is corrupt. Please re-download the APK from the website linked below. After, uninstall this application, and reinstall it from the downloaded APK.</string> + <string name="updater_corrupt_navigate">Open Website</string> + <string name="version_summary">%1$s backend %2$s</string> <string name="version_summary_checking">Checking %s backend version</string> <string name="version_summary_unknown">Unknown %s version</string> <string name="version_title">WireGuard for Android v%s</string> diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml index 067c10b3..39c38247 100644 --- a/ui/src/main/res/values/styles.xml +++ b/ui/src/main/res/values/styles.xml @@ -1,52 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="AppTheme" parent="Theme.MaterialComponents.DayNight"> - <item name="colorPrimary">@color/primary_color</item> - <item name="colorOnPrimary">@color/color_control_normal</item> - <item name="colorPrimaryDark">@color/primary_color</item> - <item name="colorPrimaryVariant">@color/primary_light_color</item> - <item name="colorSecondary">@color/secondary_color</item> - <item name="colorOnSecondary">@color/secondary_text_color</item> - <item name="colorSurface">@color/primary_color</item> - <item name="colorOnSurface">@color/color_control_normal</item> - <item name="colorBackground">@color/primary_color</item> - <item name="colorMultiselectActiveBackground">@color/list_multiselect_background</item> - <item name="colorControlNormal">@color/color_control_normal</item> - <item name="elevationOverlayColor">@color/primary_light_color</item> - <item name="elevationOverlayEnabled">true</item> - <item name="android:statusBarColor">@color/status_bar_color</item> - <item name="android:windowBackground">@color/primary_color</item> - <item name="alertDialogTheme">@style/AppTheme.Dialog</item> - <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item> - <item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item> - <item name="textInputStyle">@style/TextInputLayoutBase</item> - <item name="materialCardViewStyle">@style/AppTheme.MaterialCardView</item> + <style name="WireGuardTheme.Toolbar" parent="Widget.Material3.Toolbar"> + <item name="android:background">?attr/colorSurface</item> </style> - <style name="AppTheme.MaterialCardView" parent="Widget.MaterialComponents.CardView"> - <item name="cornerRadius">4dp</item> - <item name="cardElevation">4dp</item> - <item name="contentPadding">8dp</item> - <item name="cardBackgroundColor">?attr/elevationOverlayColor</item> + <style name="AppThemeBase" parent="WireGuardTheme"> + <item name="materialCardViewStyle">@style/WireGuardTheme.MaterialCardView</item> + <item name="toolbarStyle">@style/WireGuardTheme.Toolbar</item> + <item name="bottomSheetDialogTheme">@style/WireGuardTheme.BottomSheetDialog</item> + <item name="android:statusBarColor">@null</item> </style> - <style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert"> - <item name="colorPrimary">@color/secondary_color</item> - <item name="colorSecondary">@color/secondary_color</item> - <item name="android:windowBackground">?attr/colorBackground</item> + <!-- Various additional API-specific features in values-v*/styles.xml --> + <style name="AppTheme" parent="AppThemeBase" /> + + <style name="WireGuardTheme.MaterialCardView" parent="Widget.Material3.CardView.Elevated"> + <item name="cornerRadius">4dp</item> + <item name="contentPadding">8dp</item> </style> - <style name="BottomSheetDialogTheme" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog"> + <style name="WireGuardTheme.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog"> <item name="android:windowIsFloating">false</item> - <item name="android:navigationBarColor">?attr/colorBackground</item> - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:windowTranslucentNavigation">false</item> - <item name="android:windowIsTranslucent">false</item> - <item name="android:backgroundDimEnabled">true</item> - <item name="android:backgroundDimAmount">0.5</item> - <item name="android:windowTranslucentStatus">false</item> - <item name="android:colorBackground">@android:color/transparent</item> + <item name="android:navigationBarColor">@android:color/transparent</item> </style> <style name="NoBackgroundTheme" parent="AppTheme"> @@ -62,19 +38,8 @@ <item name="android:windowExitAnimation">@android:anim/fade_out</item> </style> - <style name="DetailText" parent="TextAppearance.MaterialComponents.Body1" /> - - <style name="SectionText" parent="TextAppearance.MaterialComponents.Subtitle1" /> - - <style name="ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox"> - <item name="colorControlActivated">@color/color_control_normal</item> - </style> - - <style name="TextInputLayoutBase" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"> - <item name="boxStrokeColor">?attr/colorSecondary</item> - <item name="hintTextColor">?attr/colorOnPrimary</item> - <item name="materialThemeOverlay"> - @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox - </item> + <style name="TvTheme" parent="AppTheme"> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> </style> </resources> diff --git a/ui/src/main/res/values/themes.xml b/ui/src/main/res/values/themes.xml new file mode 100644 index 00000000..0153d346 --- /dev/null +++ b/ui/src/main/res/values/themes.xml @@ -0,0 +1,31 @@ +<resources> + + <style name="WireGuardTheme" parent="Theme.Material3.Light"> + <item name="colorPrimary">@color/md_theme_light_primary</item> + <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item> + <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item> + <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item> + <item name="colorSecondary">@color/md_theme_light_secondary</item> + <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item> + <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item> + <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item> + <item name="colorTertiary">@color/md_theme_light_tertiary</item> + <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item> + <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item> + <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item> + <item name="colorError">@color/md_theme_light_error</item> + <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item> + <item name="colorOnError">@color/md_theme_light_onError</item> + <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item> + <item name="android:colorBackground">@color/md_theme_light_background</item> + <item name="colorOnBackground">@color/md_theme_light_onBackground</item> + <item name="colorSurface">@color/md_theme_light_surface</item> + <item name="colorOnSurface">@color/md_theme_light_onSurface</item> + <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item> + <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item> + <item name="colorOutline">@color/md_theme_light_outline</item> + <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item> + <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item> + <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item> + </style> +</resources> diff --git a/ui/src/main/res/xml/app_restrictions.xml b/ui/src/main/res/xml/app_restrictions.xml new file mode 100644 index 00000000..2eaa7bc5 --- /dev/null +++ b/ui/src/main/res/xml/app_restrictions.xml @@ -0,0 +1,13 @@ +<!-- + ~ Copyright © 2017-2023 WireGuard LLC. All Rights Reserved. + ~ SPDX-License-Identifier: Apache-2.0 + --> + +<restrictions xmlns:android="http://schemas.android.com/apk/res/android"> + <restriction + android:defaultValue="false" + android:description="@string/disable_config_export_description" + android:key="disable_config_export" + android:restrictionType="bool" + android:title="@string/disable_config_export_title" /> +</restrictions> diff --git a/ui/src/main/res/xml/preferences.xml b/ui/src/main/res/xml/preferences.xml index d330b875..a8b66df7 100644 --- a/ui/src/main/res/xml/preferences.xml +++ b/ui/src/main/res/xml/preferences.xml @@ -7,33 +7,39 @@ <CheckBoxPreference android:defaultValue="false" android:key="restore_on_boot" + android:singleLineTitle="false" android:summaryOff="@string/restore_on_boot_summary_off" android:summaryOn="@string/restore_on_boot_summary_on" android:title="@string/restore_on_boot_title" /> <com.wireguard.android.preference.ZipExporterPreference android:key="zip_exporter" /> + <com.wireguard.android.preference.QuickTilePreference android:key="quick_tile" /> <Preference android:key="log_viewer" + android:singleLineTitle="false" android:summary="@string/log_viewer_pref_summary" android:title="@string/log_viewer_pref_title" /> <CheckBoxPreference android:defaultValue="false" android:key="dark_theme" + android:singleLineTitle="false" android:summaryOff="@string/dark_theme_summary_off" android:summaryOn="@string/dark_theme_summary_on" android:title="@string/dark_theme_title" /> <CheckBoxPreference android:defaultValue="false" android:key="multiple_tunnels" + android:singleLineTitle="false" android:summaryOff="@string/multiple_tunnels_summary_off" android:summaryOn="@string/multiple_tunnels_summary_on" android:title="@string/multiple_tunnels_title" /> - <com.wireguard.android.preference.ModuleDownloaderPreference android:key="module_downloader" /> <com.wireguard.android.preference.ToolsInstallerPreference android:key="tools_installer" /> - <com.wireguard.android.preference.KernelModuleDisablerPreference android:key="kernel_module_disabler" /> + <com.wireguard.android.preference.KernelModuleEnablerPreference android:key="kernel_module_enabler" /> <CheckBoxPreference android:defaultValue="false" android:key="allow_remote_control_intents" + android:singleLineTitle="false" android:summaryOff="@string/allow_remote_control_intents_summary_off" android:summaryOn="@string/allow_remote_control_intents_summary_on" android:title="@string/allow_remote_control_intents_title" /> + <com.wireguard.android.preference.DonatePreference android:singleLineTitle="false" /> </androidx.preference.PreferenceScreen> diff --git a/version.gradle b/version.gradle deleted file mode 100644 index be7d652f..00000000 --- a/version.gradle +++ /dev/null @@ -1,6 +0,0 @@ -buildscript { - ext { - wireguardVersionCode = 474 - wireguardVersionName = '1.0.20200407' - } -} |
