Merge remote-tracking branch 'john/master' into development

app/src/main/res/raw/changelog.md

@@ -1,3 +1,3 @@
-# v7.1.2
+# v7.2.0
-- Support patching Samsung AP firmware
+- Huge UI overhaul
-- Much better module downloading mechanism
+- More sweet changes coming in the future!

app/src/main/res/values-ca/strings.xml

@@ -15,7 +15,7 @@
     <string name="checking_for_updates">Cercant actualitzacions</string>
     <string name="invalid_update_channel">Canal d\'actualització invàlid</string>
     <string name="safetyNet_check_text">Comprova l\'estat de SafetyNet</string>
-    <string name="checking_safetyNet_status">Comprovant l\'estat de SafetyNet…</string>
+    <string name="checking_safetyNet_status">Comprovant Safetynet…</string>
     <string name="safetyNet_check_success">La comprovació ha sigut exitosa</string>
     <string name="safetyNet_api_error">Error en la API de SafetyNet</string>
     <string name="safetyNet_res_invalid">La resposta és invàlida</string>
@@ -30,7 +30,7 @@
     <string name="uninstall_magisk_title">Desinstal·lar Magisk</string>
     <string name="uninstall_magisk_msg">Tots els mòduls seran desactivats / eliminats. L\'accés Arrel s\'eliminarà i, possiblement, xifrarà totes les dades si no estan ja xifrades.</string>
     <string name="update">Actualització</string>
-    <string name="core_only_enabled">(Mode únicament nucli activat)</string>
+    <string name="core_only_enabled">(Mode nucli activat)</string>
 
     <!--Module Fragment-->
     <string name="no_info_provided">(No hi ha informació)</string>
@@ -74,6 +74,18 @@
     <string name="magisk_update_title">Actualització de Magisk disponible!</string>
     <string name="manager_update_title">Actualització de Magisk Manager disponible!</string>
 
