diff --git a/.gitignore b/.gitignore index cc0e901..60f8ecb 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ local.properties # Do not upload libs to Github -/private-libs \ No newline at end of file +/private-libs diff --git a/build.gradle b/build.gradle index 04c223d..6f2e9d7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.1.2' apply false - id 'com.android.library' version '7.1.2' apply false + id 'com.android.application' version '8.3.1' apply false + id 'com.android.library' version '8.3.1' apply false id 'org.jetbrains.kotlin.android' version '1.6.10' apply false } @@ -13,8 +13,8 @@ configure ([project(':faceunlock'), project(':universalauth-xposed')]) { afterEvaluate { android { defaultConfig { - versionCode 18 - versionName "1.8" + versionCode 1009000 + versionName "1.9.0" } } } diff --git a/faceunlock-backend/build.gradle b/faceunlock-backend/build.gradle index 2eb5ac3..52b1d7b 100644 --- a/faceunlock-backend/build.gradle +++ b/faceunlock-backend/build.gradle @@ -4,11 +4,12 @@ plugins { } android { - compileSdk 32 + namespace "ax.nd.faceunlock.backend" + compileSdk 35 defaultConfig { minSdk 29 - targetSdk 32 + targetSdk 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/faceunlock-framework_stub/build.gradle b/faceunlock-framework_stub/build.gradle index b96c388..283d5c7 100644 --- a/faceunlock-framework_stub/build.gradle +++ b/faceunlock-framework_stub/build.gradle @@ -4,11 +4,12 @@ plugins { } android { - compileSdk 32 + namespace "ax.nd.faceunlock.framework_stub" + compileSdk 35 defaultConfig { minSdk 29 - targetSdk 32 + targetSdk 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/faceunlock/build.gradle b/faceunlock/build.gradle index 81a73c1..1d58a41 100644 --- a/faceunlock/build.gradle +++ b/faceunlock/build.gradle @@ -4,12 +4,13 @@ plugins { } android { - compileSdk 31 + namespace "ax.nd.faceunlock" + compileSdk 35 defaultConfig { applicationId "ax.nd.faceunlock" minSdk 29 - targetSdk 31 + targetSdk 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -29,6 +30,7 @@ android { } buildFeatures { viewBinding true + aidl true } } diff --git a/faceunlock/src/main/java/ax/nd/faceunlock/ChooseLibsViewModel.kt b/faceunlock/src/main/java/ax/nd/faceunlock/ChooseLibsViewModel.kt index 9edbf6c..5e00b7a 100644 --- a/faceunlock/src/main/java/ax/nd/faceunlock/ChooseLibsViewModel.kt +++ b/faceunlock/src/main/java/ax/nd/faceunlock/ChooseLibsViewModel.kt @@ -239,7 +239,7 @@ class ChooseLibsViewModel : ViewModel() { companion object { private val TAG = ChooseLibsViewModel::class.simpleName - private const val IPFS_GATEWAY = "https://cloudflare-ipfs.com" + private const val IPFS_GATEWAY = "https://ipfs.io/ipfs/" private const val LIBS_CID = "QmQNREjjXTQBDpd69gFqEreNi1dV91eSGQByqi5nXU3rBt" } } \ No newline at end of file diff --git a/faceunlock/src/main/java/ax/nd/faceunlock/FaceApplication.java b/faceunlock/src/main/java/ax/nd/faceunlock/FaceApplication.java index 5f1f19b..6e2f5b9 100644 --- a/faceunlock/src/main/java/ax/nd/faceunlock/FaceApplication.java +++ b/faceunlock/src/main/java/ax/nd/faceunlock/FaceApplication.java @@ -59,7 +59,7 @@ public void onCreate() { IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction(Intent.ACTION_USER_PRESENT); intentFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); - registerReceiver(mReceiver, intentFilter, null, null); + registerReceiver(mReceiver, intentFilter, null, null, RECEIVER_EXPORTED); getPackageManager().setComponentEnabledSetting(new ComponentName(this, SetupFaceIntroActivity.class), PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP); diff --git a/faceunlock/src/main/java/ax/nd/faceunlock/service/FaceAuthService.java b/faceunlock/src/main/java/ax/nd/faceunlock/service/FaceAuthService.java index a6a5b38..a4c8ae1 100644 --- a/faceunlock/src/main/java/ax/nd/faceunlock/service/FaceAuthService.java +++ b/faceunlock/src/main/java/ax/nd/faceunlock/service/FaceAuthService.java @@ -276,7 +276,7 @@ public void onCreate() { intentFilter.addAction(Intent.ACTION_SCREEN_OFF); intentFilter.addAction(Intent.ACTION_USER_PRESENT); intentFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); - registerReceiver(mReceiver, intentFilter); + registerReceiver(mReceiver, intentFilter, RECEIVER_EXPORTED); if (Util.DEBUG) { Log.d(TAG, "OnCreate end"); } diff --git a/faceunlock/src/main/java/ax/nd/faceunlock/service/LockscreenFaceAuthService.kt b/faceunlock/src/main/java/ax/nd/faceunlock/service/LockscreenFaceAuthService.kt index 62821c5..a6ed3a2 100644 --- a/faceunlock/src/main/java/ax/nd/faceunlock/service/LockscreenFaceAuthService.kt +++ b/faceunlock/src/main/java/ax/nd/faceunlock/service/LockscreenFaceAuthService.kt @@ -114,7 +114,7 @@ class LockscreenFaceAuthService : AccessibilityService(), FaceAuthServiceCallbac prefs.failedUnlockAttempts.set(0) } } - registerReceiver(unlockReceiver, intentFilter) + registerReceiver(unlockReceiver, intentFilter, RECEIVER_EXPORTED) } private fun unregisterUnlockReceiver() { @@ -148,7 +148,7 @@ class LockscreenFaceAuthService : AccessibilityService(), FaceAuthServiceCallbac doubleCheckLockscreenState() } } - registerReceiver(lockStateReceiver, intentFilter) + registerReceiver(lockStateReceiver, intentFilter, RECEIVER_EXPORTED) } private fun registerEarlyUnlockReceiver() { @@ -165,7 +165,7 @@ class LockscreenFaceAuthService : AccessibilityService(), FaceAuthServiceCallbac } } } - registerReceiver(lockStateReceiver, intentFilter) + registerReceiver(lockStateReceiver, intentFilter, RECEIVER_EXPORTED) } private fun unregisterLockStateReceiver() { @@ -231,10 +231,10 @@ class LockscreenFaceAuthService : AccessibilityService(), FaceAuthServiceCallbac textViewAnimator = textView?.animate() ?.alpha(0f) ?.setListener(object : Animator.AnimatorListener { - override fun onAnimationStart(p0: Animator?) {} - override fun onAnimationEnd(p0: Animator?) = onTextViewAnimationEnd() - override fun onAnimationCancel(p0: Animator?) {} - override fun onAnimationRepeat(p0: Animator?) {} + override fun onAnimationStart(p0: Animator) {} + override fun onAnimationEnd(p0: Animator) = onTextViewAnimationEnd() + override fun onAnimationCancel(p0: Animator) {} + override fun onAnimationRepeat(p0: Animator) {} }) ?.setStartDelay(delay.toLong()) ?.setDuration(300) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..2c35211 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6b93631..09523c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Fri Mar 11 23:32:25 EST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -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. @@ -15,69 +15,104 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## 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/platforms/jvm/plugins-application/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 -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || 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 @@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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 @@ -98,88 +133,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=SC2039,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=SC2039,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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +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/gradlew.bat b/gradlew.bat index 107acd3..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,94 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libuniversalauth-xposed/build.gradle b/libuniversalauth-xposed/build.gradle index a26b7f8..d5dcd0f 100644 --- a/libuniversalauth-xposed/build.gradle +++ b/libuniversalauth-xposed/build.gradle @@ -4,11 +4,12 @@ plugins { } android { - compileSdk 32 + namespace "ax.nd.universalauth.xposed.common" + compileSdk 35 defaultConfig { minSdk 29 - targetSdk 32 + targetSdk 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/libuniversalauth/build.gradle b/libuniversalauth/build.gradle index c53d9c2..1294f09 100644 --- a/libuniversalauth/build.gradle +++ b/libuniversalauth/build.gradle @@ -4,11 +4,12 @@ plugins { } android { - compileSdk 32 + namespace "ax.nd.universalauth" + compileSdk 35 defaultConfig { minSdk 29 - targetSdk 32 + targetSdk 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/settings.gradle b/settings.gradle index 6ff6017..a27e8d0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,6 +3,7 @@ pluginManagement { gradlePluginPortal() google() mavenCentral() + mavenLocal() } } dependencyResolutionManagement { @@ -12,7 +13,8 @@ dependencyResolutionManagement { mavenCentral() maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } // https://git.svc.vepta.org/nulldev/xposedutil - maven { url 'https://git.svc.vepta.org/api/v4/projects/4/packages/maven' } + // maven { url 'https://git.svc.vepta.org/api/v4/projects/4/packages/maven' } + mavenLocal() } } rootProject.name = "Universal Auth" diff --git a/universalauth-xposed/build.gradle b/universalauth-xposed/build.gradle index ccbbff1..6290dc0 100644 --- a/universalauth-xposed/build.gradle +++ b/universalauth-xposed/build.gradle @@ -4,12 +4,13 @@ plugins { } android { - compileSdk 32 + namespace "ax.nd.universalauth.xposed" + compileSdk 35 defaultConfig { applicationId "ax.nd.universalauth.xposed" minSdk 29 - targetSdk 32 + targetSdk 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/universalauth-xposed/src/main/java/ax/nd/universalauth/xposed/Module.java b/universalauth-xposed/src/main/java/ax/nd/universalauth/xposed/Module.java index de71b1a..3946a8f 100644 --- a/universalauth-xposed/src/main/java/ax/nd/universalauth/xposed/Module.java +++ b/universalauth-xposed/src/main/java/ax/nd/universalauth/xposed/Module.java @@ -4,7 +4,8 @@ import static ax.nd.universalauth.xposed.common.XposedConstants.EXTRA_UNLOCK_MODE; import static ax.nd.universalauth.xposed.common.XposedConstants.MODE_UNLOCK_FADING; -import android.app.ActivityManager; +import android.annotation.SuppressLint; +import android.app.Application; import android.content.Context; import android.content.Intent; import android.os.Build; @@ -26,16 +27,19 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage; import kotlin.Unit; +@SuppressLint("PrivateApi") public class Module implements IXposedHookLoadPackage { - private static final String TAG = "XposedUniversalAuth"; private static final String STATUS_BAR_CLASS = "com.android.systemui.statusbar.phone.StatusBar"; private static final String SYSTEM_UI_CLASS = "com.android.systemui.SystemUI"; private static final String CORE_STARTABLE_CLASS = "com.android.systemui.CoreStartable"; + private static final String CENTRAL_SURFACES_CLASS = "com.android.systemui.statusbar.phone.CentralSurfaces"; + private static final String CENTRAL_SURFACES_IMPL_CLASS = "com.android.systemui.statusbar.phone.CentralSurfacesImpl"; + private static final String BIOMETRIC_UNLOCK_SOURCE_CLASS = "com.android.systemui.keyguard.shared.model.BiometricUnlockSource"; private static final String KEYGUARD_UPDATE_MONITOR_CLASS = "com.android.keyguard.KeyguardUpdateMonitor"; private static final String STATUS_BAR_STATE_CONTROLLER_CLASS = "com.android.systemui.plugins.statusbar.StatusBarStateController"; + private static final String STATUS_BAR_STATE_CONTROLLER_IMPL_CLASS = "com.android.systemui.statusbar.StatusBarStateControllerImpl"; private static final String KEYGUARD_UPDATE_MONITOR_LAST_MODE = "ax.nd.universalauth.last-mode"; - // com.android.systemui.statusbar.StatusBarState.SHADE_LOCKED private static final int SHADE_LOCKED = 2; private Method isUserInLockdownMethod; @@ -56,52 +60,44 @@ public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) throws Th isUserInLockdownMethod = getIsUserInLockdownMethod(kumClazz); try { - // Hook com.android.systemui.statusbar.phone.StatusBar.start - Class statusBarClass = lpparam.classLoader.loadClass(STATUS_BAR_CLASS); - hookStatusBar(lpparam, statusBarClass); - } catch(Throwable e) { - // Failed to hook status bar class, we are on Android 13 DP Beta 1+ - // Try using another class - try { - Class statusBarClass = lpparam.classLoader.loadClass("com.android.systemui.statusbar.phone.CentralSurfaces"); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + Class statusBarClass = lpparam.classLoader.loadClass(CENTRAL_SURFACES_IMPL_CLASS); + hookStatusBar(lpparam, statusBarClass); + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S_V2) { + Class statusBarClass = lpparam.classLoader.loadClass(CENTRAL_SURFACES_CLASS); + hookStatusBar(lpparam, statusBarClass); + } else { + Class statusBarClass = lpparam.classLoader.loadClass(STATUS_BAR_CLASS); hookStatusBar(lpparam, statusBarClass); - } catch(Throwable e2) { - XposedBridge.log("Failed to hook status bar! Initial attempt failed with:"); - XposedBridge.log(e); - XposedBridge.log("We tried an alternative class but that failed too:"); - XposedBridge.log(e2); } + } catch (Throwable th) { + XposedBridge.log("failed to load status bar class"); + XposedBridge.log(th); } // Hook com.android.keyguard.KeyguardUpdateMonitor.updateFaceListeningState try { addHookEarlyUnlock(kumClazz, lpparam); - } catch (Throwable t) { + } catch (Throwable th) { XposedBridge.log("Failed to hook early unlock, early unlock hook will not work:"); - XposedBridge.log(t); + XposedBridge.log(th); } try { TrustHook.INSTANCE.hookKum(kumClazz); - } catch (Throwable t) { + } catch (Throwable th) { XposedBridge.log("Failed to hook trust hook, trust hook will not work:"); - XposedBridge.log(t); + XposedBridge.log(th); } } } private void hookStatusBar(XC_LoadPackage.LoadPackageParam lpparam, Class statusBarClass) { - XposedHelpers.findAndHookMethod( - statusBarClass, - "start", - new XC_MethodHook() { - @Override - protected void afterHookedMethod(MethodHookParam param) throws Throwable { -// XposedBridge.log("FaceUnlock hook pre-install!"); - hookStatusBar(statusBarClass, lpparam.classLoader, param); -// XposedBridge.log("FaceUnlock hook installed!"); - } - } - ); + XposedHelpers.findAndHookMethod(statusBarClass, "start", new XC_MethodHook() { + @Override + protected void afterHookedMethod(MethodHookParam param) throws Throwable { + hookStatusBar(statusBarClass, lpparam.classLoader, param); + } + }); } private Method getIsUserInLockdownMethod(Class kumClazz) { @@ -113,25 +109,35 @@ private Method getIsUserInLockdownMethod(Class kumClazz) { } private boolean isUserInLockdown(Object kum) throws InvocationTargetException, IllegalAccessException { - return isUserInLockdownMethod != null - && (boolean) isUserInLockdownMethod.invoke(kum, Util.INSTANCE.getCurrentUser()); + return isUserInLockdownMethod != null && (boolean) isUserInLockdownMethod.invoke(kum, Util.INSTANCE.getCurrentUser()); } private void addHookEarlyUnlock(Class kumClazz, XC_LoadPackage.LoadPackageParam lpparam) throws Throwable { Field mStatusBarStateControllerField = asAccessible(kumClazz.getDeclaredField("mStatusBarStateController")); - Field mKeyguardIsVisibleField = asAccessible(kumClazz.getDeclaredField("mKeyguardIsVisible")); + Field mKeyguardIsVisibleField; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + // Android 14 + mKeyguardIsVisibleField = asAccessible(kumClazz.getDeclaredField("mKeyguardShowing")); + } else { + mKeyguardIsVisibleField = asAccessible(kumClazz.getDeclaredField("mKeyguardIsVisible")); + } Field mDeviceInteractiveField = asAccessible(kumClazz.getDeclaredField("mDeviceInteractive")); Field mGoingToSleepField = asAccessible(kumClazz.getDeclaredField("mGoingToSleep")); Field mContextField = asAccessible(kumClazz.getDeclaredField("mContext")); - Class sbscClazz = lpparam.classLoader.loadClass(STATUS_BAR_STATE_CONTROLLER_CLASS); + Class sbscClazz; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + sbscClazz = lpparam.classLoader.loadClass(STATUS_BAR_STATE_CONTROLLER_IMPL_CLASS); + } else { + sbscClazz = lpparam.classLoader.loadClass(STATUS_BAR_STATE_CONTROLLER_CLASS); + } Method getStateMethod = asAccessible(sbscClazz.getDeclaredMethod("getState")); XC_MethodHook hook = new XC_MethodHook() { @Override protected void beforeHookedMethod(MethodHookParam param) throws Throwable { Object kum = param.thisObject; - if(isUserInLockdown(kum)) { + if (isUserInLockdown(kum)) { return; } @@ -143,8 +149,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable { // From: com.android.keyguard.KeyguardUpdateMonitor.shouldListenForFace final boolean statusBarShadeLocked = sbscState == SHADE_LOCKED; - final boolean awakeKeyguard = mKeyguardIsVisible && mDeviceInteractive && !mGoingToSleep - && !statusBarShadeLocked; + final boolean awakeKeyguard = mKeyguardIsVisible && mDeviceInteractive && !mGoingToSleep && !statusBarShadeLocked; Object prevAwakeKeyguard = XposedHelpers.setAdditionalInstanceField(kum, KEYGUARD_UPDATE_MONITOR_LAST_MODE, awakeKeyguard); @@ -155,26 +160,22 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable { } }; - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S_V2) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S_V2) { // Android 12L+ - XposedHelpers.findAndHookMethod( - kumClazz, - "updateFaceListeningState", - int.class, - hook - ); + try { + XposedHelpers.findAndHookMethod(kumClazz, "updateFaceListeningState", int.class, hook); + } catch (Throwable th) { + // hook the fingerprint for some ROMs + XposedHelpers.findAndHookMethod(kumClazz, "updateFingerprintListeningState", int.class, hook); + } + } else { - XposedHelpers.findAndHookMethod( - kumClazz, - "updateFaceListeningState", - hook - ); + XposedHelpers.findAndHookMethod(kumClazz, "updateFaceListeningState", hook); } } private void hookEarlyUnlock(Context context, boolean newAwakeKeyguard) throws Throwable { - context.sendBroadcast(new Intent(XposedConstants.ACTION_EARLY_UNLOCK) - .putExtra(XposedConstants.EXTRA_EARLY_UNLOCK_MODE, newAwakeKeyguard)); + context.sendBroadcast(new Intent(XposedConstants.ACTION_EARLY_UNLOCK).putExtra(XposedConstants.EXTRA_EARLY_UNLOCK_MODE, newAwakeKeyguard)); } private T asAccessible(T a) { @@ -190,13 +191,17 @@ private String dumpStream(Stream stream) { return stream.map(Object::toString).collect(Collectors.joining(",\n")); } + @SuppressLint("PrivateApi") private void hookStatusBar(Class statusBarClass, ClassLoader classLoader, XC_MethodHook.MethodHookParam param) throws Throwable { Object statusBar = param.thisObject; Class systemUiClass; - if(Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + // >= Android 14: Same as SystemUi + systemUiClass = classLoader.loadClass(CENTRAL_SURFACES_IMPL_CLASS); + } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2) { // >= Android 13 systemUiClass = classLoader.loadClass(CORE_STARTABLE_CLASS); - } else if(Build.VERSION.SDK_INT == Build.VERSION_CODES.S_V2) { + } else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.S_V2) { // == Android 12L try { // Try loading SystemUI class for Android 12L @@ -213,11 +218,11 @@ private void hookStatusBar(Class statusBarClass, ClassLoader classLoader, XC_ Context context = (Context) asAccessible(systemUiClass.getDeclaredField("mContext")).get(statusBar); Object kum = asAccessible(statusBarClass.getDeclaredField("mKeyguardUpdateMonitor")).get(statusBar); - UnlockMethod method = hookStatusBarBiometricUnlock(statusBar, statusBarClass); + UnlockMethod method = hookStatusBarBiometricUnlock(classLoader, statusBar, statusBarClass); UnlockReceiver.INSTANCE.setup(context, statusBar, intent -> { try { - if(!isUserInLockdown(kum)) { + if (!isUserInLockdown(kum)) { method.unlock(intent); } } catch (Throwable throwable) { @@ -235,11 +240,20 @@ private Object getBiometricUnlockControllerFromStatusBar(Object statusBar, Class return asAccessible(statusBarClass.getDeclaredField("mBiometricUnlockController")).get(statusBar); } - private UnlockMethod hookStatusBarBiometricUnlock(Object statusBar, Class statusBarClass) throws Throwable { + private UnlockMethod hookStatusBarBiometricUnlock(ClassLoader classLoader, Object statusBar, Class statusBarClass) throws Throwable { Object biometricUnlockController = getBiometricUnlockControllerFromStatusBar(statusBar, statusBarClass); - Method startWakeAndUnlock = asAccessible(biometricUnlockController - .getClass() - .getDeclaredMethod("startWakeAndUnlock", int.class)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { + Class biometricUnlockScoreClass = classLoader.loadClass(BIOMETRIC_UNLOCK_SOURCE_CLASS); + Method startWakeAndUnlock = asAccessible(biometricUnlockController.getClass().getDeclaredMethod("startWakeAndUnlock", int.class, biometricUnlockScoreClass)); + + return intent -> { + if (intent.getBooleanExtra(EXTRA_BYPASS_KEYGUARD, true)) { + int unlockMode = intent.getIntExtra(EXTRA_UNLOCK_MODE, MODE_UNLOCK_FADING); + startWakeAndUnlock.invoke(biometricUnlockController, unlockMode, null); + } + }; + } + Method startWakeAndUnlock = asAccessible(biometricUnlockController.getClass().getDeclaredMethod("startWakeAndUnlock", int.class)); return intent -> { if (intent.getBooleanExtra(EXTRA_BYPASS_KEYGUARD, true)) { diff --git a/universalauth-xposed/src/main/java/ax/nd/universalauth/xposed/UnlockReceiver.kt b/universalauth-xposed/src/main/java/ax/nd/universalauth/xposed/UnlockReceiver.kt index 977c248..8f09490 100644 --- a/universalauth-xposed/src/main/java/ax/nd/universalauth/xposed/UnlockReceiver.kt +++ b/universalauth-xposed/src/main/java/ax/nd/universalauth/xposed/UnlockReceiver.kt @@ -2,6 +2,7 @@ package ax.nd.universalauth.xposed import android.content.BroadcastReceiver import android.content.Context +import android.content.Context.RECEIVER_EXPORTED import android.content.Intent import android.content.IntentFilter import android.util.Log @@ -28,7 +29,7 @@ object UnlockReceiver { // Register broadcastReceiver for IPC // TODO Handle multiple users val intentFilter = IntentFilter(ACTION_UNLOCK_DEVICE) - context.registerReceiver(unlockReceiver, intentFilter, PERMISSION_UNLOCK_DEVICE, null) + context.registerReceiver(unlockReceiver, intentFilter, PERMISSION_UNLOCK_DEVICE, null, RECEIVER_EXPORTED) XposedHelpers.setAdditionalInstanceField(attachTo, ATTACH_KEY, unlockReceiver)