mirror of
				https://github.com/topjohnwu/Magisk
				synced 2025-10-31 10:40:52 +01:00 
			
		
		
		
	Compare commits
	
		
			4 Commits
		
	
	
		
			manager-v5
			...
			manager-v5
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 759e905c3c | ||
|   | 8bf7e42913 | ||
|   | 0dcd073554 | ||
|   | 2fe35d578d | 
| @@ -8,8 +8,8 @@ android { | ||||
|         applicationId "com.topjohnwu.magisk" | ||||
|         minSdkVersion 21 | ||||
|         targetSdkVersion 27 | ||||
|         versionCode 90 | ||||
|         versionName "5.5.4" | ||||
|         versionCode 91 | ||||
|         versionName "5.5.5" | ||||
|         ndk { | ||||
|             moduleName 'zipadjust' | ||||
|             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' | ||||
|   | ||||
| @@ -1,3 +1,6 @@ | ||||
| ### v5.5.5 | ||||
| - Fix crashes on Lollipop and some devices that don't follow AOSP standards | ||||
|  | ||||
| ### v5.5.4 | ||||
| - Fix on-boot dtbo detection | ||||
| - Add fingerprint authentication for Superuser requests | ||||
|   | ||||
| @@ -18,7 +18,7 @@ import javax.crypto.KeyGenerator; | ||||
| import javax.crypto.SecretKey; | ||||
|  | ||||
| @TargetApi(Build.VERSION_CODES.M) | ||||
| public abstract class FingerprintHelper extends FingerprintManager.AuthenticationCallback { | ||||
| public abstract class FingerprintHelper { | ||||
|  | ||||
|     private FingerprintManager manager; | ||||
|     private Cipher cipher; | ||||
| @@ -30,7 +30,7 @@ public abstract class FingerprintHelper extends FingerprintManager.Authenticatio | ||||
|         MagiskManager mm = MagiskManager.get(); | ||||
|         KeyguardManager km = mm.getSystemService(KeyguardManager.class); | ||||
|         FingerprintManager fm = mm.getSystemService(FingerprintManager.class); | ||||
|         return km.isKeyguardSecure() && fm.isHardwareDetected() && fm.hasEnrolledFingerprints(); | ||||
|         return km.isKeyguardSecure() && fm != null && fm.isHardwareDetected() && fm.hasEnrolledFingerprints(); | ||||
|     } | ||||
|  | ||||
|     protected FingerprintHelper() throws Exception { | ||||
| @@ -54,10 +54,38 @@ public abstract class FingerprintHelper extends FingerprintManager.Authenticatio | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     public abstract void onAuthenticationError(int errorCode, CharSequence errString); | ||||
|  | ||||
|     public abstract void onAuthenticationHelp(int helpCode, CharSequence helpString); | ||||
|  | ||||
|     public abstract void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result); | ||||
|  | ||||
|     public abstract void onAuthenticationFailed(); | ||||
|  | ||||
|     public void startAuth() { | ||||
|         cancel = new CancellationSignal(); | ||||
|         FingerprintManager.CryptoObject cryptoObject = new FingerprintManager.CryptoObject(cipher); | ||||
|         manager.authenticate(cryptoObject, cancel, 0, this, null); | ||||
|         manager.authenticate(cryptoObject, cancel, 0, new FingerprintManager.AuthenticationCallback() { | ||||
|             @Override | ||||
|             public void onAuthenticationError(int errorCode, CharSequence errString) { | ||||
|                 FingerprintHelper.this.onAuthenticationError(errorCode, errString); | ||||
|             } | ||||
|  | ||||
|             @Override | ||||
|             public void onAuthenticationHelp(int helpCode, CharSequence helpString) { | ||||
|                 FingerprintHelper.this.onAuthenticationHelp(helpCode, helpString); | ||||
|             } | ||||
|  | ||||
|             @Override | ||||
|             public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) { | ||||
|                 FingerprintHelper.this.onAuthenticationSucceeded(result); | ||||
|             } | ||||
|  | ||||
|             @Override | ||||
|             public void onAuthenticationFailed() { | ||||
|                 FingerprintHelper.this.onAuthenticationFailed(); | ||||
|             } | ||||
|         }, null); | ||||
|     } | ||||
|  | ||||
|     public void cancel() { | ||||
|   | ||||
| @@ -163,7 +163,10 @@ | ||||
|     <string name="request_timeout_summary">%1$s segundos</string> | ||||
|     <string name="settings_su_reauth_title">Re-autenticación</string> | ||||
|     <string name="settings_su_reauth_summary">Pedir permisos de superusuario nuevamente si una aplicación es actualizada o reinstalada</string> | ||||
|  | ||||
|     <string name="settings_su_fingerprint_title">Habilitar la autenticación de huellas digitales</string> | ||||
|     <string name="settings_su_fingerprint_summary">Utilice el escáner de huellas digitales para permitir las solicitudes de superusuario</string> | ||||
|   | ||||
|      | ||||
|     <string name="multiuser_mode">Modo MultiUsuario</string>  | ||||
|     <string name="settings_owner_only">Sólo Administrador del Dispositivo</string> | ||||
|     <string name="settings_owner_manage">Administrador del Dispositivo</string> | ||||
| @@ -209,6 +212,7 @@ | ||||
|     <string name="su_revoke_msg">¿Confirmar para revocar derechos de %1$s?</string> | ||||
|     <string name="toast">Aviso</string> | ||||
|     <string name="none">Nada</string> | ||||
|     <string name="auth_fail">Autenticación fallida</string> | ||||
|  | ||||
|     <!--Superuser logs--> | ||||
|     <string name="pid">PID:\u0020</string> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user