+    <!-- Installation -->
+    <string name="manager_download_install">Prem per descarregar i instalar.</string>
+    <string name="download_zip_only">Descarrega només el ZIP</string>
+    <string name="direct_install">Instal·lació directa (Recomanat)</string>
+    <string name="install_inactive_slot">Instal·la a la ranura inactiva (Després d\'una OTA)</string>
+    <string name="install_inactive_slot_msg">El teu dispositiu serà FORÇAT a arrancar en l\'actual ranura inactiva després del reinici!\nUtilitza aquesta opció NOMÉS quan l\'OTA s\'hagi fet.\nContinuar?</string>
+    <string name="select_method">Sel·lecciona mètode</string>
+    <string name="setup_title">Instal·lació addicional</string>
+    <string name="select_patch_file">Sel·lecciona i arranja un arxiu</string>
+    <string name="patch_file_msg">Sel·lecciona una imatge crua (*.img) o un ODIN tarfile (*.tar)</string>
+    <string name="reboot_delay_toast">Reinici en 5 segons…</string>
+
     <!--Toasts, Dialogs-->
     <string name="close">Tancar</string>
     <string name="repo_install_title">Instal·lar %1$s</string>
@@ -84,19 +96,16 @@
     <string name="release_notes">Notes de llançament</string>
     <string name="repo_cache_cleared">Memòria cau del repositori netejada</string>
     <string name="internal_storage">El zip està emmagatzemat en:\n[Internal Storage]%1$s</string>
-    <string name="manager_download_install">Prem per descarregar i instal·lar.</string>
+
     <string name="dtbo_patched_title">S\'ha arranjat DTBO</string>
     <string name="dtbo_patched_reboot">Magisk Manager ha arranjat dtbo.img. Si us plau, reinicia el telèfon.</string>
-    <string name="flashing">Arranjament</string>
+    <string name="flashing">Arranjament…</string>
+    <string name="done">Fet!</string>
+    <string name="failure">Fallit</string>
     <string name="hide_manager_title">Amagant Magisk Manager…</string>
     <string name="hide_manager_fail_toast">L\'amagament de Magisk Manager ha fallat.</string>
     <string name="open_link_failed_toast">No s\'ha trobat una aplicació per obrir l\'enllaç.</string>
-    <string name="download_zip_only">Descarrega només el ZIP</string>
-    <string name="direct_install">Instal·lació directa (Recomanat)</string>
-    <string name="install_inactive_slot">Instal·lar a la ranura inactiva (Després d\'una OTA)</string>
     <string name="warning">Avís</string>
-    <string name="install_inactive_slot_msg">El teu dispositiu serà FORÇAT a arrancar en la ranura inactiva després de reiniciar!\nUtilitza aquesta opció només quan s\'hagi fet la OTA.\nContinuar?</string>
-    <string name="select_method">Selecciona mètode</string>
     <string name="complete_uninstall">Desinstal·lació completa</string>
     <string name="restore_img">Restaura imatges</string>
     <string name="restore_img_msg">Restaurant…</string>
@@ -107,7 +116,6 @@
     <string name="setup_fail">Instal·lació fallida.</string>
     <string name="env_fix_title">Es requereix instal·lació addicional</string>
     <string name="env_fix_msg">El teu dispositiu necessita instal·lació addicional per Magisk per funcionar correctament. Es descarregarà el ZIP d\'instal·lació de Magisk , vol procedir a l\'instalació ara?</string>
-    <string name="setup_title">Instal·lació addicional</string>
     <string name="setup_msg">S\'està executant la configuració de l\'entorn…</string>
     <string name="downloading_toast">Descarregant %1$s</string>
     <string name="no_rw_storage">Aquesta funció no funcionara si no es té permís per escriure a l\'emmagatzematge.</string>
@@ -133,7 +141,7 @@
     <string name="settings_update_beta">Beta</string>
     <string name="settings_update_custom">Personalitzat</string>
     <string name="settings_update_custom_msg">Inserta una URL personalitzada</string>
-    <string name="settings_core_only_title">Mode únicament nucli de Magisk</string>
+    <string name="settings_core_only_title">Mode nucli de Magisk</string>
     <string name="settings_core_only_summary">Habilitar només les funcions principals, no es carregaran tots els mòduls. MagiskSU y MagiskHide seguirán habilitats</string>
     <string name="settings_magiskhide_summary">Amagar Magisk de varies deteccions</string>
     <string name="settings_hosts_title">Systemless Hosts</string>
@@ -161,7 +169,6 @@
     <string name="settings_su_fingerprint_summary">Utilitza el sensor d’Empremta Dactilar per permetre les sol·licituds de superusuari</string>
     <string name="auth_fingerprint">Autenticar Emprempta Digital</string>
 
-
     <string name="multiuser_mode">Mode Multiusuari</string>
     <string name="settings_owner_only">Només Administrador del Dispositiu</string>
     <string name="settings_owner_manage">Administrador del Dispositiu</string>
@@ -210,10 +217,11 @@
     <string name="auth_fail">Autenticació fallida</string>
 
     <!--Superuser logs-->
+    <string name="pid">PID: %1$d</string>
     <string name="target_uid">UID de l\’objectiu: %1$d</string>
     <string name="command">Ordre: %1$s</string>
     
     <!-- MagiskHide -->
-    <string name="show_system_app">Ensenya apps del sistema</string>
+    <string name="show_system_app">Mostra apps del sistema</string>
 
 </resources>

app/src/main/res/values-it/strings.xml

@@ -30,7 +30,7 @@
 	<string name="uninstall_magisk_title">Disinstalla Magisk</string>
 	<string name="uninstall_magisk_msg">Tutti i moduli verranno disabilitati/rimossi. Il root verrà rimosso e i tuoi dati potrebbero essere criptati, nel caso non lo siano già.</string>
 	<string name="update">Aggiorna</string>
-        <string name="core_only_enabled">(Modalità solo-core abilitata)</string>
+        <string name="core_only_enabled">(Modalità solo Core abilitata)</string>
 
 	<!--Module Fragment-->
 	<string name="no_info_provided">(Nessuna informazione)</string>
@@ -74,6 +74,18 @@
 	<string name="magisk_update_title">È disponibile un aggiornamento di Magisk!</string>
    	<string name="manager_update_title">È disponibile un aggiornamento di Magisk Manager!</string>
 
+<!-- Installation -->
+    	<string name="manager_download_install">Apri questa notifica per scaricare e installare.</string>
+	<string name="download_zip_only">Scarica solo il file zip</string>
+    	<string name="direct_install">Installazione diretta (raccomandata)</string>
+	<string name="install_inactive_slot">Installa nello slot inattivo (dopo un OTA)</string>
+	<string name="install_inactive_slot_msg">Questo dispositivo verrà FORZATO ad avviarsi usando lo slot inattivo!\nUsa questo metodo solo dopo che un OTA è stato installato.\nVuoi continuare?</string>
+	<string name="select_method">Seleziona un metodo</string>
+	<string name="setup_title">Configurazione aggiuntiva</string>
+	<string name="select_patch_file">Seleziona e aggiorna un file</string>
+   	<string name="patch_file_msg">Seleziona un\'immagine in formato .img o un file ODIN .tar</string>
+   	<string name="reboot_delay_toast">Riavvio fra 5 secondi…</string>
+	
 	<!--Toasts, Dialogs-->
 	<string name="close">Chiudi</string>
 	<string name="repo_install_title">Installazione di %1$s</string>
@@ -84,30 +96,26 @@
 	<string name="release_notes">Note di rilascio</string>
 	<string name="repo_cache_cleared">La cache delle repository è stata svuotata</string>
 	<string name="internal_storage">Il file zip si trova in:\n[Memoria Interna]%1$s</string>
-	<string name="manager_download_install">Premere per scaricare e installare.</string>
+	
 	<string name="dtbo_patched_title">DTBO è stato aggiornato!</string>
 	<string name="dtbo_patched_reboot">Magisk Manager ha aggiornato dtbo.img. Riavvia per completare.</string>
 	<string name="flashing">Flash in corso…</string>
+	<string name="done">Completato!</string>
+    	<string name="failure">Fallito</string>
 	<string name="hide_manager_title">Nascondendo Magisk Manager…</string>
 	<string name="hide_manager_fail_toast">Non è stato possibile nascondere Magisk Manager.</string>
 	<string name="open_link_failed_toast">Nessuna app disponibile per aprire il link.</string>
-	<string name="download_zip_only">Scarica solo il file zip</string>
-    <string name="direct_install">Installazione diretta (raccomandata)</string>
-	<string name="install_inactive_slot">Installa nello slot inattivo (dopo un OTA)</string>
 	<string name="warning">Attenzione</string>
-	<string name="install_inactive_slot_msg">Questo dispositivo verrà FORZATO ad avviarsi usando lo slot inattivo!\nUsa questo metodo solo dopo che un OTA è stato installato.\nVuoi continuare?</string>
+   	<string name="complete_uninstall">Disinstallazione completa</string>
-	<string name="select_method">Seleziona un metodo</string>
-    <string name="complete_uninstall">Disinstallazione completa</string>
    	<string name="restore_img">Ripristina Immagini</string>
 	<string name="restore_img_msg">Ripristino…</string>
 	<string name="restore_done">Ripristino completato!</string>
 	<string name="restore_fail">Non esiste un\'immagine originale di boot!</string>
    	<string name="proprietary_title">Scarica codice proprietario</string>
 	<string name="proprietary_notice">Magisk Manager è FOSS e non contiene codice proprietario delle API Google SafetyNet.\n\nVuoi scaricare un\'estensione (contenente GoogleApiClient) per controllare lo stato di SafetyNet?</string>
-    <string name="setup_fail">Configurazione fallita.</string>
+   	<string name="setup_fail">Configurazione fallita.</string>
-	<string name="env_fix_title">Richiedi configurazione aggiuntiva</string>
+	<string name="env_fix_title">Configurazione aggiuntiva richiesta</string>
 	<string name="env_fix_msg">Il tuo dispositivo necessita di una configurazione aggiuntiva per far funzionare Magisk correttamente. Verrà scaricato il file zip di Magisk, vuoi procedere ora?</string>
-	<string name="setup_title">Configurazione aggiuntiva</string>
 	<string name="setup_msg">Configurazione dell\'ambiente in corso…</string>
 	<string name="downloading_toast">Download di %1$s</string>
 	<string name="no_rw_storage">Questa funzione non sarà attiva senza l\'autorizzazione di scrittura nella memoria di archiviazione.</string>
@@ -117,7 +125,7 @@
 	<string name="settings_general_category">Generale</string>
 	<string name="settings_dark_theme_title">Tema scuro</string>
 	<string name="settings_dark_theme_summary">Abilita il tema scuro.</string>
-        <string name="settings_clear_cache_title">Svuota cache repository</string>
+    	<string name="settings_clear_cache_title">Svuota cache repository</string>
 	<string name="settings_clear_cache_summary">Svuota la cache delle repository. Questa opzione forza l\'aggiornamento online dell\'app.</string>
 	<string name="settings_hide_manager_title">Nascondi Magisk Manager</string>
 	<string name="settings_hide_manager_summary">Reinstalla Magisk Manager con un nome pacchetto casuale.</string>
@@ -133,7 +141,7 @@
 	<string name="settings_update_beta">Beta</string>
 	<string name="settings_update_custom">Personalizzato</string>
 	<string name="settings_update_custom_msg">Inserisci un URL personalizzato</string>
-    <string name="settings_core_only_title">Modalità Magisk Core</string>
+    	<string name="settings_core_only_title">Modalità Magisk Core</string>
 	<string name="settings_core_only_summary">Abilita solo le funzioni principali. Nessun modulo verrà caricato. MagiskSU e MagiskHide rimarranno abilitati</string>
 	<string name="settings_magiskhide_summary">Nasconde Magisk da numerose rilevazioni.</string>
 	<string name="settings_hosts_title">Host systemless</string>

app/src/main/res/values-ko/strings.xml

@@ -98,7 +98,9 @@
     
     <string name="dtbo_patched_title">DTBO가 패치되었습니다!</string>
     <string name="dtbo_patched_reboot">Magisk Manager가 dtbo.img를 패치했습니다. 기기를 다시 시작해 주시기 바랍니다.</string>
-    <string name="flashing">플래싱 중</string>
+    <string name="flashing">플래싱 중...</string>
+    <string name="done">완료!</string>
+    <string name="failure">실패</string>
     <string name="hide_manager_title">Magisk Manager를 숨기는 중…</string>
     <string name="hide_manager_fail_toast">Magisk Manager를 숨기는 데 실패하였습니다.</string>
     <string name="open_link_failed_toast">링크를 열 앱이 없습니다.</string>

app/src/main/res/values-ro/strings.xml

@@ -94,11 +94,13 @@
     <string name="reboot">Repornește</string>
     <string name="settings_reboot_toast">Repornește pentru a aplica setările.</string>
     <string name="release_notes">Note privind versiunea</string>
-    <string name="repo_cache_cleared">Cache-ul depozitului golit</string>
+    <string name="repo_cache_cleared">Cache-ul depozitelor golit</string>
     <string name="internal_storage">Zip-ul este stocat în:\n[Stocare internă]%1$s</string>
     <string name="dtbo_patched_title">DTBO a fost patchuit!</string>
     <string name="dtbo_patched_reboot">Magisk Manager a patchuit dtbo.img. Te rugăm să repornești.</string>
-    <string name="flashing">Se procesează</string>
+    <string name="flashing">Procesare în curs…</string>
+    <string name="done">Terminat!</string>
+    <string name="failure">Eșec</string>
     <string name="hide_manager_title">Se ascunde Magisk Manager…</string>
     <string name="hide_manager_fail_toast">Ascunderea Magisk Manager a eșuat.</string>
     <string name="open_link_failed_toast">Nu a fost găsită nicio aplicație pentru a deschide linkul.</string>
@@ -115,7 +117,7 @@
     <string name="env_fix_msg">Dispozitivul tău are nevoie de configurări suplimentare pentru ca Magisk să funcționeze corect. Se va descărca zip-ul de configurare Magisk, vrei să continui acum?</string>
     <string name="setup_msg">Rulează configurarea mediului…</string>
     <string name="downloading_toast">Se descarcă %1$s</string>
-    <string name="no_rw_storage">Această caracteristică nu va funcționa fără permisiunea de a scrie în stocarea externă.</string>
+    <string name="no_rw_storage">Această funcție nu va funcționa fără permisiunea de a scrie în stocarea externă.</string>
     <string name="dl_one_module">Descarcă câte un modul odată.</string>
 
     <!--Settings Activity -->
@@ -139,7 +141,7 @@
     <string name="settings_update_custom">Personalizat</string>
     <string name="settings_update_custom_msg">Inserează un URL personalizat</string>
     <string name="settings_core_only_title">Mod numai de bază pentru Magisk</string>
-    <string name="settings_core_only_summary">Activează numai caracteristicile de bază. MagiskSU și MagiskHide vor fi în continuare activate, însă niciun modul nu va fi încărcat.</string>
+    <string name="settings_core_only_summary">Activează numai funcțiile de bază. MagiskSU și MagiskHide vor fi în continuare activate, însă niciun modul nu va fi încărcat.</string>
     <string name="settings_magiskhide_summary">Ascunde Magisk de diferite forme de detectare.</string>
     <string name="settings_hosts_title">Systemless hosts</string>
     <string name="settings_hosts_summary">Suport systemless hosts pentru aplicațiile adblock.</string>

app/src/main/res/values-ru/strings.xml

@@ -100,6 +100,8 @@
     <string name="dtbo_patched_title">DTBO пропатчен!</string>
     <string name="dtbo_patched_reboot">Magisk Manager пропатчил dtbo.img. Перезагрузите устройство.</string>
     <string name="flashing">Прошивка</string>
+    <string name="done">Завершено!</string>
+    <string name="failure">Ошибка</string>
     <string name="hide_manager_title">Маскировка Magisk Manager…</string>
     <string name="hide_manager_fail_toast">Не удалось замаскировать Magisk Manager</string>
     <string name="open_link_failed_toast">Не найдено приложений для открытия ссылки.</string> 

app/src/main/res/values-zh-rTW/strings.xml

@@ -215,5 +215,10 @@
 
     <!-- MagiskHide -->
     <string name="show_system_app">顯示系統應用程式</string>
+    <string name="done">完成！</string>
+    <string name="failure">失敗</string>
+    <string name="patch_file_msg">選擇一個 image (*.img) 或是 ODIN tarfile (*.tar)</string>
+    <string name="reboot_delay_toast">5 秒鐘之後將會重新啟動…</string>
+    <string name="select_patch_file">選擇並對檔案進行補丁</string>
 
 </resources>

build.gradle

@@ -15,7 +15,7 @@ buildscript {
         maven { url 'https://kotlin.bintray.com/kotlinx' }
     }
     dependencies {
-        classpath 'com.android.tools:r8:1.4.93'
+        classpath 'com.android.tools:r8:1.4.96'
         classpath 'com.android.tools.build:gradle:3.5.0-beta01'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
 

build.py

@@ -422,7 +422,6 @@ def build_all(args):
     build_binary(args)
     zip_main(args)
     zip_uninstaller(args)
-    build_snet(args)
 
 
 parser = argparse.ArgumentParser(description='Magisk build script')

native/jni/magiskboot/bootimg.cpp

@@ -109,14 +109,17 @@ int boot_img::parse_image(uint8_t *head) {
 		hdr.set_hdr(new boot_img_hdr_pxa());
 		memcpy(*hdr, head, sizeof(boot_img_hdr_pxa));
 	} else {
-		if (memcmp(hp->cmdline, NOOKHD_MAGIC, 12) == 0 ||
+		if (memcmp(hp->cmdline, NOOKHD_RL_MAGIC, 10) == 0 ||
-			memcmp(hp->cmdline, NOOKHD_NEW_MAGIC, 26) == 0) {
+			memcmp(hp->cmdline, NOOKHD_GL_MAGIC, 12) == 0 ||
+			memcmp(hp->cmdline, NOOKHD_GR_MAGIC, 14) == 0 ||
+			memcmp(hp->cmdline, NOOKHD_EB_MAGIC, 26) == 0 ||
+			memcmp(hp->cmdline, NOOKHD_ER_MAGIC, 30) == 0) {
 			flags |= NOOKHD_FLAG;
-			fprintf(stderr, "NOOKHD_GREEN_LOADER\n");
+			fprintf(stderr, "NOOKHD_LOADER\n");
 			head += NOOKHD_PRE_HEADER_SZ;
 		} else if (memcmp(hp->name, ACCLAIM_MAGIC, 10) == 0) {
 			flags |= ACCLAIM_FLAG;
-			fprintf(stderr, "ACCLAIM_BAUWKSBOOT\n");
+			fprintf(stderr, "ACCLAIM_LOADER\n");
 			head += ACCLAIM_PRE_HEADER_SZ;
 		}
 		hdr.set_hdr(new boot_img_hdr());

native/jni/magiskboot/format.h

@@ -45,8 +45,11 @@ typedef enum {
 #define DHTB_MAGIC      "\x44\x48\x54\x42\x01\x00\x00\x00"
 #define SEANDROID_MAGIC "SEANDROIDENFORCE"
 #define TEGRABLOB_MAGIC "-SIGNED-BY-SIGNBLOB-"
-#define NOOKHD_MAGIC    "Green Loader"
+#define NOOKHD_RL_MAGIC "Red Loader"
-#define NOOKHD_NEW_MAGIC "eMMC boot.img+secondloader"
+#define NOOKHD_GL_MAGIC "Green Loader"
+#define NOOKHD_GR_MAGIC "Green Recovery"
+#define NOOKHD_EB_MAGIC "eMMC boot.img+secondloader"
+#define NOOKHD_ER_MAGIC "eMMC recovery.img+secondloader"
 #define NOOKHD_PRE_HEADER_SZ 1048576
 #define ACCLAIM_MAGIC   "BauwksBoot"
 #define ACCLAIM_PRE_HEADER_SZ 262144

signing/src/main/java/com/topjohnwu/signing/SignAPK.java

@@ -33,8 +33,6 @@ import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.security.MessageDigest;
 import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.Security;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -59,7 +57,6 @@ public class SignAPK {
     private static final String CERT_SF_NAME = "META-INF/CERT.SF";
     private static final String CERT_SIG_NAME = "META-INF/CERT.%s";
 
-    private static Provider sBouncyCastleProvider = Security.getProvider("BC");
     // bitmasks for which hash algorithms we need the manifest to include.
     private static final int USE_SHA1 = 1;
     private static final int USE_SHA256 = 2;
@@ -140,8 +137,7 @@ public class SignAPK {
      */
     private static int getDigestAlgorithm(X509Certificate cert) {
         String sigAlg = cert.getSigAlgName().toUpperCase(Locale.US);
-        if ("SHA1WITHRSA".equals(sigAlg) ||
+        if (sigAlg.startsWith("SHA1WITHRSA") || sigAlg.startsWith("MD5WITHRSA")) {
-                "MD5WITHRSA".equals(sigAlg)) {     // see "HISTORICAL NOTE" above.
             return USE_SHA1;
         } else if (sigAlg.startsWith("SHA256WITH")) {
             return USE_SHA256;
@@ -309,13 +305,10 @@ public class SignAPK {
         JcaCertStore certs = new JcaCertStore(certList);
         CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
         ContentSigner signer = new JcaContentSignerBuilder(getSignatureAlgorithm(publicKey))
-                .setProvider(sBouncyCastleProvider)
                 .build(privateKey);
         gen.addSignerInfoGenerator(
                 new JcaSignerInfoGeneratorBuilder(
-                        new JcaDigestCalculatorProviderBuilder()
+                        new JcaDigestCalculatorProviderBuilder().build())
-                                .setProvider(sBouncyCastleProvider)
-                                .build())
                         .setDirectSignature(true)
                         .build(signer, publicKey));
         gen.addCertificates(certs);

stub/src/main/res/values-ca/strings.xml

@@ -0,0 +1,4 @@
+<resources>
+    <string name="upgrade_msg">Fes una actualització total de Magisk Manager  per finalitzar l\'instalació. Descarregar i instalar?</string>
+    <string name="no_internet_msg">Si us plau, connecta\'t a internet! Es necessari fer una actualització total de Magisk Manager.</string>
+</resources>