Update strings.xml

New Lines Added.

.gitignore

@@ -5,7 +5,7 @@
 /build
 app/release
 *.hprof
-app/.externalNativeBuild/
+.externalNativeBuild/
 *.sh
 public.certificate.x509.pem
 private.key.pk8

README.md

@@ -1,7 +1,2 @@
 # Magisk Manager
-This is one of the submodules used in Magisk. The project is licensed under GPL v3 (or newer).
-More info are written in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk)
-
-## Building Notes
-You need to install CMake and NDK to build the zipadjust library.
-There are several files required to let Magisk Manager work properly, and they can be copied by using the build script in the [Magisk Main Repo](https://github.com/topjohnwu/Magisk). These files are: `magisk_uninstaller.sh`, `util_functions.sh`, `public.certificate.x509.pem`, and `private.key.pk8` under the `app/src/main/assets` folder.
+This repo is no longer an independent component. It is a submodule of the [Magisk Project](https://github.com/topjohnwu/Magisk).

app/.gitignore

@@ -1 +0,0 @@
-/build

app/build.gradle

@@ -1,66 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.1"
-
-    defaultConfig {
-        applicationId "com.topjohnwu.magisk"
-        minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 64
-        versionName "5.4.3"
-        ndk {
-            moduleName 'zipadjust'
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-        }
-        javaCompileOptions {
-            annotationProcessorOptions {
-                argument('butterknife.debuggable', 'false')
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    dexOptions {
-        preDexLibraries true
-        javaMaxHeapSize "2g"
-    }
-    externalNativeBuild {
-        cmake {
-            path 'src/main/jni/CMakeLists.txt'
-        }
-    }
-    lintOptions {
-        disable 'MissingTranslation'
-    }
-}
-
-repositories {
-    jcenter()
-    google()
-    maven { url "https://jitpack.io" }
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation project(':crypto')
-    implementation 'com.android.support:recyclerview-v7:27.0.1'
-    implementation 'com.android.support:cardview-v7:27.0.1'
-    implementation 'com.android.support:design:27.0.1'
-    implementation 'com.android.support:support-v4:27.0.1'
-    implementation 'com.jakewharton:butterknife:8.8.1'
-    implementation 'com.atlassian.commonmark:commonmark:0.10.0'
-    implementation 'org.kamranzafar:jtar:2.3'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
-}

app/src/main/java/com/topjohnwu/magisk/AboutActivity.java

@@ -1,131 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
-import android.text.Html;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.view.View;
-import android.widget.TextView;
-
-import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
-import com.topjohnwu.magisk.utils.Const;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class AboutActivity extends Activity {
-
-    @BindView(R.id.toolbar) Toolbar toolbar;
-    @BindView(R.id.app_version_info) AboutCardRow appVersionInfo;
-    @BindView(R.id.app_changelog) AboutCardRow appChangelog;
-    @BindView(R.id.app_developers) AboutCardRow appDevelopers;
-    @BindView(R.id.app_translators) AboutCardRow appTranslators;
-    @BindView(R.id.app_source_code) AboutCardRow appSourceCode;
-    @BindView(R.id.support_thread) AboutCardRow supportThread;
-    @BindView(R.id.donation) AboutCardRow donation;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getMagiskManager().isDarkTheme) {
-            setTheme(R.style.AppTheme_Transparent_Dark);
-        }
-        setContentView(R.layout.activity_about);
-        ButterKnife.bind(this);
-
-        setSupportActionBar(toolbar);
-        toolbar.setNavigationOnClickListener(view -> finish());
-
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setTitle(R.string.about);
-            ab.setDisplayHomeAsUpEnabled(true);
-        }
-
-        appVersionInfo.setSummary(String.format(Locale.US, "%s (%d)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
-
-        String changes = null;
-        try (InputStream is = getAssets().open("changelog.html")) {
-            int size = is.available();
-
-            byte[] buffer = new byte[size];
-            is.read(buffer);
-
-            changes = new String(buffer);
-        } catch (IOException ignored) {
-        }
-
-        appChangelog.removeSummary();
-        if (changes == null) {
-            appChangelog.setVisibility(View.GONE);
-        } else {
-            Spanned result;
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-                result = Html.fromHtml(changes, Html.TO_HTML_PARAGRAPH_LINES_CONSECUTIVE);
-            } else {
-                result = Html.fromHtml(changes);
-            }
-            appChangelog.setOnClickListener(v -> {
-                AlertDialog d = new AlertDialogBuilder(this)
-                        .setTitle(R.string.app_changelog)
-                        .setMessage(result)
-                        .setPositiveButton(android.R.string.ok, null)
-                        .show();
-
-                //noinspection ConstantConditions
-                ((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
-            });
-        }
-
-        appDevelopers.removeSummary();
-        appDevelopers.setOnClickListener(view -> {
-            Spanned result;
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-                result = Html.fromHtml(getString(R.string.app_developers_), Html.TO_HTML_PARAGRAPH_LINES_CONSECUTIVE);
-            } else {
-                result = Html.fromHtml(getString(R.string.app_developers_));
-            }
-            AlertDialog d = new AlertDialogBuilder(this)
-                    .setTitle(R.string.app_developers)
-                    .setMessage(result)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .create();
-
-            d.show();
-            //noinspection ConstantConditions
-            ((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
-        });
-
-        String translators = getString(R.string.translators);
-        if (TextUtils.isEmpty(translators)) {
-            appTranslators.setVisibility(View.GONE);
-        } else {
-            appTranslators.setSummary(translators);
-        }
-
-        appSourceCode.removeSummary();
-        appSourceCode.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.SOURCE_CODE_URL))));
-
-        supportThread.removeSummary();
-        supportThread.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.XDA_THREAD))));
-
-        donation.removeSummary();
-        donation.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.DONATION_URL))));
-
-        setFloating();
-    }
-
-}

app/src/main/java/com/topjohnwu/magisk/asyncs/MarkDownWindow.java

@@ -1,48 +0,0 @@
-package com.topjohnwu.magisk.asyncs;
-
-import android.app.Activity;
-import android.support.v7.app.AlertDialog;
-import android.webkit.WebView;
-
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.utils.WebService;
-
-import org.commonmark.node.Node;
-import org.commonmark.parser.Parser;
-import org.commonmark.renderer.html.HtmlRenderer;
-
-public class MarkDownWindow extends ParallelTask<Void, Void, String> {
-
-    private String mTitle, mUrl;
-
-    public MarkDownWindow(Activity context, String title, String url) {
-        super(context);
-        mTitle = title;
-        mUrl = url;
-    }
-
-    @Override
-    protected String doInBackground(Void... voids) {
-        String md = WebService.getString(mUrl);
-        Parser parser = Parser.builder().build();
-        HtmlRenderer renderer = HtmlRenderer.builder().build();
-        Node doc = parser.parse(md);
-        return String.format(
-                "<link rel='stylesheet' type='text/css' href='file:///android_asset/%s.css'/> %s",
-                MagiskManager.get().isDarkTheme ? "dark" : "light", renderer.render(doc));
-    }
-
-    @Override
-    protected void onPostExecute(String html) {
-        AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
-        alert.setTitle(mTitle);
-
-        WebView wv = new WebView(getActivity());
-        wv.loadDataWithBaseURL("fake://", html, "text/html", "UTF-8", null);
-
-        alert.setView(wv);
-        alert.setNegativeButton(R.string.close, (dialog, id) -> dialog.dismiss());
-        alert.show();
-    }
-}

app/src/main/java/com/topjohnwu/magisk/container/InputStreamWrapper.java

@@ -1,74 +0,0 @@
-package com.topjohnwu.magisk.container;
-
-import android.support.annotation.NonNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class InputStreamWrapper extends InputStream {
-    private InputStream in;
-
-    public InputStreamWrapper(InputStream in) {
-        this.in = in;
-    }
-
-    @Override
-    public int available() throws IOException {
-        return in.available();
-    }
-
-    @Override
-    public void close() throws IOException {
-        in.close();
-    }
-
-    @Override
-    public synchronized void mark(int readlimit) {
-        in.mark(readlimit);
-    }
-
-    @Override
-    public boolean markSupported() {
-        return in.markSupported();
-    }
-
-    @Override
-    public synchronized int read() throws IOException {
-        return in.read();
-    }
-
-    @Override
-    public int read(@NonNull byte[] b) throws IOException {
-        return in.read(b);
-    }
-
-    @Override
-    public synchronized int read(@NonNull byte[] b, int off, int len) throws IOException {
-        return in.read(b, off, len);
-    }
-
-    @Override
-    public synchronized void reset() throws IOException {
-        in.reset();
-    }
-
-    @Override
-    public long skip(long n) throws IOException {
-        return in.skip(n);
-    }
-
-    @Override
-    public int hashCode() {
-        return in.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return in.equals(obj);
-    }
-
-    @Override
-    public String toString() {
-        return in.toString();
-    }
-}

app/src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java

@@ -1,24 +0,0 @@
-package com.topjohnwu.magisk.superuser;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.topjohnwu.magisk.components.Activity;
-
-public class RequestActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        if (intent == null) {
-            finish();
-            return;
-        }
-
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setClass(this, SuRequestActivity.class);
-        startActivity(intent);
-        finish();
-    }
-}

app/src/main/res/layout/list_item_app.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<android.support.v7.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:layout_marginBottom="@dimen/card_vertical_margin"
-    android:layout_marginEnd="@dimen/card_horizontal_margin"
-    android:layout_marginStart="@dimen/card_horizontal_margin"
-    android:layout_marginTop="@dimen/card_vertical_margin"
-    style="?attr/cardStyle"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    card_view:cardCornerRadius="@dimen/card_corner_radius"
-    card_view:cardElevation="@dimen/card_elevation">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:layout_gravity="center_vertical"
-        android:padding="@dimen/card_layout_padding">
-
-        <ImageView
-            android:id="@+id/app_icon"
-            android:layout_width="@dimen/card_appicon_size"
-            android:layout_height="@dimen/card_appicon_size"
-            android:layout_centerVertical="true"
-            android:scaleType="centerCrop"/>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_alignBottom="@+id/app_icon"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:paddingEnd="@dimen/card_appicon_size"
-            android:paddingStart="65dp"
-            android:weightSum="1">
-
-
-            <TextView
-                android:id="@+id/app_name"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:maxLines="1"
-                android:paddingEnd="3dp"
-                android:paddingStart="3dp"
-                android:textStyle="bold"/>
-
-            <TextView
-                android:id="@+id/app_package"
-                android:layout_width="fill_parent"
-                android:layout_height="25dp"
-                android:ellipsize="marquee"
-                android:gravity="center_vertical"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:paddingEnd="3dp"
-                android:paddingStart="3dp"
-                android:singleLine="true"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true">
-
-            <CheckBox
-                android:id="@+id/checkbox"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:focusable="false"
-                android:gravity="center"
-                android:src="@drawable/ic_menu_overflow_material"
-                android:checked="false" />
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-
-</android.support.v7.widget.CardView>
-
-

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

@@ -1,212 +0,0 @@
-<resources>
-    <!--Universal-->
-	
-    <!--Welcome Activity-->
-    <string name="modules">Moduli</string>
-    <string name="downloads">Download</string>
-    <string name="superuser">Superuser</string>
-    <string name="log">Registro eventi</string>
-    <string name="settings">Impostazioni</string>
-    <string name="install">Installa</string>
-
-    <!--Status Fragment-->
-    <string name="magisk_version_error">Magisk non installato</string>
-	
-    <string name="checking_for_updates">Controllo aggiornamenti…</string>
-    <string name="magisk_update_available">È disponibile Magisk v%1$s!</string>
-    <string name="invalid_update_channel">Canale di aggiornamento non valido</string>
-    <string name="safetyNet_check_text">Tocca per controllare SafetyNet</string>
-    <string name="checking_safetyNet_status">Controllo stato di SafetyNet</string>
-    <string name="safetyNet_check_success">Controllo di SafetyNet OK</string>
-    <string name="safetyNet_api_error">Errore API di SafetyNet</string>															   
-    <string name="safetyNet_network_loss">Connessione di rete persa</string>
-    <string name="safetyNet_service_disconnected">Il servizio è stato terminato</string>
-    <string name="safetyNet_res_invalid">La risposta non è valida</string>
-
-    <!--Install Fragment-->
-    <string name="advanced_settings_title">Impostazioni avanzate</string>
-    <string name="keep_force_encryption">Mantieni crittografia forzata</string>
-    <string name="keep_dm_verity">Mantieni dm-verity</string>
-    <string name="current_magisk_title">Versione installata: %1$s</string>
-    <string name="install_magisk_title">Ultima versione disponibile: %1$s</string>
-    <string name="uninstall">Disinstalla</string>
-    <string name="uninstall_magisk_title">Disinstalla Magisk</string>
-    <string name="uninstall_magisk_msg">Tutti i moduli verranno disabilitati/rimossi. Il root verrà rimosso e se il dispositivo non è crittografato è possibile che vengano crittografati tutti i dati</string>													  
-    <string name="update">Aggiorna %1$s</string>
-
-    <!--Module Fragment-->
-    <string name="no_info_provided">(Nessuna informazione)</string>
-    <string name="no_modules_found">Nessun modulo trovato</string>
-    <string name="update_file_created">Il modulo sarà aggiornato al prossimo riavvio</string>
-    <string name="remove_file_created">Il modulo sarà rimosso al prossimo riavvio</string>
-    <string name="remove_file_deleted">Il modulo non sarà rimosso al prossimo riavvio</string>
-    <string name="disable_file_created">Il modulo sarà disabilitato al prossimo riavvio</string>
-    <string name="disable_file_removed">Il modulo sarà abilitato al prossimo riavvio</string>
-    <string name="author">Creato da: %1$s</string>
-
-    <!--Repo Fragment-->
-    <string name="update_available">Aggiornamento disponibile</string>
-    <string name="installed">Installato</string>
-    <string name="not_installed">Non installato</string>
-
-    <!--Log Fragment-->
-    <string name="menuSaveLog">Salva registro eventi</string>
-    <string name="menuReload">Ricarica</string>
-    <string name="menuClearLog">Pulisci registro eventi</string>
-    <string name="logs_cleared">Registro eventi creato correttamente</string>
-    <string name="log_is_empty">Il registro eventi è vuoto</string>
-    <string name="logs_save_failed">Impossibile scrivere registro eventi nella SD</string>
-
-    <!--About Activity-->
-    <string name="about">Informazioni</string>
-    <string name="app_developers">Sviluppatori</string>
-    <string name="app_developers_"><![CDATA[App creata da <a href="https://github.com/topjohnwu">topjohnwu</a> in collaborazione con <a href="https://github.com/d8ahazard">Digitalhigh</a> e <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
-    <string name="app_changelog">Novità</string>
-    <string name="translators">Auanasgheps | Fabb2303 | bovirus</string>
-    <string name="app_version">Versione app</string>
-    <string name="app_source_code">Codice sorgente</string>
-    <string name="donation">Dona</string>
-    <string name="app_translators">Traduttori app</string>
-    <string name="support_thread">Supporto app</string>
-
-    <!--Toasts, Dialogs-->
-    <string name="permissionNotGranted">Questa funzione non sarà operativa senza il permesso di scrittura nella memoria di archiviazione esterna.</string>
-    <string name="no_thanks">No, grazie</string>
-    <string name="yes">Sì</string>
-    <string name="ok">OK</string>
-    <string name="close">Chiudi</string>
-    <string name="repo_install_title">Installazione %1$s</string>
-    <string name="repo_install_msg">Vuoi installare %1$s ?</string>
-    <string name="download">Download</string>
-    <string name="download_file_error">Errore nel download del file</string>
-    <string name="reboot">Riavvia</string>
-    <string name="downloading_toast">Download di %1$s</string>
-    <string name="magisk_update_title">Disponibile un nuovo aggiornamento di Magisk!</string>
-    <string name="settings_reboot_toast">Riavvia per applicare</string>
-    <string name="release_notes">Note di rilascio</string>
-    <string name="repo_cache_cleared">La cache delle repository è stata pulita</string>
-    <string name="safetyNet_hide_notice">Quest\'app usa SafetyNet\ned è già gestita da MagiskHide</string>
-    <string name="process_error">Errore di elaborazione</string>
-    <string name="internal_storage">Il file zip si trova in:\n[memoria interna]%1$s</string>
-    <string name="zip_download_title">Download in corso</string>
-    <string name="zip_download_msg">Download del file zip (%1$d%%) …</string>  
-    <string name="zip_process_title">Elaborazione</string> 
-    <string name="zip_process_msg">Elaborazione del file zip…</string>
-    <string name="manager_update_title">Nuovo aggiornamento di Magisk Manager disponibile!</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="magisk_updates">Aggiornamento Magisk</string>
-    <string name="flashing">Flash in corso…</string>
-    <string name="hide_manager_toast">Nascondendo Magisk Manager…</string>
-    <string name="hide_manager_toast2">Potrebbe volerci un po\'…</string>
-    <string name="hide_manager_fail_toast">Non è stato possibile nascondere Magisk Manager</string>
-    <string name="download_zip_only">Scarica solo il file zip</string>
-    <string name="patch_boot_file">Aggiorna l\'immagine di boot</string>
-    <string name="direct_install">Installazione diretta (raccomandata)</string>
-    <string name="install_second_slot">Installa nel secondo slot (dopo OTA)</string>
-    <string name="select_method">Seleziona un metodo</string>
-    <string name="no_boot_file_patch_support">La versione Magisk di destinazione non supporta l\'aggiornamento dell\'immagine di boot</string>
-    <string name="boot_file_patch_msg">Seleziona l\'immagine originale di boot in formato .img o img.tar</string>
-    <string name="complete_uninstall">Completa disinstallazione</string>
-    <string name="restore_stock_boot">Ripristina l\'immagine originale di boot</string>
-    <string name="restore_done">Ripristino completato!</string>
-    <string name="restore_fail">Non esiste un\'immagine originale di boot!</string>
-    <string name="uninstall_toast">Disinstallazione di Magisk Manager in 5 secondi, riavvia manualmente per completare</string>
-    <string name="proprietary_title">Scarica codice proprietario</string>
-    <string name="proprietary_notice">Magisk Manager è FOSS, quindi non contiene il codice proprietario delle API Google SafetyNet.\n\nVuoi permettere il download di un\'estensione (che contiene GoogleApiClient) per controllare lo stato di SafetyNet?</string>
-    <string name="su_db_corrupt">Il database SU è corrotto, un nuovo DB verrà ricreato</string>
-
-    <!--Settings Activity -->
-    <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_notification_title">Notifica aggiornamenti</string>
-    <string name="settings_notification_summary">Mostra una notifica quando sono disponibili aggiornamenti</string>
-    <string name="settings_clear_cache_title">Pulisci cache repository</string>
-    <string name="settings_clear_cache_summary">Pulisci la cache delle repository e 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 del pacchetto casuale</string>										 
-    <string name="language">Lingua</string>													   
-    <string name="system_default">(Predefinito)</string>
-    <string name="settings_update">Impostazioni di aggiornamento</string>
-    <string name="settings_update_channel_title">Canale di aggiornamento</string>
-    <string name="settings_update_stable">Stabile</string>
-    <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_boot_format_title">Formato dell\'immagine di boot aggiornata</string>    
-    <string name="settings_boot_format_summary">Seleziona il formato nel quale l\'immagine di boot verrà salvata.\nSeleziona .img per il flash in fastboot/download mode; Seleziona .img.tar per il flash con Odin.</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, MagiskHide e host systemless rimarranno abilitati</string>
-    <string name="settings_magiskhide_summary">Nasconde Magisk da numerose rilevazioni</string>			
-    <string name="settings_hosts_title">Host systemless</string>		
-    <string name="settings_hosts_summary">Supporto a host systemless per le app che bloccano le pubblicità</string>
-	
-    <string name="settings_su_app_adb">App e ADB</string>
-    <string name="settings_su_app">Solo app</string>
-    <string name="settings_su_adb">Solo ADB</string>
-    <string name="settings_su_disable">Disabilitato</string>
-    <string name="settings_su_request_10">10 secondi</string>
-    <string name="settings_su_request_20">20 secondi</string>
-    <string name="settings_su_request_30">30 secondi</string>
-    <string name="settings_su_request_60">60 secondi</string>
-    <string name="superuser_access">Accesso Superuser</string>
-    <string name="auto_response">Accesso predefinito</string>
-    <string name="request_timeout">Timeout richiesta</string>
-    <string name="superuser_notification">Notifica Superuser</string>
-    <string name="request_timeout_summary">%1$s secondi</string>
-    <string name="settings_su_reauth_title">Ri-autentica dopo un aggiornamento</string>
-    <string name="settings_su_reauth_summary">Ri-autentica i permessi Superuser dopo un aggiornamento dell\'app</string>
-    
-    <string name="multiuser_mode">Modalità multiutente</string>    
-    <string name="settings_owner_only">Solo proprietario del dispositivo</string>
-    <string name="settings_owner_manage">Gestito dal proprietario utente</string>
-    <string name="settings_user_independent">Utente indipendente</string>		
-    <string name="owner_only_summary">Solo il proprietario ha i permessi di root</string>
-    <string name="owner_manage_summary">Solo il proprietario può gestire accesso root e ricevere richieste</string>
-    <string name="user_indepenent_summary">Ogni utente ha le sue regole di root separate</string>
-    <string name="multiuser_hint_owner_request">Una richiesta è stata inviata al proprietario del dispositivo. Accedi come proprietario dispositivo e concedi i permessi.</string>														 
-    
-    <string name="mount_namespace_mode">Modalità mount Namespace</string>
-    <string name="settings_ns_global">Namespace globale</string>
-    <string name="settings_ns_requester">Namespace ereditato</string>
-    <string name="settings_ns_isolate">Namespace isolato</string>
-    <string name="global_summary">Tutte le sessioni di root erediteranno il Namespace globale</string>
-    <string name="requester_summary">Le sessioni di root erediteranno il Namespace del loro richiedente</string>
-    <string name="isolate_summary">Ogni sessione di root avrà il suo Namespace isolato</string>
-	
-    <!--Superuser-->
-    <string name="su_request_title">Richiesta Superuser</string>
-    <string name="deny_with_str">Nega %1$s</string>
-    <string name="deny">Nega</string>
-    <string name="prompt">Chiedi</string>
-    <string name="grant">Concedi</string>
-    <string name="su_warning">Concede il pieno accesso al dispositivo.\nNega se non sei sicuro</string>
-    <string name="forever">Sempre</string>
-    <string name="once">Una volta</string>
-    <string name="tenmin">10 minuti</string>
-    <string name="twentymin">20 minuti</string>
-    <string name="thirtymin">30 minuti</string>
-    <string name="sixtymin">60 minuti</string>
-    <string name="su_allow_toast">%1$s ha ottenuto i permessi Superuser</string>
-    <string name="su_deny_toast">%1$s non ha ottenuto i permessi Superuser</string>
-    <string name="no_apps_found">Nessuna app trovata</string>
-    <string name="su_snack_grant"> %1$s ha ottenuto i permessi Superuser</string>
-    <string name="su_snack_deny"> %1$s non ha ottenuto i permessi Superuser</string>
-    <string name="su_snack_notif_on">Notifiche per %1$s abilitate</string>
-    <string name="su_snack_notif_off">Notifiche per %1$s disabilitate</string>
-    <string name="su_snack_log_on">Registro eventi abilitato per %1$s</string>
-    <string name="su_snack_log_off">Registro eventi non abilitato per %1$s</string>
-    <string name="su_snack_revoke">I diritti di %1$s sono stati revocati</string>
-    <string name="su_revoke_title">Revocare?</string>
-    <string name="su_revoke_msg">Confermi la revoca dei diritti di %1$s?</string>
-    <string name="toast">Toast</string>
-    <string name="none">Nessuno</string>
-
-    <!--Superuser logs-->
-    <string name="pid">PID:\u0020</string>
-    <string name="target_uid">UID destinazione:\u0020</string>
-    <string name="command">Comando:\u0020</string>
-
-</resources>

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

@@ -1,148 +0,0 @@
-<resources>
-    <!--Universal-->
-
-    <!--Welcome Activity-->
-    <string name="modules">モジュール</string>
-    <string name="downloads">ダウンロード</string>
-    <string name="superuser">スーパーユーザー</string>
-    <string name="log">ログ</string>
-    <string name="settings">設定</string>
-    <string name="install">インストール</string>
-
-    <!--Status Fragment-->
-    <string name="magisk_version_error">Magisk がインストールされていません</string>
-
-    <string name="checking_for_updates">更新を確認中...</string>
-    <string name="magisk_update_available">Magisk v%1$s が利用可能です！</string>
-    <string name="safetyNet_check_text">タップしてSafetyNetチェックを開始</string>
-    <string name="checking_safetyNet_status">SafetyNet Statusをチェック中…</string>
-
-    <!--Install Fragment-->
-    <string name="advanced_settings_title">高度な設定</string>
-    <string name="keep_force_encryption">強制的な暗号化を維持する</string>
-    <string name="keep_dm_verity">dm-verityを維持する</string>
-    <string name="current_magisk_title">インストール済: %1$s</string>
-    <string name="install_magisk_title">最新: %1$s</string>
-    <string name="uninstall">アンインストール</string>
-    <string name="uninstall_magisk_title">Magiskをアンインストールします</string>
-
-    <!--Module Fragment-->
-    <string name="no_info_provided">(情報がありません)</string>
-    <string name="no_modules_found">モジュールが見つかりません</string>
-    <string name="update_file_created">次の再起動時にモジュールを更新する</string>
-    <string name="remove_file_created">次の再起動時にモジュールを削除する</string>
-    <string name="remove_file_deleted">次の再起動時にモジュールを削除しない</string>
-    <string name="disable_file_created">次の再起動時にモジュールを無効にする</string>
-    <string name="disable_file_removed">次の再起動時にモジュールを有効にする</string>
-    <string name="author">作者: %1$s</string>
-
-    <!--Repo Fragment-->
-    <string name="update_available">利用可能な更新</string>
-    <string name="installed">インストール済</string>
-    <string name="not_installed">未インストール</string>
-
-    <!--Log Fragment-->
-    <string name="menuSaveLog">ログ保存</string>
-    <string name="menuReload">リロード</string>
-    <string name="menuClearLog">ログを消去する</string>
-    <string name="logs_cleared">ログは正常にクリアされました</string>
-    <string name="log_is_empty">ログは空です</string>
-    <string name="logs_save_failed">SDカードにログを書き込むことができません:</string>
-
-    <!--About Activity-->
-    <string name="about">このアプリについて</string>
-    <string name="app_developers">主な開発者</string>
-    <string name="app_developers_"><![CDATA[このアプリは<a href="https://github.com/topjohnwu">topjohnwu</a>と<a href="https://github.com/d8ahazard">Digitalhigh</a>と<a href="https://github.com/dvdandroid">Dvdandroid</a>によって作られました。]]></string>
-    <string name="app_changelog">アプリの更新履歴</string>
-    <string name="translators">神楽坂桜（Sakura_Sa233#Twitter）/ hota (@lindwurm)</string>
-    <string name="app_version">アプリのバージョン</string>
-    <string name="app_source_code">ソースコード</string>
-    <string name="donation">寄付</string>
-    <string name="app_translators">アプリの翻訳者</string>
-    <string name="support_thread">サポートスレッド</string>
-
-    <!--Toasts, Dialogs-->
-    <string name="permissionNotGranted">この機能は外部ストレージへの書き込み権限がないと作動しません</string>
-    <string name="no_thanks">いいえ</string>
-    <string name="yes">はい</string>
-    <string name="ok">OK</string>
-    <string name="close">閉じる</string>
-    <string name="repo_install_title">%1$s をインストール</string>
-    <string name="repo_install_msg">%1$s をインストールしますか？</string>
-    <string name="download">ダウンロード</string>
-    <string name="download_file_error">ダウンロード中にエラーが発生しました</string>
-    <string name="reboot">再起動</string>
-    <string name="zip_process_msg">zipファイルの処理中…</string>
-    <string name="downloading_toast">%1$s をダウンロード中</string>
-    <string name="magisk_update_title">新しいMagiskの更新が利用可能です！</string>
-    <string name="settings_reboot_toast">再起動して設定を適用する</string>
-    <string name="release_notes">リリースノート</string>
-    <string name="repo_cache_cleared">リポジトリキャッシュを消去しました</string>
-    <string name="safetyNet_hide_notice">このアプリはSafetyNetを使用しています。\n既定ではMagiskHideで既に処理されています</string>
-    <string name="process_error">プロセスエラー</string>
-    <string name="internal_storage">zipは:\n[Internal Storage]%1$sに保存されます</string>
-    <string name="zip_process_title">処理</string>
-
-    <!--Settings Activity -->
-    <string name="settings_general_category">一般</string>
-    <string name="settings_dark_theme_title">ダークテーマ</string>
-    <string name="settings_dark_theme_summary">ダークテーマを有効にする</string>
-    <string name="settings_notification_title">更新通知</string>
-    <string name="settings_notification_summary">新しいバージョンが利用可能になったときに通知する</string>
-    <string name="settings_clear_cache_title">キャッシュを消去</string>
-    <string name="settings_clear_cache_summary">オンラインリポジトリのキャッシュされた情報をクリアし、アプリをオンラインで更新する</string>
-
-    <string name="settings_core_only_title">Magisk コアモード</string>
-    <string name="settings_core_only_summary">コア機能のみを有効にすると、すべてのモジュールがロードされなくなります。 MagiskSU、MagiskHide、systemless hostsは引き続き有効になります。</string>
-    <string name="settings_magiskhide_summary">さまざまな検出からMagiskを隠す</string>
-    <string name="settings_hosts_title">Systemless hosts</string>
-    <string name="settings_hosts_summary">AdblockのためのSystemless hostsサポート</string>
-
-    <string name="settings_su_app_adb">アプリとADB</string>
-    <string name="settings_su_app">アプリのみ</string>
-    <string name="settings_su_adb">ADBのみ</string>
-    <string name="settings_su_disable">無効</string>
-    <string name="settings_su_request_10">10秒</string>
-    <string name="settings_su_request_20">20秒</string>
-    <string name="settings_su_request_30">30秒</string>
-    <string name="settings_su_request_60">60秒</string>
-    <string name="superuser_access">スーパーユーザーアクセス</string>
-    <string name="auto_response">自動反応</string>
-    <string name="request_timeout">リクエストタイムアウト</string>
-    <string name="superuser_notification">スーパーユーザー通知</string>
-    <string name="request_timeout_summary">%1$s秒</string>
-
-    <!--Superuser-->
-    <string name="su_request_title">スーパーユーザーリクエスト</string>
-    <string name="deny_with_str">拒否 %1$s</string>
-    <string name="deny">拒否</string>
-    <string name="prompt">プロンプト</string>
-    <string name="grant">許可</string>
-    <string name="su_warning">端末への完全なアクセスを許可します。\nもし確信が持てなければ拒否してください！</string>
-    <string name="forever">今後も</string>
-    <string name="once">一度だけ</string>
-    <string name="tenmin">10分</string>
-    <string name="twentymin">20分</string>
-    <string name="thirtymin">30分</string>
-    <string name="sixtymin">60分</string>
-    <string name="su_allow_toast">%1$s はスーパーユーザー権限を許可されました</string>
-    <string name="su_deny_toast">%1$s はスーパーユーザー権限を拒否されました</string>
-    <string name="no_apps_found">アプリが見つかりません</string>
-    <string name="su_snack_grant">%1$s のスーパーユーザー権限が許可されました</string>
-    <string name="su_snack_deny">%1$s のスーパーユーザー権限は拒否されました</string>
-    <string name="su_snack_notif_on">%1$s の通知は有効です</string>
-    <string name="su_snack_notif_off">%1$s の通知は無効です</string>
-    <string name="su_snack_log_on">%1$s のログは有効です</string>
-    <string name="su_snack_log_off">%1$s のログは無効です</string>
-    <string name="su_snack_revoke">%1$s の権限は取り消されました</string>
-    <string name="su_revoke_title">確認</string>
-    <string name="su_revoke_msg">%1$s の権限を取り消すことを承認しますか？</string>
-    <string name="toast">トースト通知</string>
-    <string name="none">なし</string>
-
-    <!--Superuser logs-->
-    <string name="pid">PID:\u0020</string>
-    <string name="target_uid">ターゲット UID:\u0020</string>
-    <string name="command">コマンド:\u0020</string>
-
-</resources>

build.gradle

@@ -1,18 +1,67 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: 'com.android.application'
 
-buildscript {
-    repositories {
-        jcenter()
-        google()
+android {
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
+
+    defaultConfig {
+        applicationId "com.topjohnwu.magisk"
+        minSdkVersion 21
+        targetSdkVersion 27
+        versionCode 91
+        versionName "5.5.5"
+        ndk {
+            moduleName 'zipadjust'
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+        }
+        javaCompileOptions {
+            annotationProcessorOptions {
+                argument('butterknife.debuggable', 'false')
+            }
+        }
     }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
 
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+    buildTypes {
+        release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    dexOptions {
+        preDexLibraries true
+        javaMaxHeapSize "2g"
+    }
+    externalNativeBuild {
+        cmake {
+            path 'src/main/jni/CMakeLists.txt'
+        }
+    }
+    lintOptions {
+        disable 'MissingTranslation'
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+repositories {
+    jcenter()
+    google()
+    maven { url "https://jitpack.io" }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':crypto')
+    implementation 'com.android.support:recyclerview-v7:27.0.2'
+    implementation 'com.android.support:cardview-v7:27.0.2'
+    implementation 'com.android.support:design:27.0.2'
+    implementation 'com.android.support:support-v4:27.0.2'
+    implementation 'com.jakewharton:butterknife:8.8.1'
+    implementation 'com.atlassian.commonmark:commonmark:0.10.0'
+    implementation 'org.kamranzafar:jtar:2.3'
+    implementation 'com.google.code.gson:gson:2.8.2'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 }

crypto/.gitignore

@@ -1 +0,0 @@
-/build

crypto/build.gradle

@@ -1,38 +0,0 @@
-apply plugin: 'java-library'
-
-apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'java'
-
-sourceCompatibility = "1.8"
-targetCompatibility = "1.8"
-
-jar {
-    manifest {
-        attributes 'Main-Class': 'com.topjohnwu.crypto.ZipSigner'
-    }
-}
-
-shadowJar {
-    baseName = 'zipsigner'
-    classifier = null
-    version = 1.0
-}
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
-    }
-}
-
-repositories {
-    jcenter()
-}
-
-dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.58'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.58'
-}

crypto/src/main/java/com/topjohnwu/crypto/ByteArrayStream.java

@@ -1,34 +0,0 @@
-package com.topjohnwu.crypto;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class ByteArrayStream extends ByteArrayOutputStream {
-    public byte[] getBuf() {
-        return buf;
-    }
-    public synchronized void readFrom(InputStream is) {
-        readFrom(is, Integer.MAX_VALUE);
-    }
-    public synchronized void readFrom(InputStream is, int len) {
-        int read;
-        byte buffer[] = new byte[4096];
-        try {
-            while ((read = is.read(buffer, 0, len < buffer.length ? len : buffer.length)) > 0) {
-                write(buffer, 0, read);
-                len -= read;
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-    public synchronized void writeTo(OutputStream out, int off, int len) throws IOException {
-        out.write(buf, off, len);
-    }
-    public ByteArrayInputStream getInputStream() {
-        return new ByteArrayInputStream(buf, 0, count);
-    }
-}

crypto/src/main/java/com/topjohnwu/crypto/CryptoUtils.java

@@ -1,136 +0,0 @@
-package com.topjohnwu.crypto;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Signature;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.spec.ECPrivateKeySpec;
-import java.security.spec.ECPublicKeySpec;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-class CryptoUtils {
-
-    private static final Map<String, String> ID_TO_ALG;
-    private static final Map<String, String> ALG_TO_ID;
-
-    static {
-        ID_TO_ALG = new HashMap<>();
-        ALG_TO_ID = new HashMap<>();
-        ID_TO_ALG.put(X9ObjectIdentifiers.ecdsa_with_SHA256.getId(), "SHA256withECDSA");
-        ID_TO_ALG.put(X9ObjectIdentifiers.ecdsa_with_SHA384.getId(), "SHA384withECDSA");
-        ID_TO_ALG.put(X9ObjectIdentifiers.ecdsa_with_SHA512.getId(), "SHA512withECDSA");
-        ID_TO_ALG.put(PKCSObjectIdentifiers.sha1WithRSAEncryption.getId(), "SHA1withRSA");
-        ID_TO_ALG.put(PKCSObjectIdentifiers.sha256WithRSAEncryption.getId(), "SHA256withRSA");
-        ID_TO_ALG.put(PKCSObjectIdentifiers.sha512WithRSAEncryption.getId(), "SHA512withRSA");
-        ALG_TO_ID.put("SHA256withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA256.getId());
-        ALG_TO_ID.put("SHA384withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384.getId());
-        ALG_TO_ID.put("SHA512withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512.getId());
-        ALG_TO_ID.put("SHA1withRSA", PKCSObjectIdentifiers.sha1WithRSAEncryption.getId());
-        ALG_TO_ID.put("SHA256withRSA", PKCSObjectIdentifiers.sha256WithRSAEncryption.getId());
-        ALG_TO_ID.put("SHA512withRSA", PKCSObjectIdentifiers.sha512WithRSAEncryption.getId());
-    }
-
-    private static String getSignatureAlgorithm(Key key) throws Exception {
-        if ("EC".equals(key.getAlgorithm())) {
-            int curveSize;
-            KeyFactory factory = KeyFactory.getInstance("EC");
-            if (key instanceof PublicKey) {
-                ECPublicKeySpec spec = factory.getKeySpec(key, ECPublicKeySpec.class);
-                curveSize = spec.getParams().getCurve().getField().getFieldSize();
-            } else if (key instanceof PrivateKey) {
-                ECPrivateKeySpec spec = factory.getKeySpec(key, ECPrivateKeySpec.class);
-                curveSize = spec.getParams().getCurve().getField().getFieldSize();
-            } else {
-                throw new InvalidKeySpecException();
-            }
-            if (curveSize <= 256) {
-                return "SHA256withECDSA";
-            } else if (curveSize <= 384) {
-                return "SHA384withECDSA";
-            } else {
-                return "SHA512withECDSA";
-            }
-        } else if ("RSA".equals(key.getAlgorithm())) {
-            return "SHA256withRSA";
-        } else {
-            throw new IllegalArgumentException("Unsupported key type " + key.getAlgorithm());
-        }
-    }
-
-    static AlgorithmIdentifier getSignatureAlgorithmIdentifier(Key key) throws Exception {
-        String id = ALG_TO_ID.get(getSignatureAlgorithm(key));
-        if (id == null) {
-            throw new IllegalArgumentException("Unsupported key type " + key.getAlgorithm());
-        }
-        return new AlgorithmIdentifier(new ASN1ObjectIdentifier(id));
-    }
-
-    static boolean verify(PublicKey key, byte[] input, byte[] signature,
-                          AlgorithmIdentifier algId) throws Exception {
-        String algName = ID_TO_ALG.get(algId.getAlgorithm().getId());
-        if (algName == null) {
-            throw new IllegalArgumentException("Unsupported algorithm " + algId.getAlgorithm());
-        }
-        Signature verifier = Signature.getInstance(algName);
-        verifier.initVerify(key);
-        verifier.update(input);
-        return verifier.verify(signature);
-    }
-
-    static byte[] sign(PrivateKey privateKey, byte[] input) throws Exception {
-        Signature signer = Signature.getInstance(getSignatureAlgorithm(privateKey));
-        signer.initSign(privateKey);
-        signer.update(input);
-        return signer.sign();
-    }
-
-    static X509Certificate readPublicKey(InputStream input)
-            throws IOException, GeneralSecurityException {
-        try {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            return (X509Certificate) cf.generateCertificate(input);
-        } finally {
-            input.close();
-        }
-    }
-
-    /** Read a PKCS#8 format private key. */
-    static PrivateKey readPrivateKey(InputStream input)
-            throws IOException, GeneralSecurityException {
-        try {
-            byte[] buffer = new byte[4096];
-            int size = input.read(buffer);
-            byte[] bytes = Arrays.copyOf(buffer, size);
-            /* Check to see if this is in an EncryptedPrivateKeyInfo structure. */
-            PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(bytes);
-            /*
-             * Now it's in a PKCS#8 PrivateKeyInfo structure. Read its Algorithm
-             * OID and use that to construct a KeyFactory.
-             */
-            ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(spec.getEncoded()));
-            PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());
-            String algOid = pki.getPrivateKeyAlgorithm().getAlgorithm().getId();
-            return KeyFactory.getInstance(algOid).generatePrivate(spec);
-        } finally {
-            input.close();
-        }
-    }
-}

crypto/src/main/java/com/topjohnwu/crypto/JarMap.java

@@ -1,153 +0,0 @@
-package com.topjohnwu.crypto;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.LinkedHashMap;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-/*
-* A universal random access interface for both JarFile and JarInputStream
-*
-* In the case when JarInputStream is provided to constructor, the whole stream
-* will be loaded into memory for random access purposes.
-* On the other hand, when a JarFile is provided, it simply works as a wrapper.
-* */
-
-public class JarMap implements Closeable, AutoCloseable {
-    private JarFile jarFile;
-    private JarInputStream jis;
-    private InputStream is;
-    private File file;
-    private boolean isInputStream = false, hasLoaded = false, verify;
-    private LinkedHashMap<String, JarEntry> bufMap = new LinkedHashMap<>();
-
-    public JarMap(File file) throws IOException {
-        this(file, true);
-    }
-
-    public JarMap(File file, boolean verify) throws IOException {
-        this(file, verify, ZipFile.OPEN_READ);
-    }
-
-    public JarMap(File file, boolean verify, int mode) throws IOException {
-        this.file = file;
-        jarFile = new JarFile(file, verify, mode);
-    }
-
-    public JarMap(String name) throws IOException {
-        this(new File(name));
-    }
-
-    public JarMap(String name, boolean verify) throws IOException {
-        this(new File(name), verify);
-    }
-
-    public JarMap(InputStream is) throws IOException {
-        this(is, true);
-    }
-
-    public JarMap(InputStream is, boolean verify) throws IOException {
-        isInputStream = true;
-        this.is = is;
-        this.verify = verify;
-    }
-
-    private void loadJarInputStream() {
-        if (!isInputStream || hasLoaded) return;
-        hasLoaded = true;
-        JarEntry entry;
-        try {
-            jis = new JarInputStream(is, verify);
-            while ((entry = jis.getNextJarEntry()) != null) {
-                bufMap.put(entry.getName(), new JarMapEntry(entry, jis));
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public InputStream getInputStream() {
-        try {
-            return isInputStream ? is : new FileInputStream(file);
-        } catch (FileNotFoundException e) {
-            return null;
-        }
-    }
-
-    public Manifest getManifest() throws IOException {
-        loadJarInputStream();
-        return isInputStream ? jis.getManifest() : jarFile.getManifest();
-    }
-
-    public InputStream getInputStream(ZipEntry ze) throws IOException {
-        loadJarInputStream();
-        return isInputStream ? ((JarMapEntry) bufMap.get(ze.getName())).getInputStream() :
-                jarFile.getInputStream(ze);
-    }
-
-    public OutputStream getOutputStream(ZipEntry ze) {
-        if (!isInputStream) // Only support inputstream mode
-            return null;
-        loadJarInputStream();
-        ByteArrayStream bs = ((JarMapEntry) bufMap.get(ze.getName())).data;
-        bs.reset();
-        return bs;
-    }
-
-    public byte[] getRawData(ZipEntry ze) throws IOException {
-        if (isInputStream) {
-            loadJarInputStream();
-            return ((JarMapEntry) bufMap.get(ze.getName())).data.toByteArray();
-        } else {
-            ByteArrayStream bytes = new ByteArrayStream();
-            bytes.readFrom(jarFile.getInputStream(ze));
-            return bytes.toByteArray();
-        }
-    }
-
-    public Enumeration<JarEntry> entries() {
-        loadJarInputStream();
-        return isInputStream ? Collections.enumeration(bufMap.values()) : jarFile.entries();
-    }
-
-    public ZipEntry getEntry(String name) {
-        return getJarEntry(name);
-    }
-
-    public JarEntry getJarEntry(String name) {
-        loadJarInputStream();
-        return isInputStream ? bufMap.get(name) : jarFile.getJarEntry(name);
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (isInputStream)
-            is.close();
-        else
-            jarFile.close();
-    }
-
-    private static class JarMapEntry extends JarEntry {
-        ByteArrayStream data;
-        JarMapEntry(JarEntry je, InputStream is) {
-            super(je);
-            data = new ByteArrayStream();
-            data.readFrom(is);
-        }
-        InputStream getInputStream() {
-            return data.getInputStream();
-        }
-    }
-}

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

@@ -1,494 +0,0 @@
-package com.topjohnwu.crypto;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-import org.bouncycastle.cms.CMSTypedData;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.encoders.Base64;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.security.DigestOutputStream;
-import java.security.GeneralSecurityException;
-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;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.jar.Attributes;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.regex.Pattern;
-
-/*
-* Modified from from AOSP(Marshmallow) SignAPK.java
-* */
-
-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";
-
-    public static Provider sBouncyCastleProvider;
-    // 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;
-
-    static {
-        sBouncyCastleProvider = new BouncyCastleProvider();
-        Security.insertProviderAt(sBouncyCastleProvider, 1);
-    }
-
-    public static void signZip(InputStream publicIn, InputStream privateIn,
-                               JarMap input, File output, boolean minSign) throws Exception {
-        int alignment = 4;
-        BufferedOutputStream outputFile;
-        int hashes = 0;
-        X509Certificate publicKey = CryptoUtils.readPublicKey(publicIn);
-        hashes |= getDigestAlgorithm(publicKey);
-
-        // Set the ZIP file timestamp to the starting valid time
-        // of the 0th certificate plus one hour (to match what
-        // we've historically done).
-        long timestamp = publicKey.getNotBefore().getTime() + 3600L * 1000;
-        PrivateKey privateKey = CryptoUtils.readPrivateKey(privateIn);
-
-        outputFile = new BufferedOutputStream(new FileOutputStream(output));
-        if (minSign) {
-            signWholeFile(input.getInputStream(), publicKey, privateKey, outputFile);
-        } else {
-            JarOutputStream outputJar = new JarOutputStream(outputFile);
-            // For signing .apks, use the maximum compression to make
-            // them as small as possible (since they live forever on
-            // the system partition).  For OTA packages, use the
-            // default compression level, which is much much faster
-            // and produces output that is only a tiny bit larger
-            // (~0.1% on full OTA packages I tested).
-            outputJar.setLevel(9);
-            Manifest manifest = addDigestsToManifest(input, hashes);
-            copyFiles(manifest, input, outputJar, timestamp, alignment);
-            signFile(manifest, input, publicKey, privateKey, outputJar);
-            outputJar.close();
-        }
-        input.close();
-        outputFile.close();
-    }
-
-    /**
-     * Return one of USE_SHA1 or USE_SHA256 according to the signature
-     * algorithm specified in the cert.
-     */
-    private static int getDigestAlgorithm(X509Certificate cert) {
-        String sigAlg = cert.getSigAlgName().toUpperCase(Locale.US);
-        if ("SHA1WITHRSA".equals(sigAlg) ||
-                "MD5WITHRSA".equals(sigAlg)) {     // see "HISTORICAL NOTE" above.
-            return USE_SHA1;
-        } else if (sigAlg.startsWith("SHA256WITH")) {
-            return USE_SHA256;
-        } else {
-            throw new IllegalArgumentException("unsupported signature algorithm \"" + sigAlg +
-                    "\" in cert [" + cert.getSubjectDN());
-        }
-    }
-    /** Returns the expected signature algorithm for this key type. */
-    private static String getSignatureAlgorithm(X509Certificate cert) {
-        String sigAlg = cert.getSigAlgName().toUpperCase(Locale.US);
-        String keyType = cert.getPublicKey().getAlgorithm().toUpperCase(Locale.US);
-        if ("RSA".equalsIgnoreCase(keyType)) {
-            if (getDigestAlgorithm(cert) == USE_SHA256) {
-                return "SHA256withRSA";
-            } else {
-                return "SHA1withRSA";
-            }
-        } else if ("EC".equalsIgnoreCase(keyType)) {
-            return "SHA256withECDSA";
-        } else {
-            throw new IllegalArgumentException("unsupported key type: " + keyType);
-        }
-    }
-    // Files matching this pattern are not copied to the output.
-    private static Pattern stripPattern =
-            Pattern.compile("^(META-INF/((.*)[.](SF|RSA|DSA|EC)|com/android/otacert))|(" +
-                    Pattern.quote(JarFile.MANIFEST_NAME) + ")$");
-
-    /**
-     * Add the hash(es) of every file to the manifest, creating it if
-     * necessary.
-     */
-    private static Manifest addDigestsToManifest(JarMap jar, int hashes)
-            throws IOException, GeneralSecurityException {
-        Manifest input = jar.getManifest();
-        Manifest output = new Manifest();
-        Attributes main = output.getMainAttributes();
-        if (input != null) {
-            main.putAll(input.getMainAttributes());
-        } else {
-            main.putValue("Manifest-Version", "1.0");
-            main.putValue("Created-By", "1.0 (Android SignApk)");
-        }
-        MessageDigest md_sha1 = null;
-        MessageDigest md_sha256 = null;
-        if ((hashes & USE_SHA1) != 0) {
-            md_sha1 = MessageDigest.getInstance("SHA1");
-        }
-        if ((hashes & USE_SHA256) != 0) {
-            md_sha256 = MessageDigest.getInstance("SHA256");
-        }
-        byte[] buffer = new byte[4096];
-        int num;
-        // We sort the input entries by name, and add them to the
-        // output manifest in sorted order.  We expect that the output
-        // map will be deterministic.
-        TreeMap<String, JarEntry> byName = new TreeMap<String, JarEntry>();
-        for (Enumeration<JarEntry> e = jar.entries(); e.hasMoreElements(); ) {
-            JarEntry entry = e.nextElement();
-            byName.put(entry.getName(), entry);
-        }
-        for (JarEntry entry: byName.values()) {
-            String name = entry.getName();
-            if (!entry.isDirectory() &&
-                    (stripPattern == null || !stripPattern.matcher(name).matches())) {
-                InputStream data = jar.getInputStream(entry);
-                while ((num = data.read(buffer)) > 0) {
-                    if (md_sha1 != null) md_sha1.update(buffer, 0, num);
-                    if (md_sha256 != null) md_sha256.update(buffer, 0, num);
-                }
-                Attributes attr = null;
-                if (input != null) attr = input.getAttributes(name);
-                attr = attr != null ? new Attributes(attr) : new Attributes();
-                if (md_sha1 != null) {
-                    attr.putValue("SHA1-Digest",
-                            new String(Base64.encode(md_sha1.digest()), "ASCII"));
-                }
-                if (md_sha256 != null) {
-                    attr.putValue("SHA-256-Digest",
-                            new String(Base64.encode(md_sha256.digest()), "ASCII"));
-                }
-                output.getEntries().put(name, attr);
-            }
-        }
-        return output;
-    }
-
-    /** Write to another stream and track how many bytes have been
-     *  written.
-     */
-    private static class CountOutputStream extends FilterOutputStream {
-        private int mCount;
-        public CountOutputStream(OutputStream out) {
-            super(out);
-            mCount = 0;
-        }
-        @Override
-        public void write(int b) throws IOException {
-            super.write(b);
-            mCount++;
-        }
-        @Override
-        public void write(byte[] b, int off, int len) throws IOException {
-            super.write(b, off, len);
-            mCount += len;
-        }
-        public int size() {
-            return mCount;
-        }
-    }
-    /** Write a .SF file with a digest of the specified manifest. */
-    private static void writeSignatureFile(Manifest manifest, OutputStream out,
-                                           int hash)
-            throws IOException, GeneralSecurityException {
-        Manifest sf = new Manifest();
-        Attributes main = sf.getMainAttributes();
-        main.putValue("Signature-Version", "1.0");
-        main.putValue("Created-By", "1.0 (Android SignApk)");
-        MessageDigest md = MessageDigest.getInstance(
-                hash == USE_SHA256 ? "SHA256" : "SHA1");
-        PrintStream print = new PrintStream(
-                new DigestOutputStream(new ByteArrayOutputStream(), md),
-                true, "UTF-8");
-        // Digest of the entire manifest
-        manifest.write(print);
-        print.flush();
-        main.putValue(hash == USE_SHA256 ? "SHA-256-Digest-Manifest" : "SHA1-Digest-Manifest",
-                new String(Base64.encode(md.digest()), "ASCII"));
-        Map<String, Attributes> entries = manifest.getEntries();
-        for (Map.Entry<String, Attributes> entry : entries.entrySet()) {
-            // Digest of the manifest stanza for this entry.
-            print.print("Name: " + entry.getKey() + "\r\n");
-            for (Map.Entry<Object, Object> att : entry.getValue().entrySet()) {
-                print.print(att.getKey() + ": " + att.getValue() + "\r\n");
-            }
-            print.print("\r\n");
-            print.flush();
-            Attributes sfAttr = new Attributes();
-            sfAttr.putValue(hash == USE_SHA256 ? "SHA-256-Digest" : "SHA1-Digest-Manifest",
-                    new String(Base64.encode(md.digest()), "ASCII"));
-            sf.getEntries().put(entry.getKey(), sfAttr);
-        }
-        CountOutputStream cout = new CountOutputStream(out);
-        sf.write(cout);
-        // A bug in the java.util.jar implementation of Android platforms
-        // up to version 1.6 will cause a spurious IOException to be thrown
-        // if the length of the signature file is a multiple of 1024 bytes.
-        // As a workaround, add an extra CRLF in this case.
-        if ((cout.size() % 1024) == 0) {
-            cout.write('\r');
-            cout.write('\n');
-        }
-    }
-    /** Sign data and write the digital signature to 'out'. */
-    private static void writeSignatureBlock(
-            CMSTypedData data, X509Certificate publicKey, PrivateKey privateKey,
-            OutputStream out)
-            throws IOException,
-            CertificateEncodingException,
-            OperatorCreationException,
-            CMSException {
-        ArrayList<X509Certificate> certList = new ArrayList<>(1);
-        certList.add(publicKey);
-        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()
-                                .setProvider(sBouncyCastleProvider)
-                                .build())
-                        .setDirectSignature(true)
-                        .build(signer, publicKey));
-        gen.addCertificates(certs);
-        CMSSignedData sigData = gen.generate(data, false);
-        ASN1InputStream asn1 = new ASN1InputStream(sigData.getEncoded());
-        DEROutputStream dos = new DEROutputStream(out);
-        dos.writeObject(asn1.readObject());
-    }
-    /**
-     * Copy all the files in a manifest from input to output.  We set
-     * the modification times in the output to a fixed time, so as to
-     * reduce variation in the output file and make incremental OTAs
-     * more efficient.
-     */
-    private static void copyFiles(Manifest manifest, JarMap in, JarOutputStream out,
-                                  long timestamp, int alignment) throws IOException {
-        byte[] buffer = new byte[4096];
-        int num;
-        Map<String, Attributes> entries = manifest.getEntries();
-        ArrayList<String> names = new ArrayList<>(entries.keySet());
-        Collections.sort(names);
-        boolean firstEntry = true;
-        long offset = 0L;
-        // We do the copy in two passes -- first copying all the
-        // entries that are STORED, then copying all the entries that
-        // have any other compression flag (which in practice means
-        // DEFLATED).  This groups all the stored entries together at
-        // the start of the file and makes it easier to do alignment
-        // on them (since only stored entries are aligned).
-        for (String name : names) {
-            JarEntry inEntry = in.getJarEntry(name);
-            JarEntry outEntry = null;
-            if (inEntry.getMethod() != JarEntry.STORED) continue;
-            // Preserve the STORED method of the input entry.
-            outEntry = new JarEntry(inEntry);
-            outEntry.setTime(timestamp);
-            // 'offset' is the offset into the file at which we expect
-            // the file data to begin.  This is the value we need to
-            // make a multiple of 'alignement'.
-            offset += JarFile.LOCHDR + outEntry.getName().length();
-            if (firstEntry) {
-                // The first entry in a jar file has an extra field of
-                // four bytes that you can't get rid of; any extra
-                // data you specify in the JarEntry is appended to
-                // these forced four bytes.  This is JAR_MAGIC in
-                // JarOutputStream; the bytes are 0xfeca0000.
-                offset += 4;
-                firstEntry = false;
-            }
-            if (alignment > 0 && (offset % alignment != 0)) {
-                // Set the "extra data" of the entry to between 1 and
-                // alignment-1 bytes, to make the file data begin at
-                // an aligned offset.
-                int needed = alignment - (int)(offset % alignment);
-                outEntry.setExtra(new byte[needed]);
-                offset += needed;
-            }
-            out.putNextEntry(outEntry);
-            InputStream data = in.getInputStream(inEntry);
-            while ((num = data.read(buffer)) > 0) {
-                out.write(buffer, 0, num);
-                offset += num;
-            }
-            out.flush();
-        }
-        // Copy all the non-STORED entries.  We don't attempt to
-        // maintain the 'offset' variable past this point; we don't do
-        // alignment on these entries.
-        for (String name : names) {
-            JarEntry inEntry = in.getJarEntry(name);
-            JarEntry outEntry = null;
-            if (inEntry.getMethod() == JarEntry.STORED) continue;
-            // Create a new entry so that the compressed len is recomputed.
-            outEntry = new JarEntry(name);
-            outEntry.setTime(timestamp);
-            out.putNextEntry(outEntry);
-            InputStream data = in.getInputStream(inEntry);
-            while ((num = data.read(buffer)) > 0) {
-                out.write(buffer, 0, num);
-            }
-            out.flush();
-        }
-    }
-
-    // This class is to provide a file's content, but trimming out the last two bytes
-    // Used for signWholeFile
-    private static class CMSProcessableFile implements CMSTypedData {
-
-        private InputStream is;
-        private ASN1ObjectIdentifier type;
-        ByteArrayStream bos;
-
-        CMSProcessableFile(InputStream is) {
-            this.is = is;
-            type = new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId());
-            bos = new ByteArrayStream();
-            bos.readFrom(is);
-        }
-
-        @Override
-        public ASN1ObjectIdentifier getContentType() {
-            return type;
-        }
-
-        @Override
-        public void write(OutputStream out) throws IOException, CMSException {
-            bos.writeTo(out, 0, bos.size() - 2);
-        }
-
-        @Override
-        public Object getContent() {
-            return is;
-        }
-
-        byte[] getTail() {
-            return Arrays.copyOfRange(bos.getBuf(), bos.size() - 22, bos.size());
-        }
-    }
-
-    private static void signWholeFile(InputStream input, X509Certificate publicKey,
-                                      PrivateKey privateKey, OutputStream outputStream)
-            throws Exception {
-        ByteArrayOutputStream temp = new ByteArrayOutputStream();
-        // put a readable message and a null char at the start of the
-        // archive comment, so that tools that display the comment
-        // (hopefully) show something sensible.
-        // TODO: anything more useful we can put in this message?
-        byte[] message = "signed by SignApk".getBytes("UTF-8");
-        temp.write(message);
-        temp.write(0);
-
-        CMSProcessableFile cmsFile = new CMSProcessableFile(input);
-        writeSignatureBlock(cmsFile, publicKey, privateKey, temp);
-
-        // For a zip with no archive comment, the
-        // end-of-central-directory record will be 22 bytes long, so
-        // we expect to find the EOCD marker 22 bytes from the end.
-        byte[] zipData = cmsFile.getTail();
-        if (zipData[zipData.length-22] != 0x50 ||
-                zipData[zipData.length-21] != 0x4b ||
-                zipData[zipData.length-20] != 0x05 ||
-                zipData[zipData.length-19] != 0x06) {
-            throw new IllegalArgumentException("zip data already has an archive comment");
-        }
-        int total_size = temp.size() + 6;
-        if (total_size > 0xffff) {
-            throw new IllegalArgumentException("signature is too big for ZIP file comment");
-        }
-        // signature starts this many bytes from the end of the file
-        int signature_start = total_size - message.length - 1;
-        temp.write(signature_start & 0xff);
-        temp.write((signature_start >> 8) & 0xff);
-        // Why the 0xff bytes?  In a zip file with no archive comment,
-        // bytes [-6:-2] of the file are the little-endian offset from
-        // the start of the file to the central directory.  So for the
-        // two high bytes to be 0xff 0xff, the archive would have to
-        // be nearly 4GB in size.  So it's unlikely that a real
-        // commentless archive would have 0xffs here, and lets us tell
-        // an old signed archive from a new one.
-        temp.write(0xff);
-        temp.write(0xff);
-        temp.write(total_size & 0xff);
-        temp.write((total_size >> 8) & 0xff);
-        temp.flush();
-        // Signature verification checks that the EOCD header is the
-        // last such sequence in the file (to avoid minzip finding a
-        // fake EOCD appended after the signature in its scan).  The
-        // odds of producing this sequence by chance are very low, but
-        // let's catch it here if it does.
-        byte[] b = temp.toByteArray();
-        for (int i = 0; i < b.length-3; ++i) {
-            if (b[i] == 0x50 && b[i+1] == 0x4b && b[i+2] == 0x05 && b[i+3] == 0x06) {
-                throw new IllegalArgumentException("found spurious EOCD header at " + i);
-            }
-        }
-        cmsFile.write(outputStream);
-        outputStream.write(total_size & 0xff);
-        outputStream.write((total_size >> 8) & 0xff);
-        temp.writeTo(outputStream);
-    }
-    private static void signFile(Manifest manifest, JarMap inputJar,
-                                 X509Certificate publicKey, PrivateKey privateKey,
-                                 JarOutputStream outputJar)
-            throws Exception {
-        // Assume the certificate is valid for at least an hour.
-        long timestamp = publicKey.getNotBefore().getTime() + 3600L * 1000;
-        // MANIFEST.MF
-        JarEntry je = new JarEntry(JarFile.MANIFEST_NAME);
-        je.setTime(timestamp);
-        outputJar.putNextEntry(je);
-        manifest.write(outputJar);
-        je = new JarEntry(CERT_SF_NAME);
-        je.setTime(timestamp);
-        outputJar.putNextEntry(je);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        writeSignatureFile(manifest, baos, getDigestAlgorithm(publicKey));
-        byte[] signedData = baos.toByteArray();
-        outputJar.write(signedData);
-        // CERT.{EC,RSA} / CERT#.{EC,RSA}
-        final String keyType = publicKey.getPublicKey().getAlgorithm();
-        je = new JarEntry(String.format(CERT_SIG_NAME, keyType));
-        je.setTime(timestamp);
-        outputJar.putNextEntry(je);
-        writeSignatureBlock(new CMSProcessableByteArray(signedData),
-                publicKey, privateKey, outputJar);
-    }
-}

crypto/src/main/java/com/topjohnwu/crypto/SignBoot.java

@@ -1,231 +0,0 @@
-package com.topjohnwu.crypto;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-
-public class SignBoot {
-
-    static {
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    public static boolean doSignature(String target, InputStream imgIn, OutputStream imgOut,
-                                   InputStream keyIn, InputStream certIn) {
-        try {
-            ByteArrayStream bas = new ByteArrayStream();
-            bas.readFrom(imgIn);
-            byte[] image = bas.toByteArray();
-            bas.close();
-            int signableSize = getSignableImageSize(image);
-            if (signableSize < image.length) {
-                System.err.println("NOTE: truncating input from " +
-                        image.length + " to " + signableSize + " bytes");
-                image = Arrays.copyOf(image, signableSize);
-            } else if (signableSize > image.length) {
-                throw new IllegalArgumentException("Invalid image: too short, expected " +
-                        signableSize + " bytes");
-            }
-            BootSignature bootsig = new BootSignature(target, image.length);
-            X509Certificate cert = CryptoUtils.readPublicKey(certIn);
-            bootsig.setCertificate(cert);
-            PrivateKey key = CryptoUtils.readPrivateKey(keyIn);
-            bootsig.setSignature(bootsig.sign(image, key),
-                    CryptoUtils.getSignatureAlgorithmIdentifier(key));
-            byte[] encoded_bootsig = bootsig.getEncoded();
-            imgOut.write(image);
-            imgOut.write(encoded_bootsig);
-            imgOut.flush();
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace(System.err);
-            return false;
-        }
-    }
-
-    public static boolean verifySignature(InputStream imgIn, InputStream certPath) {
-        try {
-            ByteArrayStream bas = new ByteArrayStream();
-            bas.readFrom(imgIn);
-            byte[] image = bas.toByteArray();
-            bas.close();
-            int signableSize = getSignableImageSize(image);
-            if (signableSize >= image.length) {
-                System.err.println("Invalid image: not signed");
-                return false;
-            }
-            byte[] signature = Arrays.copyOfRange(image, signableSize, image.length);
-            BootSignature bootsig = new BootSignature(signature);
-            if (certPath != null) {
-                bootsig.setCertificate(CryptoUtils.readPublicKey(certPath));
-            }
-            if (bootsig.verify(Arrays.copyOf(image, signableSize))) {
-                System.err.println("Signature is VALID");
-                return true;
-            } else {
-                System.err.println("Signature is INVALID");
-            }
-        } catch (Exception e) {
-            e.printStackTrace(System.err);
-            System.err.println("Invalid image: not signed");
-        }
-        return false;
-    }
-
-    public static int getSignableImageSize(byte[] data) throws Exception {
-        if (!Arrays.equals(Arrays.copyOfRange(data, 0, 8),
-                "ANDROID!".getBytes("US-ASCII"))) {
-            throw new IllegalArgumentException("Invalid image header: missing magic");
-        }
-        ByteBuffer image = ByteBuffer.wrap(data);
-        image.order(ByteOrder.LITTLE_ENDIAN);
-        image.getLong(); // magic
-        int kernelSize = image.getInt();
-        image.getInt(); // kernel_addr
-        int ramdskSize = image.getInt();
-        image.getInt(); // ramdisk_addr
-        int secondSize = image.getInt();
-        image.getLong(); // second_addr + tags_addr
-        int pageSize = image.getInt();
-        int length = pageSize // include the page aligned image header
-                + ((kernelSize + pageSize - 1) / pageSize) * pageSize
-                + ((ramdskSize + pageSize - 1) / pageSize) * pageSize
-                + ((secondSize + pageSize - 1) / pageSize) * pageSize;
-        length = ((length + pageSize - 1) / pageSize) * pageSize;
-        if (length <= 0) {
-            throw new IllegalArgumentException("Invalid image header: invalid length");
-        }
-        return length;
-    }
-
-    static class BootSignature extends ASN1Object {
-        private ASN1Integer formatVersion;
-        private ASN1Encodable certificate;
-        private AlgorithmIdentifier algorithmIdentifier;
-        private DERPrintableString target;
-        private ASN1Integer length;
-        private DEROctetString signature;
-        private PublicKey publicKey;
-        private static final int FORMAT_VERSION = 1;
-
-        /**
-         * Initializes the object for signing an image file
-         * @param target Target name, included in the signed data
-         * @param length Length of the image, included in the signed data
-         */
-        public BootSignature(String target, int length) {
-            this.formatVersion = new ASN1Integer(FORMAT_VERSION);
-            this.target = new DERPrintableString(target);
-            this.length = new ASN1Integer(length);
-        }
-
-        /**
-         * Initializes the object for verifying a signed image file
-         * @param signature Signature footer
-         */
-        public BootSignature(byte[] signature)
-                throws Exception {
-            ASN1InputStream stream = new ASN1InputStream(signature);
-            ASN1Sequence sequence = (ASN1Sequence) stream.readObject();
-            formatVersion = (ASN1Integer) sequence.getObjectAt(0);
-            if (formatVersion.getValue().intValue() != FORMAT_VERSION) {
-                throw new IllegalArgumentException("Unsupported format version");
-            }
-            certificate = sequence.getObjectAt(1);
-            byte[] encoded = ((ASN1Object) certificate).getEncoded();
-            ByteArrayInputStream bis = new ByteArrayInputStream(encoded);
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
-            X509Certificate c = (X509Certificate) cf.generateCertificate(bis);
-            publicKey = c.getPublicKey();
-            ASN1Sequence algId = (ASN1Sequence) sequence.getObjectAt(2);
-            algorithmIdentifier = new AlgorithmIdentifier(
-                    (ASN1ObjectIdentifier) algId.getObjectAt(0));
-            ASN1Sequence attrs = (ASN1Sequence) sequence.getObjectAt(3);
-            target = (DERPrintableString) attrs.getObjectAt(0);
-            length = (ASN1Integer) attrs.getObjectAt(1);
-            this.signature = (DEROctetString) sequence.getObjectAt(4);
-        }
-
-        public ASN1Object getAuthenticatedAttributes() {
-            ASN1EncodableVector attrs = new ASN1EncodableVector();
-            attrs.add(target);
-            attrs.add(length);
-            return new DERSequence(attrs);
-        }
-
-        public byte[] getEncodedAuthenticatedAttributes() throws IOException {
-            return getAuthenticatedAttributes().getEncoded();
-        }
-
-        public void setSignature(byte[] sig, AlgorithmIdentifier algId) {
-            algorithmIdentifier = algId;
-            signature = new DEROctetString(sig);
-        }
-
-        public void setCertificate(X509Certificate cert)
-                throws Exception, IOException, CertificateEncodingException {
-            ASN1InputStream s = new ASN1InputStream(cert.getEncoded());
-            certificate = s.readObject();
-            publicKey = cert.getPublicKey();
-        }
-
-        public byte[] generateSignableImage(byte[] image) throws IOException {
-            byte[] attrs = getEncodedAuthenticatedAttributes();
-            byte[] signable = Arrays.copyOf(image, image.length + attrs.length);
-            for (int i=0; i < attrs.length; i++) {
-                signable[i+image.length] = attrs[i];
-            }
-            return signable;
-        }
-
-        public byte[] sign(byte[] image, PrivateKey key) throws Exception {
-            byte[] signable = generateSignableImage(image);
-            return CryptoUtils.sign(key, signable);
-        }
-
-        public boolean verify(byte[] image) throws Exception {
-            if (length.getValue().intValue() != image.length) {
-                throw new IllegalArgumentException("Invalid image length");
-            }
-            byte[] signable = generateSignableImage(image);
-            return CryptoUtils.verify(publicKey, signable, signature.getOctets(),
-                    algorithmIdentifier);
-        }
-
-        @Override
-        public ASN1Primitive toASN1Primitive() {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-            v.add(formatVersion);
-            v.add(certificate);
-            v.add(algorithmIdentifier);
-            v.add(getAuthenticatedAttributes());
-            v.add(signature);
-            return new DERSequence(v);
-        }
-
-    }
-}

crypto/src/main/java/com/topjohnwu/crypto/ZipSigner.java

@@ -1,42 +0,0 @@
-package com.topjohnwu.crypto;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.security.Security;
-
-public class ZipSigner {
-    public static void main(String[] args) {
-        boolean minSign = false;
-        int argStart = 0;
-
-        if (args.length < 4) {
-            System.err.println("Usage: zipsigner [-m] publickey.x509[.pem] privatekey.pk8 input.jar output.jar");
-            System.exit(2);
-        }
-
-        if (args[0].equals("-m")) {
-            minSign = true;
-            argStart = 1;
-        }
-
-        SignAPK.sBouncyCastleProvider = new BouncyCastleProvider();
-        Security.insertProviderAt(SignAPK.sBouncyCastleProvider, 1);
-
-        File pubKey = new File(args[argStart]);
-        File privKey = new File(args[argStart + 1]);
-        File input = new File(args[argStart + 2]);
-        File output = new File(args[argStart + 3]);
-
-        try (InputStream pub = new FileInputStream(pubKey);
-             InputStream priv = new FileInputStream(privKey);
-             JarMap jar = new JarMap(input, false)) {
-            SignAPK.signZip(pub, priv, jar, output, minSign);
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-}

gradle.properties

@@ -1,22 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2560m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# 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
-
-# When set to true the Gradle daemon is used to run the build. For local developer builds this is our favorite property.
-# The developer environment is optimized for speed and feedback so we nearly always run Gradle jobs with the daemon.
-org.gradle.daemon=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip

gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# 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
-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=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# 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
-    ;;
-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"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-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.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-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
-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
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; 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
-    # 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\""
-        fi
-        i=$((i+1))
-    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"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,84 +0,0 @@
-@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 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=
-
-@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 init
-
-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 init
-
-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
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-: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 %CMD_LINE_ARGS%
-
-: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

proguard-rules.pro

@@ -22,3 +22,6 @@
 # BouncyCastle
 -keep class org.bouncycastle.jcajce.provider.** { *; }
 -dontwarn javax.naming.**
+
+# Gson
+-keepattributes Signature

settings.gradle

@@ -1 +0,0 @@
-include ':app', ':snet', ':crypto'

snet/.gitignore

@@ -1 +0,0 @@
-/build

snet/build.gradle

@@ -1,30 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.1"
-
-    defaultConfig {
-        applicationId "com.topjohnwu.snet"
-        minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-repositories {
-    google()
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.google.android.gms:play-services-safetynet:11.6.0'
-}

snet/proguard-rules.pro

@@ -1,24 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
--keep class com.topjohnwu.snet.SafetyNet* { *; }
--dontwarn java.lang.invoke**

snet/src/main/AndroidManifest.xml

@@ -1,7 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.topjohnwu.snet">
-
-    <meta-data
-        android:name="com.google.android.gms.version"
-        android:value="@integer/google_play_services_version" />
-</manifest>

snet/src/main/java/com/topjohnwu/snet/SafetyNetCallback.java

@@ -1,5 +0,0 @@
-package com.topjohnwu.snet;
-
-public interface SafetyNetCallback {
-    void onResponse(int responseCode);
-}

snet/src/main/java/com/topjohnwu/snet/SafetyNetHelper.java

@@ -1,107 +0,0 @@
-package com.topjohnwu.snet;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Base64;
-
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.common.api.ResultCallback;
-import com.google.android.gms.common.api.Status;
-import com.google.android.gms.safetynet.SafetyNet;
-import com.google.android.gms.safetynet.SafetyNetApi;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.security.SecureRandom;
-
-public class SafetyNetHelper
-        implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener {
-
-    public static final int CAUSE_SERVICE_DISCONNECTED = 0x01;
-    public static final int CAUSE_NETWORK_LOST = 0x02;
-    public static final int RESPONSE_ERR = 0x04;
-    public static final int CONNECTION_FAIL = 0x08;
-
-    public static final int BASIC_PASS = 0x10;
-    public static final int CTS_PASS = 0x20;
-
-    private GoogleApiClient mGoogleApiClient;
-    private Activity mActivity;
-    private int responseCode;
-    private SafetyNetCallback cb;
-    private String dexPath;
-
-    public SafetyNetHelper(Activity activity, String dexPath, SafetyNetCallback cb) {
-        mActivity = activity;
-        this.cb = cb;
-        this.dexPath = dexPath;
-        responseCode = 0;
-    }
-
-    // Entry point to start test
-    public void attest() {
-        // Connect Google Service
-        mGoogleApiClient = new GoogleApiClient.Builder(mActivity)
-                .addApi(SafetyNet.API)
-                .addOnConnectionFailedListener(this)
-                .addConnectionCallbacks(this)
-                .build();
-        mGoogleApiClient.connect();
-    }
-
-    @Override
-    public void onConnectionSuspended(int i) {
-        cb.onResponse(i);
-    }
-
-    @Override
-    public void onConnectionFailed(@NonNull ConnectionResult result) {
-        Class<? extends Activity> clazz = mActivity.getClass();
-        try {
-            // Use external resources
-            clazz.getMethod("swapResources", String.class).invoke(mActivity, dexPath);
-            GoogleApiAvailability.getInstance().getErrorDialog(mActivity, result.getErrorCode(), 0).show();
-            clazz.getMethod("restoreResources").invoke(mActivity);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        cb.onResponse(CONNECTION_FAIL);
-    }
-
-    @Override
-    public void onConnected(@Nullable Bundle bundle) {
-        // Create nonce
-        byte[] nonce = new byte[24];
-        new SecureRandom().nextBytes(nonce);
-
-        // Call SafetyNet
-        SafetyNet.SafetyNetApi.attest(mGoogleApiClient, nonce)
-            .setResultCallback(new ResultCallback<SafetyNetApi.AttestationResult>() {
-                @Override
-                public void onResult(@NonNull SafetyNetApi.AttestationResult result) {
-                    Status status = result.getStatus();
-                    try {
-                        if (!status.isSuccess()) throw new JSONException("");
-                        String json = new String(Base64.decode(
-                                result.getJwsResult().split("\\.")[1], Base64.DEFAULT));
-                        JSONObject decoded = new JSONObject(json);
-                        responseCode |= decoded.getBoolean("ctsProfileMatch") ? CTS_PASS : 0;
-                        responseCode |= decoded.getBoolean("basicIntegrity") ? BASIC_PASS : 0;
-                    } catch (JSONException e) {
-                        responseCode = RESPONSE_ERR;
-                    }
-
-                    // Disconnect
-                    mGoogleApiClient.disconnect();
-
-                    // Return results
-                    cb.onResponse(responseCode);
-                }
-            });
-    }
-}

src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
     <application
         android:name=".MagiskManager"
@@ -52,11 +53,6 @@
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:taskAffinity="internal.superuser"
-            android:theme="@android:style/Theme.NoDisplay" />
-        <activity
-            android:name=".superuser.SuRequestActivity"
-            android:excludeFromRecents="true"
-            android:taskAffinity="internal.superuser"
             android:theme="@style/SuRequest" />
 
         <receiver android:name=".superuser.SuReceiver" />
@@ -95,7 +91,7 @@
         <!-- Hardcode GMS version -->
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="11717000" />
+            android:value="7095000" />
 
     </application>
 

src/main/assets/changelog.md

@@ -0,0 +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

src/main/assets/dark.css

@@ -4,7 +4,7 @@ body {
   line-height: 1.6;
   padding-top: 10px;
   padding-bottom: 10px;
-  background-color: #303030;
+  background-color: #424242;
   color: white;
   padding: 15px; }
 

src/main/java/com/topjohnwu/magisk/AboutActivity.java

@@ -0,0 +1,86 @@
+package com.topjohnwu.magisk;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.topjohnwu.magisk.asyncs.MarkDownWindow;
+import com.topjohnwu.magisk.components.AboutCardRow;
+import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.utils.Const;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Locale;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class AboutActivity extends Activity {
+
+    @BindView(R.id.toolbar) Toolbar toolbar;
+    @BindView(R.id.app_version_info) AboutCardRow appVersionInfo;
+    @BindView(R.id.app_changelog) AboutCardRow appChangelog;
+    @BindView(R.id.app_translators) AboutCardRow appTranslators;
+    @BindView(R.id.app_source_code) AboutCardRow appSourceCode;
+    @BindView(R.id.support_thread) AboutCardRow supportThread;
+    @BindView(R.id.donation) AboutCardRow donation;
+
+    @Override
+    public int getDarkTheme() {
+        return R.style.AppTheme_Transparent_Dark;
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+        ButterKnife.bind(this);
+
+        setSupportActionBar(toolbar);
+        toolbar.setNavigationOnClickListener(view -> finish());
+
+        ActionBar ab = getSupportActionBar();
+        if (ab != null) {
+            ab.setTitle(R.string.about);
+            ab.setDisplayHomeAsUpEnabled(true);
+        }
+
+        appVersionInfo.setSummary(String.format(Locale.US, "%s (%d) (%s)",
+                BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, getPackageName()));
+
+        appChangelog.removeSummary();
+        appChangelog.setOnClickListener(v -> {
+            try {
+                InputStream is = getAssets().open("changelog.md");
+                new MarkDownWindow(this, getString(R.string.app_changelog), is).exec();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
+
+        String translators = getString(R.string.translators);
+        if (TextUtils.isEmpty(translators)) {
+            appTranslators.setVisibility(View.GONE);
+        } else {
+            appTranslators.setSummary(translators);
+        }
+
+        appSourceCode.removeSummary();
+        appSourceCode.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.SOURCE_CODE_URL))));
+
+        supportThread.removeSummary();
+        supportThread.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.XDA_THREAD))));
+
+        donation.removeSummary();
+        donation.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.DONATION_URL))));
+
+        setFloating();
+    }
+
+}

src/main/java/com/topjohnwu/magisk/FlashActivity.java

@@ -56,7 +56,7 @@ public class FlashActivity extends Activity {
     void saveLogs() {
         Calendar now = Calendar.getInstance();
         String filename = String.format(Locale.US,
-                "install_log_%04d%02d%02d_%02d:%02d:%02d.log",
+                "install_log_%04d%02d%02d_%02d%02d%02d.log",
                 now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
                 now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
                 now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
@@ -75,6 +75,11 @@ public class FlashActivity extends Activity {
         MagiskManager.toast(logFile.getPath(), Toast.LENGTH_LONG);
     }
 
+    @Override
+    public int getDarkTheme() {
+        return R.style.AppTheme_Transparent_Dark;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -104,19 +109,16 @@ public class FlashActivity extends Activity {
         Intent intent = getIntent();
         Uri uri = intent.getData();
 
-        boolean keepEnc = intent.getBooleanExtra(Const.Key.FLASH_SET_ENC, false);
-        boolean keepVerity = intent.getBooleanExtra(Const.Key.FLASH_SET_VERITY, false);
-
         switch (intent.getStringExtra(Const.Key.FLASH_ACTION)) {
             case Const.Value.FLASH_ZIP:
                 new FlashZip(this, uri, console, logs).exec();
                 break;
             case Const.Value.PATCH_BOOT:
-                new InstallMagisk(this, console, logs, uri, keepEnc, keepVerity, (Uri) intent.getParcelableExtra(Const.Key.FLASH_SET_BOOT))
+                new InstallMagisk(this, console, logs, uri, (Uri) intent.getParcelableExtra(Const.Key.FLASH_SET_BOOT))
                         .exec();
                 break;
             case Const.Value.FLASH_MAGISK:
-                new InstallMagisk(this, console, logs, uri, keepEnc, keepVerity, intent.getStringExtra(Const.Key.FLASH_SET_BOOT))
+                new InstallMagisk(this, console, logs, uri, intent.getStringExtra(Const.Key.FLASH_SET_BOOT))
                         .exec();
                 break;
         }

src/main/java/com/topjohnwu/magisk/LogFragment.java

@@ -10,6 +10,7 @@ import android.view.ViewGroup;
 
 import com.topjohnwu.magisk.adapters.TabFragmentAdapter;
 import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.utils.Const;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -33,7 +34,9 @@ public class LogFragment extends Fragment {
 
         TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());
 
-        adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
+        if (!(Const.USER_ID > 0 && getApplication().multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
+            adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
+        }
         adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
         tab.setupWithViewPager(viewPager);
         tab.setVisibility(View.VISIBLE);

src/main/java/com/topjohnwu/magisk/MagiskFragment.java

@@ -91,7 +91,7 @@ public class MagiskFragment extends Fragment
             new CheckSafetyNet(getActivity()).exec();
             collapse();
         };
-        if (mm.snet_version < 0) {
+        if (!CheckSafetyNet.dexPath.exists()) {
             // Show dialog
             new AlertDialogBuilder(getActivity())
                     .setTitle(R.string.proprietary_title)
@@ -117,8 +117,7 @@ public class MagiskFragment extends Fragment
         }
 
         ((NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE)).cancelAll();
-        ShowUI.magiskInstallDialog(getActivity(),
-                keepEncChkbox.isChecked(), keepVerityChkbox.isChecked());
+        ShowUI.magiskInstallDialog(getActivity());
     }
 
     @OnClick(R.id.uninstall_button)
@@ -138,6 +137,11 @@ public class MagiskFragment extends Fragment
         expandableContainer.expandLayout = expandLayout;
         setupExpandable();
 
+        keepVerityChkbox.setChecked(mm.keepVerity);
+        keepVerityChkbox.setOnCheckedChangeListener((view, checked) -> mm.keepVerity = checked);
+        keepEncChkbox.setChecked(mm.keepEnc);
+        keepEncChkbox.setOnCheckedChangeListener((view, checked) -> mm.keepEnc = checked);
+
         mSwipeRefreshLayout.setOnRefreshListener(this);
         updateUI();
 

src/main/java/com/topjohnwu/magisk/MagiskLogFragment.java

@@ -114,7 +114,7 @@ public class MagiskLogFragment extends Fragment {
             switch (mode) {
                 case 0:
                     StringBuildingList logList = new StringBuildingList();
-                    Shell.su(logList, "cat " + Const.MAGISK_LOG + " | tail -n 1000");
+                    Shell.su(logList, "cat " + Const.MAGISK_LOG + " | tail -n 5000");
                     return logList.getCharSequence();
 
                 case 1:
@@ -125,7 +125,7 @@ public class MagiskLogFragment extends Fragment {
                 case 2:
                     Calendar now = Calendar.getInstance();
                     String filename = String.format(Locale.US,
-                            "magisk_log_%04d%02d%02d_%02d:%02d:%02d.log",
+                            "magisk_log_%04d%02d%02d_%02d%02d%02d.log",
                             now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
                             now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
                             now.get(Calendar.MINUTE), now.get(Calendar.SECOND));

src/main/java/com/topjohnwu/magisk/MagiskManager.java

@@ -1,6 +1,7 @@
 package com.topjohnwu.magisk;
 
 import android.app.Application;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -38,7 +39,6 @@ public class MagiskManager extends Application {
 
     // Info
     public boolean hasInit = false;
-    public int userId;
     public String magiskVersionString;
     public int magiskVersionCode = -1;
     public String remoteMagiskVersionString;
@@ -49,8 +49,8 @@ public class MagiskManager extends Application {
     public int remoteManagerVersionCode = -1;
     public String managerLink;
     public String bootBlock = null;
-    public int snet_version;
-    public int updateServiceVersion;
+    public boolean keepVerity = false;
+    public boolean keepEnc = false;
 
     // Data
     public Map<String, Module> moduleMap;
@@ -62,9 +62,6 @@ public class MagiskManager extends Application {
 
     public boolean magiskHide;
     public boolean isDarkTheme;
-    public boolean updateNotification;
-    public boolean suReauth;
-    public boolean coreOnly;
     public int suRequestTimeout;
     public int suLogTimeout = 14;
     public int suAccessState;
@@ -75,7 +72,7 @@ public class MagiskManager extends Application {
     public String localeConfig;
     public int updateChannel;
     public String bootFormat;
-    public String customChannelUrl;
+    public int repoOrder;
 
     // Global resources
     public SharedPreferences prefs;
@@ -94,24 +91,19 @@ public class MagiskManager extends Application {
     public void onCreate() {
         super.onCreate();
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        userId = getApplicationInfo().uid / 100000;
 
-        if (Utils.getDatabasePath(this, SuDatabaseHelper.DB_NAME).exists()) {
-            // Don't migrate yet, wait and check Magisk version
-            suDB = new SuDatabaseHelper(this);
-        } else {
-            suDB = new SuDatabaseHelper();
-        }
-
-        // If detect original package, self destruct!
+        // Handle duplicate package
         if (!getPackageName().equals(Const.ORIG_PKG_NAME)) {
             try {
                 getPackageManager().getApplicationInfo(Const.ORIG_PKG_NAME, 0);
-                Shell.su(String.format(Locale.US, "pm uninstall --user %d %s", userId, getPackageName()));
+                Intent intent = getPackageManager().getLaunchIntentForPackage(Const.ORIG_PKG_NAME);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
                 return;
-            } catch (PackageManager.NameNotFoundException ignored) { /* Expected*/ }
+            } catch (PackageManager.NameNotFoundException ignored) { /* Expected */ }
         }
 
+        suDB = SuDatabaseHelper.getSuDB(false);
         repoDB = new RepoDatabaseHelper(this);
         defaultLocale = Locale.getDefault();
         setLocale();
@@ -136,27 +128,42 @@ public class MagiskManager extends Application {
     }
 
     public void loadConfig() {
-        isDarkTheme = prefs.getBoolean(Const.Key.DARK_THEME, false);
-
         // su
         suRequestTimeout = Utils.getPrefsInt(prefs, Const.Key.SU_REQUEST_TIMEOUT, Const.Value.timeoutList[2]);
         suResponseType = Utils.getPrefsInt(prefs, Const.Key.SU_AUTO_RESPONSE, Const.Value.SU_PROMPT);
         suNotificationType = Utils.getPrefsInt(prefs, Const.Key.SU_NOTIFICATION, Const.Value.NOTIFICATION_TOAST);
-        suReauth = prefs.getBoolean(Const.Key.SU_REAUTH, false);
         suAccessState = suDB.getSettings(Const.Key.ROOT_ACCESS, Const.Value.ROOT_ACCESS_APPS_AND_ADB);
         multiuserMode = suDB.getSettings(Const.Key.SU_MULTIUSER_MODE, Const.Value.MULTIUSER_MODE_OWNER_ONLY);
         suNamespaceMode = suDB.getSettings(Const.Key.SU_MNT_NS, Const.Value.NAMESPACE_MODE_REQUESTER);
 
-        coreOnly = prefs.getBoolean(Const.Key.DISABLE, false);
-        updateNotification = prefs.getBoolean(Const.Key.UPDATE_NOTIFICATION, true);
+        // config
+        isDarkTheme = prefs.getBoolean(Const.Key.DARK_THEME, false);
         updateChannel = Utils.getPrefsInt(prefs, Const.Key.UPDATE_CHANNEL, Const.Value.STABLE_CHANNEL);
         bootFormat = prefs.getString(Const.Key.BOOT_FORMAT, ".img");
-        snet_version = prefs.getInt(Const.Key.SNET_VER, -1);
-        updateServiceVersion = prefs.getInt(Const.Key.UPDATE_SERVICE_VER, -1);
-        customChannelUrl = prefs.getString(Const.Key.CUSTOM_CHANNEL, "");
+        repoOrder = prefs.getInt(Const.Key.REPO_ORDER, Const.Value.ORDER_NAME);
     }
 
-    public static void toast(String msg, int duration) {
+    public void writeConfig() {
+        prefs.edit()
+                .putBoolean(Const.Key.DARK_THEME, isDarkTheme)
+                .putBoolean(Const.Key.MAGISKHIDE, magiskHide)
+                .putBoolean(Const.Key.HOSTS, Utils.itemExist(Const.MAGISK_HOST_FILE()))
+                .putBoolean(Const.Key.COREONLY, Utils.itemExist(Const.MAGISK_DISABLE_FILE))
+                .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(suRequestTimeout))
+                .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(suResponseType))
+                .putString(Const.Key.SU_NOTIFICATION, String.valueOf(suNotificationType))
+                .putString(Const.Key.ROOT_ACCESS, String.valueOf(suAccessState))
+                .putString(Const.Key.SU_MULTIUSER_MODE, String.valueOf(multiuserMode))
+                .putString(Const.Key.SU_MNT_NS, String.valueOf(suNamespaceMode))
+                .putString(Const.Key.UPDATE_CHANNEL, String.valueOf(updateChannel))
+                .putString(Const.Key.LOCALE, localeConfig)
+                .putString(Const.Key.BOOT_FORMAT, bootFormat)
+                .putInt(Const.Key.UPDATE_SERVICE_VER, Const.UPDATE_SERVICE_VER)
+                .putInt(Const.Key.REPO_ORDER, repoOrder)
+                .apply();
+    }
+
+    public static void toast(CharSequence msg, int duration) {
         mHandler.post(() -> Toast.makeText(weakSelf.get(), msg, duration).show());
     }
 
@@ -192,6 +199,42 @@ public class MagiskManager extends Application {
         } catch (NumberFormatException e) {
             magiskHide = true;
         }
+
+        ret = Shell.su("echo \"$BOOTIMAGE\"");
+        if (Utils.isValidShellResponse(ret))
+            bootBlock = ret.get(0);
+
+        if (suDB != null && !SuDatabaseHelper.verified) {
+            suDB.close();
+            suDB = SuDatabaseHelper.getSuDB(true);
+        }
+    }
+
+    public void getDefaultInstallFlags() {
+        List<String> ret;
+        ret = Shell.su("echo \"$DTBOIMAGE\"");
+        if (Utils.isValidShellResponse(ret))
+            keepVerity = true;
+
+        ret = Shell.su(
+                "getvar KEEPVERITY",
+                "echo $KEEPVERITY");
+        try {
+            if (Utils.isValidShellResponse(ret))
+                keepVerity = Boolean.parseBoolean(ret.get(0));
+        } catch (NumberFormatException ignored) {}
+
+        ret = Shell.sh("getprop ro.crypto.state");
+        if (Utils.isValidShellResponse(ret) && ret.get(0).equals("encrypted"))
+            keepEnc = true;
+
+        ret = Shell.su(
+                "getvar KEEPFORCEENCRYPT",
+                "echo $KEEPFORCEENCRYPT");
+        try {
+            if (Utils.isValidShellResponse(ret))
+                keepEnc = Boolean.parseBoolean(ret.get(0));
+        } catch (NumberFormatException ignored) {}
     }
 
     public void setPermissionGrantCallback(Runnable callback) {

src/main/java/com/topjohnwu/magisk/MainActivity.java

@@ -16,12 +16,16 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import com.topjohnwu.magisk.asyncs.MarkDownWindow;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
 
+import java.io.IOException;
+import java.io.InputStream;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
@@ -38,10 +42,16 @@ public class MainActivity extends Activity
 
     private float toolbarElevation;
 
+    @Override
+    public int getDarkTheme() {
+        return R.style.AppTheme_Dark;
+    }
+
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
 
         MagiskManager mm = getMagiskManager();
+        prefs = mm.prefs;
 
         if (!mm.hasInit) {
             Intent intent = new Intent(this, SplashActivity.class);
@@ -58,11 +68,6 @@ public class MainActivity extends Activity
             ActivityCompat.requestPermissions(this, new String[] { perm }, 0);
         }
 
-        prefs = mm.prefs;
-
-        if (mm.isDarkTheme) {
-            setTheme(R.style.AppTheme_Dark);
-        }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         ButterKnife.bind(this);
@@ -91,6 +96,16 @@ public class MainActivity extends Activity
             navigate(getIntent().getStringExtra(Const.Key.OPEN_SECTION));
 
         navigationView.setNavigationItemSelectedListener(this);
+
+        if (mm.prefs.getInt(Const.Key.APP_VER, -1) < BuildConfig.VERSION_CODE) {
+            prefs.edit().putInt(Const.Key.APP_VER, BuildConfig.VERSION_CODE).apply();
+            try {
+                InputStream is = getAssets().open("changelog.md");
+                new MarkDownWindow(this, getString(R.string.app_changelog), is).exec();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     @Override
@@ -134,13 +149,13 @@ public class MainActivity extends Activity
         menu.findItem(R.id.magiskhide).setVisible(
                 Shell.rootAccess() && mm.magiskVersionCode >= 1300
                         && prefs.getBoolean(Const.Key.MAGISKHIDE, false));
-        menu.findItem(R.id.modules).setVisible(
+        menu.findItem(R.id.modules).setVisible(!mm.prefs.getBoolean(Const.Key.COREONLY, false) &&
                 Shell.rootAccess() && mm.magiskVersionCode >= 0);
-        menu.findItem(R.id.downloads).setVisible(Utils.checkNetworkStatus() &&
-                Shell.rootAccess() && mm.magiskVersionCode >= 0);
-        menu.setGroupVisible(R.id.second_group, !mm.coreOnly);
+        menu.findItem(R.id.downloads).setVisible(!mm.prefs.getBoolean(Const.Key.COREONLY, false)
+                && Utils.checkNetworkStatus() && Shell.rootAccess() && mm.magiskVersionCode >= 0);
         menu.findItem(R.id.log).setVisible(Shell.rootAccess());
-        menu.findItem(R.id.superuser).setVisible(Shell.rootAccess());
+        menu.findItem(R.id.superuser).setVisible(Shell.rootAccess() &&
+                !(Const.USER_ID > 0 && mm.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED));
     }
 
     public void navigate(String item) {

src/main/java/com/topjohnwu/magisk/ModulesFragment.java

@@ -8,6 +8,9 @@ import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
 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 android.widget.TextView;
@@ -17,6 +20,7 @@ import com.topjohnwu.magisk.asyncs.LoadModules;
 import com.topjohnwu.magisk.components.Fragment;
 import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
 
@@ -50,6 +54,7 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_modules, container, false);
         unbinder = ButterKnife.bind(this, view);
+        setHasOptionsMenu(true);
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
             recyclerView.setVisibility(View.GONE);
@@ -99,6 +104,31 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
         unbinder.unbind();
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_reboot, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.reboot:
+                Shell.su_raw("/system/bin/reboot");
+                return true;
+            case R.id.reboot_recovery:
+                Shell.su_raw("/system/bin/reboot recovery");
+                return true;
+            case R.id.reboot_bootloader:
+                Shell.su_raw("/system/bin/reboot bootloader");
+                return true;
+            case R.id.reboot_download:
+                Shell.su_raw("/system/bin/reboot download");
+                return true;
+            default:
+                return false;
+        }
+    }
+
     private void updateUI() {
         listModules.clear();
         listModules.addAll(getApplication().moduleMap.values());

src/main/java/com/topjohnwu/magisk/ReposFragment.java

@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk;
 
+import android.app.AlertDialog;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -7,6 +8,7 @@ import android.support.v7.widget.RecyclerView;
 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 android.widget.SearchView;
@@ -15,6 +17,7 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.adapters.ReposAdapter;
 import com.topjohnwu.magisk.asyncs.UpdateRepos;
 import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Topic;
 
 import butterknife.BindView;
@@ -98,6 +101,22 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
         });
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        MagiskManager mm = getApplication();
+        if (item.getItemId() == R.id.repo_sort) {
+            new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.sorting_order)
+                .setSingleChoiceItems(R.array.sorting_orders, mm.repoOrder, (d, which) -> {
+                    mm.repoOrder = which;
+                    mm.prefs.edit().putInt(Const.Key.REPO_ORDER, mm.repoOrder).apply();
+                    adapter.notifyDBChanged();
+                    d.dismiss();
+                }).show();
+        }
+        return true;
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();

src/main/java/com/topjohnwu/magisk/SettingsActivity.java

@@ -11,17 +11,18 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
-import android.text.InputType;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.widget.EditText;
-import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.topjohnwu.magisk.asyncs.CheckUpdates;
 import com.topjohnwu.magisk.asyncs.HideManager;
 import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
 import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
@@ -35,13 +36,14 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
 
     @BindView(R.id.toolbar) Toolbar toolbar;
 
+    @Override
+    public int getDarkTheme() {
+        return R.style.AppTheme_Transparent_Dark;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (getMagiskManager().isDarkTheme) {
-            setTheme(R.style.AppTheme_Transparent_Dark);
-        }
-
         setContentView(R.layout.activity_settings);
         ButterKnife.bind(this);
 
@@ -111,25 +113,20 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
             multiuserMode = (ListPreference) findPreference(Const.Key.SU_MULTIUSER_MODE);
             namespaceMode = (ListPreference) findPreference(Const.Key.SU_MNT_NS);
             SwitchPreference reauth = (SwitchPreference) findPreference(Const.Key.SU_REAUTH);
+            SwitchPreference fingerprint = (SwitchPreference) findPreference(Const.Key.SU_FINGERPRINT);
 
             updateChannel.setOnPreferenceChangeListener((pref, o) -> {
                 mm.updateChannel = Integer.parseInt((String) o);
                 if (mm.updateChannel == Const.Value.CUSTOM_CHANNEL) {
-                    LinearLayout layout = new LinearLayout(getActivity());
-                    EditText url = new EditText(getActivity());
-                    url.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
-                    url.setText(mm.customChannelUrl);
-                    layout.setOrientation(LinearLayout.VERTICAL);
-                    layout.addView(url);
-                    LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) url.getLayoutParams();
-                    params.setMargins(Utils.dpInPx(15), 0, Utils.dpInPx(15), 0);
-                    new AlertDialogBuilder(getActivity())
+                    View v = LayoutInflater.from(getActivity()).inflate(R.layout.custom_channel_dialog, null);
+                    EditText url = v.findViewById(R.id.custom_url);
+                    url.setText(mm.prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
+                    new AlertDialog.Builder(getActivity())
                         .setTitle(R.string.settings_update_custom)
-                        .setMessage(R.string.settings_update_custom_msg)
-                        .setView(layout)
-                        .setPositiveButton(R.string.ok, (d, i) -> {
-                            prefs.edit().putString(Const.Key.CUSTOM_CHANNEL, url.getText().toString()).apply();
-                        })
+                        .setView(v)
+                        .setPositiveButton(R.string.ok, (d, i) ->
+                                prefs.edit().putString(Const.Key.CUSTOM_CHANNEL,
+                                        url.getText().toString()).apply())
                         .setNegativeButton(R.string.close, null)
                         .show();
                 }
@@ -138,30 +135,40 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
 
             setSummary();
 
-            // Disable dangerous settings in user mode if selected owner manage
-            if (mm.userId > 0) {
+            // Disable dangerous settings in secondary user
+            if (Const.USER_ID > 0) {
                 suCategory.removePreference(multiuserMode);
             }
 
-            // Remove re-authentication option on Android O, it will not work
+            // Disable re-authentication option on Android O, it will not work
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                suCategory.removePreference(reauth);
+                reauth.setEnabled(false);
+                reauth.setSummary(R.string.android_o_not_support);
+            }
+
+            // Remove fingerprint option if not possible
+            if (!FingerprintHelper.canUseFingerprint()) {
+                suCategory.removePreference(fingerprint);
             }
 
             if (mm.getPackageName().equals(Const.ORIG_PKG_NAME) && mm.magiskVersionCode >= 1440) {
                 hideManager.setOnPreferenceClickListener((pref) -> {
                     Utils.runWithPermission(getActivity(),
                             Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                            () -> new HideManager().exec());
+                            () -> new HideManager(getActivity()).exec());
                     return true;
                 });
             } else {
                 generalCatagory.removePreference(hideManager);
             }
 
+            if (!Shell.rootAccess() || (Const.USER_ID > 0 &&
+                    mm.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
+                prefScreen.removePreference(suCategory);
+            }
+
             if (!Shell.rootAccess()) {
                 prefScreen.removePreference(magiskCategory);
-                prefScreen.removePreference(suCategory);
                 generalCatagory.removePreference(hideManager);
             } else if (mm.magiskVersionCode < 1300) {
                 prefScreen.removePreference(magiskCategory);
@@ -208,18 +215,14 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
 
         @Override
         public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
-            boolean enabled;
 
             switch (key) {
                 case Const.Key.DARK_THEME:
-                    enabled = prefs.getBoolean(Const.Key.DARK_THEME, false);
-                    if (mm.isDarkTheme != enabled) {
-                        mm.reloadActivity.publish(false);
-                    }
+                    mm.isDarkTheme = prefs.getBoolean(key, false);
+                    mm.reloadActivity.publish(false);
                     break;
-                case Const.Key.DISABLE:
-                    enabled = prefs.getBoolean(Const.Key.DISABLE, false);
-                    if (enabled) {
+                case Const.Key.COREONLY:
+                    if (prefs.getBoolean(key, false)) {
                         Utils.createFile(Const.MAGISK_DISABLE_FILE);
                     } else {
                         Utils.removeItem(Const.MAGISK_DISABLE_FILE);
@@ -227,16 +230,14 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
                     Toast.makeText(getActivity(), R.string.settings_reboot_toast, Toast.LENGTH_LONG).show();
                     break;
                 case Const.Key.MAGISKHIDE:
-                    enabled = prefs.getBoolean(Const.Key.MAGISKHIDE, false);
-                    if (enabled) {
+                    if (prefs.getBoolean(key, false)) {
                         Shell.su_raw("magiskhide --enable");
                     } else {
                         Shell.su_raw("magiskhide --disable");
                     }
                     break;
                 case Const.Key.HOSTS:
-                    enabled = prefs.getBoolean(Const.Key.HOSTS, false);
-                    if (enabled) {
+                    if (prefs.getBoolean(key, false)) {
                         Shell.su_raw(
                                 "cp -af /system/etc/hosts " + Const.MAGISK_HOST_FILE(),
                                 "mount -o bind " + Const.MAGISK_HOST_FILE() + " /system/etc/hosts");
@@ -247,13 +248,9 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
                     }
                     break;
                 case Const.Key.ROOT_ACCESS:
-                    mm.suDB.setSettings(Const.Key.ROOT_ACCESS, Utils.getPrefsInt(prefs, Const.Key.ROOT_ACCESS));
-                    break;
                 case Const.Key.SU_MULTIUSER_MODE:
-                    mm.suDB.setSettings(Const.Key.SU_MULTIUSER_MODE, Utils.getPrefsInt(prefs, Const.Key.SU_MULTIUSER_MODE));
-                    break;
                 case Const.Key.SU_MNT_NS:
-                    mm.suDB.setSettings(Const.Key.SU_MNT_NS, Utils.getPrefsInt(prefs, Const.Key.SU_MNT_NS));
+                    mm.suDB.setSettings(key, Utils.getPrefsInt(prefs, key));
                     break;
                 case Const.Key.LOCALE:
                     mm.setLocale();

src/main/java/com/topjohnwu/magisk/SplashActivity.java

@@ -15,22 +15,28 @@ import com.topjohnwu.magisk.asyncs.LoadModules;
 import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.asyncs.UpdateRepos;
 import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
 import com.topjohnwu.magisk.services.UpdateCheckService;
 import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 
-import java.util.List;
-
 public class SplashActivity extends Activity {
 
+    @Override
+    public int getDarkTheme() {
+        return -1;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         MagiskManager mm = getMagiskManager();
 
+        mm.loadMagiskInfo();
+        mm.getDefaultInstallFlags();
+        Utils.loadPrefs();
+
         // Dynamic detect all locales
         new LoadLocale().exec();
 
@@ -41,7 +47,6 @@ public class SplashActivity extends Activity {
             getSystemService(NotificationManager.class).createNotificationChannel(channel);
         }
 
-        mm.loadMagiskInfo();
         LoadModules loadModuleTask = new LoadModules();
 
         if (Utils.checkNetworkStatus()) {
@@ -56,24 +61,8 @@ public class SplashActivity extends Activity {
         // Magisk working as expected
         if (Shell.rootAccess() && mm.magiskVersionCode > 0) {
 
-            List<String> ret = Shell.su("echo \"$BOOTIMAGE\"");
-            if (Utils.isValidShellResponse(ret)) {
-                mm.bootBlock = ret.get(0);
-            }
-
-            // Setup suDB
-            SuDatabaseHelper.setupSuDB();
-
-            // Check alternative Magisk Manager
-            String pkg;
-            if (getPackageName().equals(Const.ORIG_PKG_NAME) &&
-                    (pkg = mm.suDB.getStrings(Const.Key.SU_REQUESTER, null)) != null) {
-                Shell.su_raw("pm uninstall " + pkg);
-                mm.suDB.setStrings(Const.Key.SU_REQUESTER, null);
-            }
-
             // Add update checking service
-            if (Const.Value.UPDATE_SERVICE_VER > mm.updateServiceVersion) {
+            if (Const.UPDATE_SERVICE_VER > mm.prefs.getInt(Const.Key.UPDATE_SERVICE_VER, -1)) {
                 ComponentName service = new ComponentName(this, UpdateCheckService.class);
                 JobInfo info = new JobInfo.Builder(Const.ID.UPDATE_SERVICE_ID, service)
                         .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
@@ -81,7 +70,6 @@ public class SplashActivity extends Activity {
                         .setPeriodic(8 * 60 * 60 * 1000)
                         .build();
                 ((JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE)).schedule(info);
-                mm.updateServiceVersion = Const.Value.UPDATE_SERVICE_VER;
             }
 
             // Fire asynctasks
@@ -92,24 +80,7 @@ public class SplashActivity extends Activity {
         }
 
         // Write back default values
-        mm.prefs.edit()
-                .putBoolean(Const.Key.DARK_THEME, mm.isDarkTheme)
-                .putBoolean(Const.Key.MAGISKHIDE, mm.magiskHide)
-                .putBoolean(Const.Key.UPDATE_NOTIFICATION, mm.updateNotification)
-                .putBoolean(Const.Key.HOSTS, Utils.itemExist(Const.MAGISK_HOST_FILE()))
-                .putBoolean(Const.Key.DISABLE, Utils.itemExist(Const.MAGISK_DISABLE_FILE))
-                .putBoolean(Const.Key.SU_REAUTH, mm.suReauth)
-                .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(mm.suRequestTimeout))
-                .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(mm.suResponseType))
-                .putString(Const.Key.SU_NOTIFICATION, String.valueOf(mm.suNotificationType))
-                .putString(Const.Key.ROOT_ACCESS, String.valueOf(mm.suAccessState))
-                .putString(Const.Key.SU_MULTIUSER_MODE, String.valueOf(mm.multiuserMode))
-                .putString(Const.Key.SU_MNT_NS, String.valueOf(mm.suNamespaceMode))
-                .putString(Const.Key.UPDATE_CHANNEL, String.valueOf(mm.updateChannel))
-                .putString(Const.Key.LOCALE, mm.localeConfig)
-                .putString(Const.Key.BOOT_FORMAT, mm.bootFormat)
-                .putInt(Const.Key.UPDATE_SERVICE_VER, mm.updateServiceVersion)
-                .apply();
+        mm.writeConfig();
 
         mm.hasInit = true;
 

src/main/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java

@@ -108,7 +108,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
 
         @BindView(R.id.app_icon) ImageView appIcon;
         @BindView(R.id.app_name) TextView appName;
-        @BindView(R.id.app_package) TextView appPackage;
+        @BindView(R.id.package_name) TextView appPackage;
         @BindView(R.id.checkbox) CheckBox checkBox;
 
         ViewHolder(View itemView) {
@@ -149,7 +149,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
             mOriginalList = pm.getInstalledApplications(0);
             for (Iterator<ApplicationInfo> i = mOriginalList.iterator(); i.hasNext(); ) {
                 ApplicationInfo info = i.next();
-                if (Const.SN_BLACKLIST.contains(info.packageName) || !info.enabled) {
+                if (Const.HIDE_BLACKLIST.contains(info.packageName) || !info.enabled) {
                     i.remove();
                 }
             }

src/main/java/com/topjohnwu/magisk/adapters/ReposAdapter.java

@@ -95,6 +95,7 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
         String author = repo.getAuthor();
         holder.author.setText(TextUtils.isEmpty(author) ? null : context.getString(R.string.author, author));
         holder.description.setText(repo.getDescription());
+        holder.updateTime.setText(context.getString(R.string.updated_on, repo.getLastUpdateString()));
 
         holder.infoLayout.setOnClickListener(v ->
                 new MarkDownWindow((Activity) context, null, repo.getDetailUrl()).exec());
@@ -180,6 +181,7 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
         @BindView(R.id.author) TextView author;
         @BindView(R.id.info_layout) LinearLayout infoLayout;
         @BindView(R.id.download) ImageView downloadImage;
+        @BindView(R.id.update_time) TextView updateTime;
 
         RepoHolder(View itemView) {
             super(itemView);

src/main/java/com/topjohnwu/magisk/asyncs/CheckSafetyNet.java

@@ -12,6 +12,7 @@ import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Proxy;
@@ -21,42 +22,57 @@ import dalvik.system.DexClassLoader;
 
 public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
 
-    private File dexPath;
+    public static final File dexPath =
+            new File(MagiskManager.get().getFilesDir().getParent() + "/snet", "snet.apk");
     private DexClassLoader loader;
+    private Class<?> helperClazz, callbackClazz;
 
     public CheckSafetyNet(Activity activity) {
         super(activity);
-        dexPath = new File(activity.getCacheDir().getParent() + "/snet", "snet.apk");
     }
 
-    @Override
-    protected void onPreExecute() {
-        MagiskManager mm = MagiskManager.get();
-        if (mm.snet_version != Const.Value.SNET_VER) {
-            Shell.sh("rm -rf " + dexPath.getParent());
+    private void dlSnet() throws IOException {
+        Shell.sh("rm -rf " + dexPath.getParent());
+        HttpURLConnection conn = WebService.request(Const.Url.SNET_URL, null);
+        dexPath.getParentFile().mkdir();
+        try (
+                OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath));
+                InputStream in = new BufferedInputStream(conn.getInputStream())) {
+            Utils.inToOut(in, out);
         }
-        mm.snet_version = Const.Value.SNET_VER;
-        mm.prefs.edit().putInt(Const.Key.SNET_VER, Const.Value.SNET_VER).apply();
+        conn.disconnect();
+    }
+
+    private void loadClasses() throws ClassNotFoundException {
+        loader = new DexClassLoader(dexPath.toString(), dexPath.getParent(),
+                null, ClassLoader.getSystemClassLoader());
+        helperClazz = loader.loadClass(Const.SNET_PKG + ".SafetyNetHelper");
+        callbackClazz = loader.loadClass(Const.SNET_PKG + ".SafetyNetCallback");
     }
 
     @Override
     protected Exception doInBackground(Void... voids) {
+        int snet_ver = -1;
+
         try {
-            if (!dexPath.exists()) {
-                HttpURLConnection conn = WebService.request(Const.Url.SNET_URL, null);
-                dexPath.getParentFile().mkdir();
-                try (
-                        OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath));
-                        InputStream in = new BufferedInputStream(conn.getInputStream())) {
-                    Utils.inToOut(in, out);
-                }
-                conn.disconnect();
+            if (!dexPath.exists())
+                dlSnet();
+            loadClasses();
+
+            try {
+                snet_ver = (int) helperClazz.getMethod("getVersion").invoke(null);
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            }
+
+            if (snet_ver != Const.SNET_VER) {
+                dlSnet();
+                loadClasses();
             }
-            loader = new DexClassLoader(dexPath.toString(), dexPath.getParent(),
-                    null, ClassLoader.getSystemClassLoader());
         } catch (Exception e) {
             return e;
         }
+
         return null;
     }
 
@@ -65,8 +81,6 @@ public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
         MagiskManager mm = MagiskManager.get();
         try {
             if (err != null) throw err;
-            Class<?> helperClazz = loader.loadClass(Const.SNET_PKG + ".SafetyNetHelper");
-            Class<?> callbackClazz = loader.loadClass(Const.SNET_PKG + ".SafetyNetCallback");
             Object helper = helperClazz.getConstructors()[0].newInstance(
                     getActivity(), dexPath.getPath(), Proxy.newProxyInstance(
                             loader, new Class[] { callbackClazz }, (proxy, method, args) -> {

src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java

@@ -33,7 +33,7 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
                 jsonStr = WebService.getString(Const.Url.BETA_URL);
                 break;
             case Const.Value.CUSTOM_CHANNEL:
-                jsonStr = WebService.getString(mm.customChannelUrl);
+                jsonStr = WebService.getString(mm.prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
                 break;
         }
         try {
@@ -54,7 +54,7 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
     @Override
     protected void onPostExecute(Void v) {
         MagiskManager mm = MagiskManager.get();
-        if (showNotification && mm.updateNotification) {
+        if (showNotification && mm.prefs.getBoolean(Const.Key.UPDATE_NOTIFICATION, true)) {
             if (BuildConfig.VERSION_CODE < mm.remoteManagerVersionCode) {
                 ShowUI.managerUpdateNotification();
             } else if (mm.magiskVersionCode < mm.remoteMagiskVersionCode) {

src/main/java/com/topjohnwu/magisk/asyncs/FlashZip.java

@@ -38,7 +38,7 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
 
     private boolean unzipAndCheck() throws Exception {
         ZipUtils.unzip(mCachedFile, mCachedFile.getParentFile(), "META-INF/com/google/android", true);
-        List<String> ret = Utils.readFile(new File(mCachedFile.getParentFile(), "updater-script").getPath());
+        List<String> ret = Utils.readFile(new File(mCachedFile.getParentFile(), "updater-script"));
         return Utils.isValidShellResponse(ret) && ret.get(0).contains("#MAGISK");
     }
 

src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java

@@ -1,5 +1,7 @@
 package com.topjohnwu.magisk.asyncs;
 
+import android.app.Activity;
+import android.app.ProgressDialog;
 import android.widget.Toast;
 
 import com.topjohnwu.crypto.JarMap;
@@ -14,11 +16,16 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.security.SecureRandom;
 import java.util.List;
-import java.util.Locale;
 import java.util.jar.JarEntry;
 
 public class HideManager extends ParallelTask<Void, Void, Boolean> {
 
+    private ProgressDialog dialog;
+
+    public HideManager(Activity activity) {
+        super(activity);
+    }
+
     private String genPackageName(String prefix, int length) {
         StringBuilder builder = new StringBuilder(length);
         builder.append(prefix);
@@ -87,8 +94,9 @@ public class HideManager extends ParallelTask<Void, Void, Boolean> {
 
     @Override
     protected void onPreExecute() {
-        MagiskManager.toast(R.string.hide_manager_toast, Toast.LENGTH_SHORT);
-        MagiskManager.toast(R.string.hide_manager_toast2, Toast.LENGTH_LONG);
+        dialog = ProgressDialog.show(getActivity(),
+                getActivity().getString(R.string.hide_manager_toast),
+                getActivity().getString(R.string.hide_manager_toast2));
     }
 
     @Override
@@ -123,21 +131,21 @@ public class HideManager extends ParallelTask<Void, Void, Boolean> {
 
         // Install the application
 
-        List<String> ret = Shell.su(String.format(Locale.US,
-                "pm install --user %d %s >/dev/null && echo true || echo false",
-                mm.userId, repack));
+        List<String> ret = Shell.su(Utils.fmt("pm install %s >/dev/null && echo true || echo false", repack));
         repack.delete();
         if (!Utils.isValidShellResponse(ret) || !Boolean.parseBoolean(ret.get(0)))
             return false;
 
         mm.suDB.setStrings(Const.Key.SU_REQUESTER, pkg);
-        Shell.su_raw(String.format(Locale.US, "pm uninstall --user %d %s", mm.userId, mm.getPackageName()));
+        Utils.dumpPrefs();
+        Utils.uninstallPkg(Const.ORIG_PKG_NAME);
 
         return true;
     }
 
     @Override
     protected void onPostExecute(Boolean b) {
+        dialog.dismiss();
         if (!b) {
             MagiskManager.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
         }

src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java

@@ -28,6 +28,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -39,26 +40,23 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
     private Uri mBootImg, mZip;
     private List<String> console, logs;
     private String mBootLocation;
-    private boolean mKeepEnc, mKeepVerity;
     private int mode;
 
-    private InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, boolean enc, boolean verity) {
+    private InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip) {
         super(context);
         this.console = console;
         this.logs = logs;
         mZip = zip;
-        mKeepEnc = enc;
-        mKeepVerity = verity;
     }
 
-    public InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, boolean enc, boolean verity, Uri boot) {
-        this(context, console, logs, zip, enc, verity);
+    public InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, Uri boot) {
+        this(context, console, logs, zip);
         mBootImg = boot;
         mode = PATCH_MODE;
     }
 
-    public InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, boolean enc, boolean verity, String boot) {
-        this(context, console, logs, zip, enc, verity);
+    public InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, String boot) {
+        this(context, console, logs, zip);
         mBootLocation = boot;
         mode = DIRECT_MODE;
     }
@@ -104,8 +102,10 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                 console.add("! Cannot unzip zip");
                 throw e;
             }
+            Shell.sh("chmod 755 " + install + "/*");
 
             File boot = new File(install, "boot.img");
+            boolean highCompression = false;
             switch (mode) {
                 case PATCH_MODE:
                     console.add("- Use boot image: " + boot);
@@ -141,6 +141,18 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                     break;
                 case DIRECT_MODE:
                     console.add("- Use boot image: " + mBootLocation);
+                    if (mm.remoteMagiskVersionCode >= 1463) {
+                        List<String> ret = new ArrayList<>();
+                         Shell.getShell().run(ret, logs,
+                                install + "/magiskboot --parse " + mBootLocation,
+                                "echo $?"
+                        );
+                        if (Utils.isValidShellResponse(ret)) {
+                            highCompression = Integer.parseInt(ret.get(ret.size() - 1)) == 2;
+                            if (highCompression)
+                                console.add("! Insufficient boot partition size detected");
+                        }
+                    }
                     if (boot.createNewFile()) {
                         Shell.su("cat " + mBootLocation + " > " + boot);
                     } else {
@@ -173,8 +185,9 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
             // Patch boot image
             shell.run(console, logs,
                     "cd " + install,
-                    "KEEPFORCEENCRYPT=" + mKeepEnc + " KEEPVERITY=" + mKeepVerity + " sh " +
-                            "update-binary indep boot_patch.sh " + boot + " || echo 'Failed!'");
+                    Utils.fmt("KEEPFORCEENCRYPT=%b KEEPVERITY=%b HIGHCOMP=%b " +
+                                    "sh update-binary indep boot_patch.sh %s || echo 'Failed!'",
+                            mm.keepEnc, mm.keepVerity, highCompression, boot));
 
             if (TextUtils.equals(console.get(console.size() - 1), "Failed!"))
                 return false;
@@ -228,14 +241,13 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                     console.add("*********************************");
                     break;
                 case DIRECT_MODE:
-                    // Direct flash boot image and patch dtbo if possible
+                    String binPath = mm.remoteMagiskVersionCode >= 1464 ? "/data/adb/magisk" : "/data/magisk";
                     Shell.getShell().run(console, logs,
-                            "rm -rf /data/magisk/*",
-                            "mkdir -p /data/magisk 2>/dev/null",
-                            "mv -f " + install + "/* /data/magisk",
-                            "rm -rf " + install,
-                            "flash_boot_image " + patched_boot + " " + mBootLocation,
-                            "patch_dtbo_image");
+                            Utils.fmt("rm -rf %s/*; mkdir -p %s; chmod 700 /data/adb", binPath, binPath),
+                            Utils.fmt("cp -af %s/* %s; rm -rf %s", install, binPath, install),
+                            Utils.fmt("flash_boot_image %s %s", patched_boot, mBootLocation),
+                            mm.remoteMagiskVersionCode >= 1464 ? "[ -L /data/magisk.img ] || cp /data/magisk.img /data/adb/magisk.img" : "",
+                            mm.keepVerity ? "" : "patch_dtbo_image");
                     break;
                 default:
                     return false;

src/main/java/com/topjohnwu/magisk/asyncs/MarkDownWindow.java

@@ -0,0 +1,84 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.support.v7.app.AlertDialog;
+import android.webkit.WebView;
+
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.WebService;
+
+import org.commonmark.node.Node;
+import org.commonmark.parser.Parser;
+import org.commonmark.renderer.html.HtmlRenderer;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class MarkDownWindow extends ParallelTask<Void, Void, String> {
+
+    private String mTitle;
+    private String mUrl;
+    private InputStream is;
+
+
+    public MarkDownWindow(Activity context, String title, String url) {
+        super(context);
+        mTitle = title;
+        mUrl = url;
+    }
+
+    public MarkDownWindow(Activity context, String title, InputStream in) {
+        super(context);
+        mTitle = title;
+        is = in;
+    }
+
+    @Override
+    protected String doInBackground(Void... voids) {
+        MagiskManager mm = MagiskManager.get();
+        String md;
+        if (mUrl != null) {
+            md = WebService.getString(mUrl);
+        } else {
+            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+                Utils.inToOut(is, out);
+                md = out.toString();
+                is.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+                return "";
+            }
+        }
+        String css;
+        try (
+            InputStream in = mm.getAssets().open(mm.isDarkTheme ? "dark.css" : "light.css");
+            ByteArrayOutputStream out = new ByteArrayOutputStream()
+        ) {
+            Utils.inToOut(in, out);
+            css = out.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "";
+        }
+        Parser parser = Parser.builder().build();
+        HtmlRenderer renderer = HtmlRenderer.builder().build();
+        Node doc = parser.parse(md);
+        return String.format("<style>%s</style>%s", css, renderer.render(doc));
+    }
+
+    @Override
+    protected void onPostExecute(String html) {
+        AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
+        alert.setTitle(mTitle);
+
+        WebView wv = new WebView(getActivity());
+        wv.loadDataWithBaseURL("fake://", html, "text/html", "UTF-8", null);
+
+        alert.setView(wv);
+        alert.setNegativeButton(R.string.close, (dialog, id) -> dialog.dismiss());
+        alert.show();
+    }
+}

src/main/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java

@@ -12,7 +12,6 @@ import android.widget.Toast;
 import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.container.InputStreamWrapper;
 import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
@@ -24,6 +23,7 @@ import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -167,7 +167,7 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
         return this;
     }
 
-    private class ProgressInputStream extends InputStreamWrapper {
+    private class ProgressInputStream extends FilterInputStream {
 
         ProgressInputStream(InputStream in) {
             super(in);

src/main/java/com/topjohnwu/magisk/asyncs/RestoreImages.java

@@ -9,7 +9,7 @@ import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.List;
 
-public class RestoreStockBoot extends ParallelTask<Void, Void, Boolean> {
+public class RestoreImages extends ParallelTask<Void, Void, Boolean> {
 
     @Override
     protected Boolean doInBackground(Void... voids) {

src/main/java/com/topjohnwu/magisk/components/Activity.java

@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.support.annotation.Keep;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StyleRes;
 import android.support.v7.app.AppCompatActivity;
 import android.view.WindowManager;
 
@@ -17,10 +18,11 @@ import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.Utils;
 
-public class Activity extends AppCompatActivity {
+public abstract class Activity extends AppCompatActivity {
 
-    private AssetManager mAssetManager = null;
-    private Resources mResources = null;
+    private AssetManager swappedAssetManager = null;
+    private Resources swappedResources = null;
+    private Resources.Theme swappedTheme = null;
     private ActivityResultListener activityResultListener;
 
     public Activity() {
@@ -30,12 +32,18 @@ public class Activity extends AppCompatActivity {
         applyOverrideConfiguration(configuration);
     }
 
+    @StyleRes
+    abstract public int getDarkTheme();
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (this instanceof Topic.Subscriber) {
             ((Topic.Subscriber) this).subscribeTopics();
         }
+        if (getMagiskManager().isDarkTheme && getDarkTheme() > 0) {
+            setTheme(getDarkTheme());
+        }
     }
 
     @Override
@@ -57,14 +65,19 @@ public class Activity extends AppCompatActivity {
         mm.permissionGrantCallback = null;
     }
 
+    @Override
+    public Resources.Theme getTheme() {
+        return swappedTheme == null ? super.getTheme() : swappedTheme;
+    }
+
     @Override
     public AssetManager getAssets() {
-        return mAssetManager == null ? super.getAssets() : mAssetManager;
+        return swappedAssetManager == null ? super.getAssets() : swappedAssetManager;
     }
 
     @Override
     public Resources getResources() {
-        return mResources == null ? super.getResources() : mResources;
+        return swappedResources == null ? super.getResources() : swappedResources;
     }
 
     public MagiskManager getMagiskManager() {
@@ -92,30 +105,27 @@ public class Activity extends AppCompatActivity {
         activityResultListener = null;
     }
 
-    @Override
-    public void startActivityForResult(Intent intent, int requestCode) {
-        startActivityForResult(intent, requestCode, this::onActivityResult);
-    }
-
     public void startActivityForResult(Intent intent, int requestCode, ActivityResultListener listener) {
         activityResultListener = listener;
         super.startActivityForResult(intent, requestCode);
     }
 
     @Keep
-    public void swapResources(String dexPath) {
-        mAssetManager = Utils.getAssets(dexPath);
-        if (mAssetManager == null)
+    public void swapResources(String dexPath, int resId) {
+        swappedAssetManager = Utils.getAssets(dexPath);
+        if (swappedAssetManager == null)
             return;
         Resources res = super.getResources();
-        mResources = new Resources(mAssetManager, res.getDisplayMetrics(), res.getConfiguration());
-        mResources.newTheme().setTo(super.getTheme());
+        swappedResources = new Resources(swappedAssetManager, res.getDisplayMetrics(), res.getConfiguration());
+        swappedTheme = swappedResources.newTheme();
+        swappedTheme.applyStyle(resId, true);
     }
 
     @Keep
     public void restoreResources() {
-        mAssetManager = null;
-        mResources = null;
+        swappedAssetManager = null;
+        swappedResources = null;
+        swappedTheme = null;
     }
 
     public interface ActivityResultListener {

src/main/java/com/topjohnwu/magisk/components/AlertDialogBuilder.java

@@ -9,8 +9,6 @@ import android.support.annotation.StyleRes;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewStub;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -29,7 +27,6 @@ public class AlertDialogBuilder extends AlertDialog.Builder {
     @BindView(R.id.positive) Button positive;
     @BindView(R.id.neutral) Button neutral;
     @BindView(R.id.message) TextView messageView;
-    @BindView(R.id.custom_view) ViewStub custom;
 
     private DialogInterface.OnClickListener positiveListener;
     private DialogInterface.OnClickListener negativeListener;
@@ -59,20 +56,15 @@ public class AlertDialogBuilder extends AlertDialog.Builder {
     }
 
     @Override
-    public AlertDialog.Builder setView(int layoutResId) {
-        custom.setLayoutResource(layoutResId);
-        custom.inflate();
-        return this;
+    public AlertDialog.Builder setTitle(int titleId) {
+        return super.setTitle(titleId);
     }
 
     @Override
-    public AlertDialog.Builder setView(View view) {
-        ViewGroup parent = (ViewGroup) custom.getParent();
-        int idx = parent.indexOfChild(custom);
-        parent.removeView(custom);
-        parent.addView(view, idx);
-        return this;
-    }
+    public AlertDialog.Builder setView(int layoutResId) { return this; }
+
+    @Override
+    public AlertDialog.Builder setView(View view) { return this; }
 
     @Override
     public AlertDialog.Builder setMessage(@Nullable CharSequence message) {

src/main/java/com/topjohnwu/magisk/container/Policy.java

@@ -21,7 +21,7 @@ public class Policy implements Comparable<Policy>{
     public Policy(int uid, PackageManager pm) throws PackageManager.NameNotFoundException {
         String[] pkgs = pm.getPackagesForUid(uid);
         if (pkgs == null || pkgs.length == 0) throw new PackageManager.NameNotFoundException();
-        this.uid = uid % 100000;
+        this.uid = uid;
         packageName = pkgs[0];
         info = pm.getApplicationInfo(packageName, 0);
         appName = info.loadLabel(pm).toString();

src/main/java/com/topjohnwu/magisk/container/Repo.java

@@ -3,9 +3,11 @@ package com.topjohnwu.magisk.container;
 import android.content.ContentValues;
 import android.database.Cursor;
 
+import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.WebService;
 
+import java.text.DateFormat;
 import java.util.Date;
 
 public class Repo extends BaseModule {
@@ -40,7 +42,7 @@ public class Repo extends BaseModule {
         if (getVersionCode() < 0) {
             throw new IllegalRepoException("Repo [" + repoName + "] does not contain versionCode");
         }
-        if (getMinMagiskVersion() < Const.Value.MIN_MODULE_VER) {
+        if (getMinMagiskVersion() < Const.MIN_MODULE_VER) {
             throw new IllegalRepoException("Repo [" + repoName + "] is outdated");
         }
     }
@@ -78,6 +80,11 @@ public class Repo extends BaseModule {
         return String.format(Const.Url.FILE_URL, repoName, "README.md");
     }
 
+    public String getLastUpdateString() {
+        return DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM,
+                MagiskManager.locale).format(mLastUpdate);
+    }
+
     public Date getLastUpdate() {
         return mLastUpdate;
     }

src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java

@@ -28,7 +28,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
         // Clear bad repos
         mDb.delete(TABLE_NAME, "minMagisk<?",
-                new String[] { String.valueOf(Const.Value.MIN_MODULE_VER) });
+                new String[] { String.valueOf(Const.MIN_MODULE_VER) });
     }
 
     @Override
@@ -95,9 +95,17 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public Cursor getRepoCursor() {
+        String orderBy = null;
+        switch (mm.repoOrder) {
+            case Const.Value.ORDER_NAME:
+                orderBy = "name COLLATE NOCASE";
+                break;
+            case Const.Value.ORDER_DATE:
+                orderBy = "last_update DESC";
+        }
         return mDb.query(TABLE_NAME, null, "minMagisk<=?",
                 new String[] { String.valueOf(mm.magiskVersionCode) },
-                null, null, "name COLLATE NOCASE");
+                null, null, orderBy);
     }
 
     public List<String> getRepoIDList() {

src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java

@@ -4,7 +4,6 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
@@ -15,6 +14,7 @@ import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.container.SuLogEntry;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 
@@ -28,89 +28,130 @@ import java.util.List;
 public class SuDatabaseHelper extends SQLiteOpenHelper {
 
     public static final String DB_NAME = "su.db";
+    public static boolean verified = false;
 
     private static final int DATABASE_VER = 5;
     private static final String POLICY_TABLE = "policies";
     private static final String LOG_TABLE = "logs";
     private static final String SETTINGS_TABLE = "settings";
     private static final String STRINGS_TABLE = "strings";
-
-    private static String GLOBAL_DB;
+    private static final File GLOBAL_DB = new File("/data/adb/magisk.db");
 
     private Context mContext;
     private PackageManager pm;
     private SQLiteDatabase mDb;
 
-    private static Context preProcess() {
-        Context context;
+    private static void unmntDB() {
+        Shell.su(Utils.fmt("umount -l /data/user*/*/%s/*/*.db", MagiskManager.get().getPackageName()));
+    }
+
+    private static Context initDB(boolean verify) {
+        Context context, de = null;
+        MagiskManager ce = MagiskManager.get();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            Context ce = MagiskManager.get();
-            context = ce.createDeviceProtectedStorageContext();
-            File oldDB = Utils.getDatabasePath(ce, DB_NAME);
-            if (oldDB.exists()) {
-                // Migrate DB path
-                context.moveDatabaseFrom(ce, DB_NAME);
+            de = ce.createDeviceProtectedStorageContext();
+            File ceDB = Utils.getDB(ce, DB_NAME);
+            if (ceDB.exists()) {
+                context = ce;
+            } else {
+                context = de;
             }
         } else {
-            context = MagiskManager.get();
+            context = ce;
         }
-        GLOBAL_DB = context.getFilesDir().getParentFile().getParent() + "/magisk.db";
-        File db = Utils.getDatabasePath(context, DB_NAME);
-        if (!db.exists() && Utils.itemExist(GLOBAL_DB)) {
-            // Migrate global DB to ours
-            db.getParentFile().mkdirs();
-            Shell.su(
-                    "magisk --clone-attr " + context.getFilesDir() + " " + GLOBAL_DB,
-                    "chmod 660 " + GLOBAL_DB,
-                    "ln " + GLOBAL_DB + " " + db
-            );
+
+        File db = Utils.getDB(context, DB_NAME);
+        if (!verify) {
+            if (db.exists() && db.length() == 0) {
+                ce.loadMagiskInfo();
+                // Continue verification
+            } else {
+                return context;
+            }
+        }
+
+        // Encryption storage
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            if (ce.magiskVersionCode < 1410) {
+                if (context == de) {
+                    unmntDB();
+                    ce.moveDatabaseFrom(de, DB_NAME);
+                    context = ce;
+                }
+            } else {
+                if (context == ce) {
+                    unmntDB();
+                    de.moveDatabaseFrom(ce, DB_NAME);
+                    context = de;
+                }
+            }
+        }
+        // Context might be updated
+        db = Utils.getDB(context, DB_NAME);
+
+        if (!Shell.rootAccess())
+            return context;
+
+        // Verify the global db matches the local with the same inode
+        if (ce.magiskVersionCode >= 1450 && ce.magiskVersionCode < 1460) {
+            // v14.5 global su db
+            File OLD_GLOBAL_DB = new File(context.getFilesDir().getParentFile().getParentFile(), "magisk.db");
+            verified = TextUtils.equals(Utils.checkInode(OLD_GLOBAL_DB), Utils.checkInode(db));
+            if (!verified) {
+                context.deleteDatabase(DB_NAME);
+                db.getParentFile().mkdirs();
+                Shell.su(Utils.fmt("magisk --clone-attr %s %s; chmod 600 %s; ln %s %s",
+                        context.getFilesDir(), OLD_GLOBAL_DB, OLD_GLOBAL_DB, OLD_GLOBAL_DB, db));
+                verified = TextUtils.equals(Utils.checkInode(OLD_GLOBAL_DB), Utils.checkInode(db));
+            }
+        } else if (ce.magiskVersionCode >= 1464) {
+            // New global su db
+            Shell.su(Utils.fmt("mkdir %s 2>/dev/null; chmod 700 %s", GLOBAL_DB.getParent(), GLOBAL_DB.getParent()));
+            if (!Utils.itemExist(GLOBAL_DB)) {
+                context.openOrCreateDatabase(DB_NAME, 0, null).close();
+                Shell.su(Utils.fmt("cp -af %s %s; rm -f %s*", db, GLOBAL_DB, db));
+            }
+            verified = TextUtils.equals(Utils.checkInode(GLOBAL_DB), Utils.checkInode(db));
+            if (!verified) {
+                context.deleteDatabase(DB_NAME);
+                Utils.javaCreateFile(db);
+                Shell.su(Utils.fmt(
+                        "chown 0.0 %s; chmod 666 %s; chcon u:object_r:su_file:s0 %s;" +
+                                "mount -o bind %s %s",
+                        GLOBAL_DB, GLOBAL_DB, GLOBAL_DB, GLOBAL_DB, db));
+                verified = TextUtils.equals(Utils.checkInode(GLOBAL_DB), Utils.checkInode(db));
+            }
         }
         return context;
     }
 
-    public static void setupSuDB() {
-        MagiskManager mm = MagiskManager.get();
-        // Check if we need to migrate suDB
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && mm.magiskVersionCode >= 1410 &&
-                Utils.getDatabasePath(mm, SuDatabaseHelper.DB_NAME).exists()) {
-            mm.suDB.close();
-            mm.suDB = new SuDatabaseHelper();
-        }
-
-        File suDbFile = mm.suDB.getDbFile();
-
-        if (!Utils.itemExist(GLOBAL_DB)) {
-            // Hard link our DB globally
-            Shell.su_raw("ln " + suDbFile + " " + GLOBAL_DB);
-        }
-
-        // Check if we are linked globally
-        List<String> ret = Shell.sh("ls -l " + suDbFile);
-        if (Utils.isValidShellResponse(ret)) {
-            try {
-                int links = Integer.parseInt(ret.get(0).trim().split("\\s+")[1]);
-                if (links < 2) {
-                    mm.suDB.close();
-                    suDbFile.delete();
-                    new File(suDbFile + "-journal").delete();
-                    mm.suDB = new SuDatabaseHelper();
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+    public static SuDatabaseHelper getSuDB(boolean verify) {
+        try {
+            return new SuDatabaseHelper(initDB(verify));
+        } catch(Exception e) {
+            // Try to catch runtime exceptions and remove all db for retry
+            unmntDB();
+            Shell.su(Utils.fmt("rm -rf /data/user*/*/magisk.db /data/adb/magisk.db /data/user*/*/%s/databases",
+                    MagiskManager.get().getPackageName()));
+            e.printStackTrace();
+            return new SuDatabaseHelper(initDB(false));
         }
     }
 
-    public SuDatabaseHelper() {
-        this(preProcess());
-    }
-
-    public SuDatabaseHelper(Context context) {
+    private SuDatabaseHelper(Context context) {
         super(context, DB_NAME, null, DATABASE_VER);
         mContext = context;
         pm = context.getPackageManager();
         mDb = getWritableDatabase();
         cleanup();
+
+        if (context.getPackageName().equals(Const.ORIG_PKG_NAME)) {
+            String pkg = getStrings(Const.Key.SU_REQUESTER, null);
+            if (pkg != null) {
+                Utils.uninstallPkg(pkg);
+                setStrings(Const.Key.SU_REQUESTER, null);
+            }
+        }
     }
 
     @Override
@@ -127,44 +168,32 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
             }
             if (oldVersion == 1) {
                 // We're dropping column app_name, rename and re-construct table
-                db.execSQL("ALTER TABLE " + POLICY_TABLE + " RENAME TO " + POLICY_TABLE + "_old");
+                db.execSQL(Utils.fmt("ALTER TABLE %s RENAME TO %s_old", POLICY_TABLE));
 
                 // Create the new tables
                 createTables(db);
 
                 // Migrate old data to new tables
-                db.execSQL(
-                        "INSERT INTO " + POLICY_TABLE + " SELECT " +
-                                "uid, package_name, policy, until, logging, notification " +
-                                "FROM " + POLICY_TABLE + "_old");
-                db.execSQL("DROP TABLE " + POLICY_TABLE + "_old");
+                db.execSQL(Utils.fmt("INSERT INTO %s SELECT " +
+                        "uid, package_name, policy, until, logging, notification FROM %s_old",
+                        POLICY_TABLE, POLICY_TABLE));
+                db.execSQL(Utils.fmt("DROP TABLE %s_old", POLICY_TABLE));
 
-                File oldDB = Utils.getDatabasePath(MagiskManager.get(), "sulog.db");
-                if (oldDB.exists()) {
-                    migrateLegacyLogList(oldDB, db);
-                    MagiskManager.get().deleteDatabase("sulog.db");
-                }
+                MagiskManager.get().deleteDatabase("sulog.db");
                 ++oldVersion;
             }
             if (oldVersion == 2) {
-                db.execSQL("UPDATE " + LOG_TABLE + " SET time=time*1000");
+                db.execSQL(Utils.fmt("UPDATE %s SET time=time*1000", LOG_TABLE));
                 ++oldVersion;
             }
             if (oldVersion == 3) {
-                db.execSQL(
-                        "CREATE TABLE IF NOT EXISTS " + STRINGS_TABLE + " " +
-                                "(key TEXT, value TEXT, PRIMARY KEY(key))");
+                db.execSQL(Utils.fmt("CREATE TABLE IF NOT EXISTS %s (key TEXT, value TEXT, PRIMARY KEY(key))", STRINGS_TABLE));
                 ++oldVersion;
             }
             if (oldVersion == 4) {
-                db.execSQL("UPDATE " + POLICY_TABLE + " SET uid=uid%100000");
+                db.execSQL(Utils.fmt("UPDATE %s SET uid=uid%%100000", POLICY_TABLE));
                 ++oldVersion;
             }
-
-            if (!Utils.itemExist(GLOBAL_DB)) {
-                // Hard link our DB globally
-                Shell.su_raw("ln " + getDbFile() + " " + GLOBAL_DB);
-            }
         } catch (Exception e) {
             e.printStackTrace();
             onDowngrade(db, DATABASE_VER, 0);
@@ -206,17 +235,15 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
                 "(key TEXT, value INT, PRIMARY KEY(key))");
     }
 
-    private void cleanup() {
+    public void cleanup() {
         // Clear outdated policies
-        mDb.delete(POLICY_TABLE, "until > 0 AND until < ?",
-                new String[] { String.valueOf(System.currentTimeMillis() / 1000) });
+        mDb.delete(POLICY_TABLE, Utils.fmt("until > 0 AND until < %d", System.currentTimeMillis() / 1000), null);
         // Clear outdated logs
-        mDb.delete(LOG_TABLE, "time < ?", new String[] { String.valueOf(
-                System.currentTimeMillis() - MagiskManager.get().suLogTimeout * 86400000) });
+        mDb.delete(LOG_TABLE, Utils.fmt("time < %d", System.currentTimeMillis() - MagiskManager.get().suLogTimeout * 86400000), null);
     }
 
     public void deletePolicy(Policy policy) {
-        deletePolicy(policy.packageName);
+        deletePolicy(policy.uid);
     }
 
     public void deletePolicy(String pkg) {
@@ -224,12 +251,12 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public void deletePolicy(int uid) {
-        mDb.delete(POLICY_TABLE, "uid=?", new String[]{String.valueOf(uid)});
+        mDb.delete(POLICY_TABLE, Utils.fmt("uid=%d", uid), null);
     }
 
     public Policy getPolicy(int uid) {
         Policy policy = null;
-        try (Cursor c = mDb.query(POLICY_TABLE, null, "uid=?", new String[] { String.valueOf(uid % 100000) }, null, null, null)) {
+        try (Cursor c = mDb.query(POLICY_TABLE, null, Utils.fmt("uid=%d", uid), null, null, null, null)) {
             if (c.moveToNext()) {
                 policy = new Policy(c, pm);
             }
@@ -240,30 +267,17 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
         return policy;
     }
 
-    public Policy getPolicy(String pkg) {
-        Policy policy = null;
-        try (Cursor c = mDb.query(POLICY_TABLE, null, "package_name=?", new String[] { pkg }, null, null, null)) {
-            if (c.moveToNext()) {
-                policy = new Policy(c, pm);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            deletePolicy(pkg);
-            return null;
-        }
-        return policy;
-    }
-
     public void addPolicy(Policy policy) {
         mDb.replace(POLICY_TABLE, null, policy.getContentValues());
     }
 
     public void updatePolicy(Policy policy) {
-        mDb.update(POLICY_TABLE, policy.getContentValues(), "package_name=?",
-                new String[] { policy.packageName });
+        mDb.update(POLICY_TABLE, policy.getContentValues(), Utils.fmt("uid=%d", policy.uid), null);
     }
 
     public List<Policy> getPolicyList(PackageManager pm) {
-        try (Cursor c = mDb.query(POLICY_TABLE, null, null, null, null, null, null)) {
+        try (Cursor c = mDb.query(POLICY_TABLE, null, Utils.fmt("uid/100000=%d", Const.USER_ID),
+                null, null, null, null)) {
             List<Policy> ret = new ArrayList<>(c.getCount());
             while (c.moveToNext()) {
                 try {
@@ -280,7 +294,8 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public List<List<Integer>> getLogStructure() {
-        try (Cursor c = mDb.query(LOG_TABLE, new String[] { "time" }, null, null, null, null, "time DESC")) {
+        try (Cursor c = mDb.query(LOG_TABLE, new String[] { "time" }, Utils.fmt("from_uid/100000=%d", Const.USER_ID),
+                null, null, null, "time DESC")) {
             List<List<Integer>> ret = new ArrayList<>();
             List<Integer> list = null;
             String dateString = null, newString;
@@ -299,22 +314,8 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public Cursor getLogCursor() {
-        return getLogCursor(mDb);
-    }
-
-    public Cursor getLogCursor(SQLiteDatabase db) {
-        return db.query(LOG_TABLE, null, null, null, null, null, "time DESC");
-    }
-
-    private void migrateLegacyLogList(File oldDB, SQLiteDatabase newDB) {
-        try (SQLiteDatabase oldDb = SQLiteDatabase.openDatabase(oldDB.getPath(), null, SQLiteDatabase.OPEN_READWRITE);
-             Cursor c = getLogCursor(oldDb)) {
-            while (c.moveToNext()) {
-                ContentValues values = new ContentValues();
-                DatabaseUtils.cursorRowToContentValues(c, values);
-                newDB.insert(LOG_TABLE, null, values);
-            }
-        }
+        return mDb.query(LOG_TABLE, null, Utils.fmt("from_uid/100000=%d", Const.USER_ID),
+                null, null, null, "time DESC");
     }
 
     public void addLog(SuLogEntry log) {

src/main/java/com/topjohnwu/magisk/receivers/DownloadReceiver.java

@@ -12,11 +12,11 @@ import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.Utils;
 
-public abstract class DownloadReceiver extends BroadcastReceiver {
-    public String mFilename;
-    long downloadID;
+import java.io.File;
 
-    public DownloadReceiver() {}
+public abstract class DownloadReceiver extends BroadcastReceiver {
+    protected File mFile;
+    private long downloadID;
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -45,12 +45,14 @@ public abstract class DownloadReceiver extends BroadcastReceiver {
         Utils.isDownloading = false;
     }
 
-    public void setDownloadID(long id) {
+    public DownloadReceiver setDownloadID(long id) {
         downloadID = id;
+        return this;
     }
 
-    public void setFilename(String filename) {
-        mFilename = filename;
+    public DownloadReceiver setFile(File file) {
+        mFile = file;
+        return this;
     }
 
     public abstract void onDownloadDone(Uri uri);

src/main/java/com/topjohnwu/magisk/receivers/ManagerUpdate.java

@@ -20,6 +20,9 @@ public class ManagerUpdate extends BroadcastReceiver {
                 new DownloadReceiver() {
                     @Override
                     public void onDownloadDone(Uri uri) {
+                        if (!context.getPackageName().equals(Const.ORIG_PKG_NAME)) {
+                            Utils.dumpPrefs();
+                        }
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                             Intent install = new Intent(Intent.ACTION_INSTALL_PACKAGE);
                             install.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
@@ -37,7 +40,7 @@ public class ManagerUpdate extends BroadcastReceiver {
                     }
                 },
                 intent.getStringExtra(Const.Key.INTENT_SET_LINK),
-                Utils.getLegalFilename("MagiskManager-v" +
-                        intent.getStringExtra(Const.Key.INTENT_SET_VERSION) + ".apk"));
+                Utils.fmt("MagiskManager-v%s.apk", intent.getStringExtra(Const.Key.INTENT_SET_VERSION))
+        );
     }
 }

src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 
 import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Shell;
 import com.topjohnwu.magisk.utils.Utils;
 
@@ -18,7 +19,7 @@ public class PackageReceiver extends BroadcastReceiver {
         switch (intent.getAction()) {
             case Intent.ACTION_PACKAGE_REPLACED:
                 // This will only work pre-O
-                if (mm.suReauth) {
+                if (mm.prefs.getBoolean(Const.Key.SU_REAUTH, false)) {
                     mm.suDB.deletePolicy(pkg);
                 }
                 break;

src/main/java/com/topjohnwu/magisk/services/OnBootIntentService.java

@@ -41,6 +41,7 @@ public class OnBootIntentService extends IntentService {
          * */
         MagiskManager mm = Utils.getMagiskManager(this);
         mm.loadMagiskInfo();
+        mm.getDefaultInstallFlags();
         if (Shell.rootAccess()) {
             Utils.patchDTBO();
         }

src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java

@@ -3,12 +3,14 @@ package com.topjohnwu.magisk.superuser;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.hardware.fingerprint.FingerprintManager;
 import android.net.LocalSocket;
 import android.net.LocalSocketAddress;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.FileObserver;
 import android.text.TextUtils;
+import android.view.View;
 import android.view.Window;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -23,6 +25,8 @@ import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.components.Activity;
 import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.utils.Utils;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -30,7 +34,7 @@ import java.io.IOException;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class SuRequestActivity extends Activity {
+public class RequestActivity extends Activity {
 
     @BindView(R.id.su_popup) LinearLayout suPopup;
     @BindView(R.id.timeout) Spinner timeout;
@@ -39,6 +43,8 @@ public class SuRequestActivity extends Activity {
     @BindView(R.id.package_name) TextView packageNameView;
     @BindView(R.id.grant_btn) Button grant_btn;
     @BindView(R.id.deny_btn) Button deny_btn;
+    @BindView(R.id.fingerprint) ImageView fingerprintImg;
+    @BindView(R.id.warning) TextView warning;
 
     private String socketPath;
     private LocalSocket socket;
@@ -48,6 +54,12 @@ public class SuRequestActivity extends Activity {
     private boolean hasTimeout;
     private Policy policy;
     private CountDownTimer timer;
+    private FingerprintHelper fingerprintHelper;
+
+    @Override
+    public int getDarkTheme() {
+        return R.style.SuRequest_Dark;
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -55,7 +67,8 @@ public class SuRequestActivity extends Activity {
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         pm = getPackageManager();
-        mm = getMagiskManager();
+        mm = Utils.getMagiskManager(this);
+        mm.suDB.cleanup();
 
         Intent intent = getIntent();
         socketPath = intent.getStringExtra("socket");
@@ -73,6 +86,15 @@ public class SuRequestActivity extends Activity {
         new SocketManager(this).exec();
     }
 
+    @Override
+    public void finish() {
+        if (timer != null)
+            timer.cancel();
+        if (fingerprintHelper != null)
+            fingerprintHelper.cancel();
+        super.finish();
+    }
+
     private boolean cancelTimeout() {
         timer.cancel();
         deny_btn.setText(getString(R.string.deny));
@@ -121,10 +143,49 @@ public class SuRequestActivity extends Activity {
             }
         };
 
-        grant_btn.setOnClickListener(v -> {
-            handleAction(Policy.ALLOW);
-            timer.cancel();
-        });
+        boolean useFingerprint = mm.prefs.getBoolean(Const.Key.SU_FINGERPRINT, false) && FingerprintHelper.canUseFingerprint();
+
+        if (useFingerprint) {
+            try {
+                fingerprintHelper = new FingerprintHelper() {
+                    @Override
+                    public void onAuthenticationError(int errorCode, CharSequence errString) {
+                        warning.setText(errString);
+                    }
+
+                    @Override
+                    public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
+                        warning.setText(helpString);
+                    }
+
+                    @Override
+                    public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+                        handleAction(Policy.ALLOW);
+                    }
+
+                    @Override
+                    public void onAuthenticationFailed() {
+                        warning.setText(R.string.auth_fail);
+                    }
+                };
+                fingerprintHelper.startAuth();
+            } catch (Exception e) {
+                e.printStackTrace();
+                useFingerprint = false;
+            }
+        }
+
+        if (!useFingerprint) {
+            grant_btn.setOnClickListener(v -> {
+                handleAction(Policy.ALLOW);
+                timer.cancel();
+            });
+            grant_btn.requestFocus();
+        }
+
+        grant_btn.setVisibility(useFingerprint ? View.GONE : View.VISIBLE);
+        fingerprintImg.setVisibility(useFingerprint ? View.VISIBLE : View.GONE);
+
         deny_btn.setOnClickListener(v -> {
             handleAction(Policy.DENY);
             timer.cancel();
@@ -143,8 +204,9 @@ public class SuRequestActivity extends Activity {
     public void onBackPressed() {
         if (policy != null) {
             handleAction(Policy.DENY);
+        } else {
+            finish();
         }
-        finish();
     }
 
     void handleAction() {

src/main/java/com/topjohnwu/magisk/utils/Const.java

@@ -1,6 +1,9 @@
 package com.topjohnwu.magisk.utils;
 
 import android.os.Environment;
+import android.os.Process;
+
+import com.topjohnwu.magisk.MagiskManager;
 
 import java.io.File;
 import java.util.Arrays;
@@ -20,11 +23,19 @@ public class Const {
     public static final String UTIL_FUNCTIONS= "util_functions.sh";
     public static final String ANDROID_MANIFEST = "AndroidManifest.xml";
 
+    public static final String SU_KEYSTORE_KEY = "su_key";
+
     // Paths
     public static final String MAGISK_DISABLE_FILE = "/cache/.disable_magisk";
     public static final String TMP_FOLDER_PATH = "/dev/tmp";
     public static final String MAGISK_LOG = "/cache/magisk.log";
     public static final File EXTERNAL_PATH = new File(Environment.getExternalStorageDirectory(), "MagiskManager");
+    public static final String MANAGER_CONFIGS = ".tmp.magisk.config";
+
+    // Versions
+    public static final int UPDATE_SERVICE_VER = 1;
+    public static final int SNET_VER = 7;
+    public static final int MIN_MODULE_VER = 1400;
 
     public static String BUSYBOX_PATH() {
         if (Utils.itemExist("/sbin/.core/busybox/busybox")) {
@@ -49,9 +60,9 @@ public class Const {
     }
 
     /* A list of apps that should not be shown as hide-able */
-    public static final List<String> SN_BLACKLIST =  Arrays.asList(
+    public static final List<String> HIDE_BLACKLIST =  Arrays.asList(
             "android",
-            "com.topjohnwu.magisk",
+            MagiskManager.get().getPackageName(),
             "com.google.android.gms"
     );
 
@@ -62,6 +73,8 @@ public class Const {
             "com.nianticlabs.pokemongo"
     );
 
+    public static final int USER_ID = Process.myUid() / 100000;
+
     public static class ID {
         public static final int UPDATE_SERVICE_ID = 1;
         public static final int FETCH_ZIP = 2;
@@ -78,12 +91,12 @@ public class Const {
     public static class Url {
         public static final String STABLE_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/stable.json";
         public static final String BETA_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/beta.json";
-        public static final String SNET_URL = "https://github.com/topjohnwu/MagiskManager/raw/c0e60c41f26744a86d90dfbd368a73c847db6b70/snet.apk";
+        public static final String SNET_URL = "https://github.com/topjohnwu/MagiskManager/raw/a82a5e5a49285df65da91d2e8b24f4783841b515/snet.apk";
         public static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&page=%d";
         public static final String FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s";
         public static final String ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip";
         public static final String DONATION_URL = "https://www.paypal.me/topjohnwu";
-        public static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
+        public static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3473445";
         public static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/MagiskManager";
     }
 
@@ -98,6 +111,7 @@ public class Const {
         public static final String SU_AUTO_RESPONSE = "su_auto_response";
         public static final String SU_NOTIFICATION = "su_notification";
         public static final String SU_REAUTH = "su_reauth";
+        public static final String SU_FINGERPRINT = "su_fingerprint";
 
         // intents
         public static final String OPEN_SECTION = "section";
@@ -106,25 +120,23 @@ public class Const {
         public static final String INTENT_PERM = "perm_dialog";
         public static final String FLASH_ACTION = "action";
         public static final String FLASH_SET_BOOT = "boot";
-        public static final String FLASH_SET_ENC = "enc";
-        public static final String FLASH_SET_VERITY = "verity";
-
 
         // others
         public static final String UPDATE_NOTIFICATION = "notification";
         public static final String UPDATE_CHANNEL = "update_channel";
         public static final String CUSTOM_CHANNEL = "custom_channel";
         public static final String BOOT_FORMAT = "boot_format";
-        public static final String SNET_VER = "snet_version";
         public static final String UPDATE_SERVICE_VER = "update_service_version";
+        public static final String APP_VER = "app_version";
         public static final String MAGISKHIDE = "magiskhide";
         public static final String HOSTS = "hosts";
-        public static final String DISABLE = "disable";
+        public static final String COREONLY = "disable";
         public static final String LOCALE = "locale";
         public static final String DARK_THEME = "dark_theme";
         public static final String ETAG_KEY = "ETag";
         public static final String LINK_KEY = "Link";
         public static final String IF_NONE_MATCH = "If-None-Match";
+        public static final String REPO_ORDER = "repo_order";
     }
 
 
@@ -154,8 +166,7 @@ public class Const {
         public static final String PATCH_BOOT = "patch";
         public static final String FLASH_MAGISK = "magisk";
         public static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
-        public static final int UPDATE_SERVICE_VER = 1;
-        public static final int SNET_VER = 4;
-        public static final int MIN_MODULE_VER = 1400;
+        public static final int ORDER_NAME = 0;
+        public static final int ORDER_DATE = 1;
     }
 }

src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.java

@@ -0,0 +1,112 @@
+package com.topjohnwu.magisk.utils;
+
+import android.annotation.TargetApi;
+import android.app.KeyguardManager;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.Build;
+import android.os.CancellationSignal;
+import android.security.keystore.KeyGenParameterSpec;
+import android.security.keystore.KeyPermanentlyInvalidatedException;
+import android.security.keystore.KeyProperties;
+
+import com.topjohnwu.magisk.MagiskManager;
+
+import java.security.KeyStore;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+
+@TargetApi(Build.VERSION_CODES.M)
+public abstract class FingerprintHelper {
+
+    private FingerprintManager manager;
+    private Cipher cipher;
+    private CancellationSignal cancel;
+
+    public static boolean canUseFingerprint() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
+            return false;
+        MagiskManager mm = MagiskManager.get();
+        KeyguardManager km = mm.getSystemService(KeyguardManager.class);
+        FingerprintManager fm = mm.getSystemService(FingerprintManager.class);
+        return km.isKeyguardSecure() && fm != null && fm.isHardwareDetected() && fm.hasEnrolledFingerprints();
+    }
+
+    protected FingerprintHelper() throws Exception {
+        MagiskManager mm = MagiskManager.get();
+        KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore");
+        manager = mm.getSystemService(FingerprintManager.class);
+        cipher = Cipher.getInstance(KeyProperties.KEY_ALGORITHM_AES + "/"
+                + KeyProperties.BLOCK_MODE_CBC + "/"
+                + KeyProperties.ENCRYPTION_PADDING_PKCS7);
+        keyStore.load(null);
+        SecretKey key = (SecretKey) keyStore.getKey(Const.SU_KEYSTORE_KEY, null);
+        if (key == null) {
+            key = generateKey();
+        }
+        try {
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+        } catch (KeyPermanentlyInvalidatedException e) {
+            // Only happens on Marshmallow
+            key = generateKey();
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+        }
+    }
+
+    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, 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() {
+        if (cancel != null)
+            cancel.cancel();
+    }
+
+    private SecretKey generateKey() throws Exception {
+        KeyGenerator keygen = KeyGenerator
+                .getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore");
+        KeyGenParameterSpec.Builder builder = new KeyGenParameterSpec.Builder(
+                Const.SU_KEYSTORE_KEY,
+                KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT)
+                .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
+                .setUserAuthenticationRequired(true)
+                .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            builder.setInvalidatedByBiometricEnrollment(false);
+        }
+        keygen.init(builder.build());
+        return keygen.generateKey();
+    }
+}