Bump version

Swap tabs
Support unlimited amount of repos
2025-08-14 15:27:25 +00:00 · 2017-04-26 00:59:56 +08:00 · 2017-04-26 00:27:55 +08:00 · 2017-04-26 00:15:53 +08:00 · 2017-04-24 22:26:40 +08:00 · 2017-04-24 21:54:34 +08:00
45 changed files with 708 additions and 404 deletions
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # Magisk Manager
-The project should be built with Android Studio version 2.2.0+  
-I use Java 8 features, which requires Jack compiler and it's only available in 2.2.0+  
-Also, you need to install CMake and NDK to build the zipadjust library for zip preprocessing
+I used Java 8 features in the app, and official supported is added in Android Studio 2.4  
+Aware that Android Studio 2.4 is currently in the Preview Channel  
+You need to install CMake and NDK to build the zipadjust library for zip preprocessing
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,18 +2,14 @@ apply plugin: 'com.android.application'

 android {
    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "26.0.0-rc1"

    defaultConfig {
        applicationId "com.topjohnwu.magisk"
        minSdkVersion 21
        targetSdkVersion 25
-        versionCode 26
-        versionName "4.2.7"
-        jackOptions {
-            enabled true
-            jackInProcess true
-        }
+        versionCode 30
+        versionName "4.3.2"
        ndk {
            moduleName 'zipadjust'
            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
@@ -38,6 +34,9 @@ android {
            path 'src/main/jni/CMakeLists.txt'
        }
    }
+    lintOptions {
+        disable 'MissingTranslation'
+    }
 }
 repositories {
    jcenter()
@@ -47,12 +46,11 @@ repositories {
 dependencies {
    compile fileTree(include: ['*.jar'], dir: 'libs')

-    compile 'com.android.support:recyclerview-v7:25.3.0'
-    compile 'com.android.support:cardview-v7:25.3.0'
-    compile 'com.android.support:design:25.3.0'
-    compile 'com.android.support:support-v4:25.3.0'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:cardview-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:support-v4:25.3.1'
    compile 'com.jakewharton:butterknife:8.5.1'
-    compile 'com.github.clans:fab:1.6.4'
    compile 'com.thoughtbot:expandablerecyclerview:1.4'
    compile 'us.feras.mdv:markdownview:1.1.0'
    compile 'com.madgag.spongycastle:core:1.54.0.0'
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -22,4 +22,6 @@
 -keep interface android.support.v7.** { *; }

 # SpongyCastle
-keep class org.spongycastle.** {*;}
+-keep class org.spongycastle.** { *; }
+-dontwarn javax.naming.**
+
--- a/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/InstallFragment.java
@@ -100,7 +100,11 @@ public class InstallFragment extends Fragment implements CallbackEvent.Listener<
                        magiskManager.magiskLink,
                        Utils.getLegalFilename(filename)))
                .setNeutralButton(R.string.release_notes, (dialog, which) -> {
-                    magiskManager.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(magiskManager.releaseNoteLink)));
+                    if (magiskManager.releaseNoteLink != null) {
+                        Intent openReleaseNoteLink = new Intent(Intent.ACTION_VIEW, Uri.parse(magiskManager.releaseNoteLink));
+                        openReleaseNoteLink.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        magiskManager.startActivity(openReleaseNoteLink);
+                    }
                })
                .setNegativeButton(R.string.no_thanks, null)
                .show();
--- a/app/src/main/java/com/topjohnwu/magisk/LogFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/LogFragment.java
@@ -31,14 +31,14 @@ public class LogFragment extends Fragment {

        TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());

-        adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
-
        if (getApplication().isSuClient) {
            adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
            tab.setupWithViewPager(viewPager);
            tab.setVisibility(View.VISIBLE);
        }

+        adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
+
        viewPager.setAdapter(adapter);

        return v;
--- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
@@ -64,6 +64,7 @@ public class MagiskManager extends Application {
    public boolean magiskHide;
    public boolean isDarkTheme;
    public boolean updateNotification;
+    public boolean busybox;
    public int suRequestTimeout;
    public int suLogTimeout = 14;
    public int suAccessState;
@@ -104,7 +105,7 @@ public class MagiskManager extends Application {
                .putBoolean("dark_theme", isDarkTheme)
                .putBoolean("magiskhide", magiskHide)
                .putBoolean("notification", updateNotification)
-                .putBoolean("busybox", Utils.commandExists("busybox"))
+                .putBoolean("busybox", busybox)
                .putBoolean("hosts", new File("/magisk/.core/hosts").exists())
                .putBoolean("disable", Utils.itemExist(MAGISK_DISABLE_FILE))
                .putString("su_request_timeout", String.valueOf(suRequestTimeout))
@@ -150,6 +151,12 @@ public class MagiskManager extends Application {
                magiskVersion = Double.POSITIVE_INFINITY;
            }
        }
+        ret = Shell.sh("getprop persist.magisk.busybox");
+        try {
+            busybox = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;
+        } catch (NumberFormatException e) {
+            busybox = false;
+        }
        ret = Shell.sh("getprop ro.magisk.disable");
        try {
            disabled = Utils.isValidShellResponse(ret) && Integer.parseInt(ret.get(0)) != 0;
--- a/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MainActivity.java
@@ -81,6 +81,7 @@ public class MainActivity extends Activity

        navigationView.setNavigationItemSelectedListener(this);
        getApplicationContext().reloadMainActivity.register(this);
+        getApplicationContext().updateCheckDone.register(this);

    }

@@ -105,6 +106,7 @@ public class MainActivity extends Activity
    @Override
    protected void onDestroy() {
        getApplicationContext().reloadMainActivity.unRegister(this);
+        getApplicationContext().updateCheckDone.unRegister(this);
        super.onDestroy();
    }

@@ -126,7 +128,11 @@ public class MainActivity extends Activity

    @Override
    public void onTrigger(CallbackEvent<Void> event) {
-        recreate();
+        if (event == getApplicationContext().reloadMainActivity) {
+            recreate();
+        } else if (event == getApplicationContext().updateCheckDone) {
+            checkHideSection();
+        }
    }

    private void checkHideSection() {
--- a/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -12,7 +13,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;

-import com.github.clans.fab.FloatingActionButton;
 import com.topjohnwu.magisk.adapters.ModulesAdapter;
 import com.topjohnwu.magisk.asyncs.FlashZip;
 import com.topjohnwu.magisk.asyncs.LoadModules;
--- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
@@ -7,7 +7,6 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.view.WindowManager;
@@ -89,10 +88,6 @@ public class SettingsActivity extends Activity {
            prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
            prefScreen = getPreferenceScreen();

-            SwitchPreference busybox = (SwitchPreference) findPreference("busybox");
-            SwitchPreference magiskHide = (SwitchPreference) findPreference("magiskhide");
-            SwitchPreference hosts = (SwitchPreference) findPreference("hosts");
-
            PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
            PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");

@@ -118,11 +113,6 @@ public class SettingsActivity extends Activity {
                if (getApplication().magiskVersion < 11) {
                    prefScreen.removePreference(magiskCategory);
                }
-                if (getApplication().disabled) {
-                    busybox.setEnabled(false);
-                    magiskHide.setEnabled(false);
-                    hosts.setEnabled(false);
-                }
            }
        }

--- a/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
@@ -44,8 +44,8 @@ public class SplashActivity extends Activity{

        // Now fire all async tasks
        new GetBootBlocks(this).exec();
-        if (magiskManager.magiskHide && !magiskManager.disabled &&
-                magiskManager.magiskVersion > 11 && !magiskManager.magiskHideStarted) {
+        if (magiskManager.magiskHide && magiskManager.magiskVersion > 11 &&
+                !magiskManager.magiskHideStarted) {
            new MagiskHide().enable();
        }
        new LoadModules(this) {
--- a/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/StatusFragment.java
@@ -65,7 +65,9 @@ public class StatusFragment extends Fragment implements CallbackEvent.Listener<V

    @OnClick(R.id.magisk_status_container)
    public void gotoInstall() {
-        ((MainActivity) getActivity()).navigate(R.id.install);
+        if (getApplication().remoteMagiskVersion > 0) {
+            ((MainActivity) getActivity()).navigate(R.id.install);
+        }
    }

    private int defaultColor;
@@ -159,7 +161,7 @@ public class StatusFragment extends Fragment implements CallbackEvent.Listener<V
        if (getApplication().magiskVersion < 0) {
            magiskVersionText.setText(R.string.magisk_version_error);
        } else if (getApplication().disabled) {
-            magiskVersionText.setText(getString(R.string.magisk_version_disable, getApplication().magiskVersionString));
+            magiskVersionText.setText(getString(R.string.magisk_version_core_only, getApplication().magiskVersionString));
        } else {
            magiskVersionText.setText(getString(R.string.magisk_version, getApplication().magiskVersionString));
        }
@@ -212,9 +214,6 @@ public class StatusFragment extends Fragment implements CallbackEvent.Listener<V
        if (getApplication().magiskVersion < 0) {
            color = colorBad;
            image = R.drawable.ic_cancel;
-        } else if (getApplication().disabled) {
-            color = colorNeutral;
-            image = R.drawable.ic_cancel;
        }

        magiskStatusContainer.setBackgroundColor(color);
--- a/app/src/main/java/com/topjohnwu/magisk/asyncs/LoadRepos.java
+++ b/app/src/main/java/com/topjohnwu/magisk/asyncs/LoadRepos.java
@@ -12,14 +12,15 @@ import com.topjohnwu.magisk.utils.ValueSortedMap;
 import com.topjohnwu.magisk.utils.WebService;

 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;

 import java.io.File;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;

@@ -27,99 +28,156 @@ public class LoadRepos extends ParallelTask<Void, Void, Void> {

    public static final String ETAG_KEY = "ETag";

-    private static final String REPO_URL = "https://api.github.com/orgs/Magisk-Modules-Repo/repos";
+    private static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&page=%d";
+    private static final String IF_NONE_MATCH = "If-None-Match";
+    private static final String LINK_KEY = "Link";

-    private String prefsPath;
+    private static final int CHECK_ETAG = 0;
+    private static final int LOAD_NEXT = 1;
+    private static final int LOAD_PREV = 2;
+
+    private List<String> etags;
+    private ValueSortedMap<String, Repo> cached, fetched;
+    private RepoDatabaseHelper repoDB;
+    private SharedPreferences prefs;

    public LoadRepos(Activity context) {
        super(context);
-        prefsPath = context.getApplicationInfo().dataDir + "/shared_prefs";
+        prefs = magiskManager.prefs;
+        String prefsPath = context.getApplicationInfo().dataDir + "/shared_prefs";
+        repoDB = new RepoDatabaseHelper(magiskManager);
+        // Legacy data cleanup
+        File old = new File(prefsPath, "RepoMap.xml");
+        if (old.exists() || !prefs.getString("repomap", "empty").equals("empty")) {
+            old.delete();
+            prefs.edit().remove("version").remove("repomap").remove(ETAG_KEY).apply();
+            repoDB.clearRepo();
+        }
+        etags = new ArrayList<>(
+                Arrays.asList(magiskManager.prefs.getString(ETAG_KEY, "").split(",")));
+    }
+
+    private void loadJSON(String jsonString) throws Exception {
+        JSONArray jsonArray = new JSONArray(jsonString);
+
+        for (int i = 0; i < jsonArray.length(); i++) {
+            JSONObject jsonobject = jsonArray.getJSONObject(i);
+            String id = jsonobject.getString("description");
+            String name = jsonobject.getString("name");
+            String lastUpdate = jsonobject.getString("pushed_at");
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+            Date updatedDate = format.parse(lastUpdate);
+            Repo repo = cached.get(id);
+            try {
+                if (repo == null) {
+                    Logger.dev("LoadRepos: Create new repo " + id);
+                    repo = new Repo(name, updatedDate);
+                } else {
+                    // Popout from cached
+                    cached.remove(id);
+                    repo.update(updatedDate);
+                }
+                if (repo.getId() != null) {
+                    fetched.put(id, repo);
+                }
+            } catch (BaseModule.CacheModException ignored) {}
+        }
+    }
+
+    private boolean loadPage(int page, String url, int mode) {
+        Logger.dev("LoadRepos: Loading page: " + (page + 1));
+        Map<String, String> header = new HashMap<>();
+        if (mode == CHECK_ETAG && page < etags.size() && !TextUtils.isEmpty(etags.get(page))) {
+            Logger.dev("ETAG: " + etags.get(page));
+            header.put(IF_NONE_MATCH, etags.get(page));
+        }
+        if (url == null) {
+            url = String.format(Locale.US, REPO_URL, page + 1);
+        }
+        String jsonString = WebService.request(url, WebService.GET, header, true);
+        if (TextUtils.isEmpty(jsonString)) {
+            // At least check the pages we know
+            return page + 1 < etags.size() && loadPage(page + 1, null, CHECK_ETAG);
+        }
+
+        // The request succeed, parse the new stuffs
+        try {
+            loadJSON(jsonString);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        // Update the ETAG
+        String newEtag = header.get(ETAG_KEY);
+        newEtag = newEtag.substring(newEtag.indexOf('\"'), newEtag.lastIndexOf('\"') + 1);
+        Logger.dev("New ETAG: " + newEtag);
+        if (page < etags.size()) {
+            etags.set(page, newEtag);
+        } else {
+            etags.add(newEtag);
+        }
+
+        String links = header.get(LINK_KEY);
+        if (links != null) {
+            if (mode == CHECK_ETAG || mode == LOAD_NEXT) {
+                // Try to check next page URL
+                url = null;
+                for (String s : links.split(", ")) {
+                    if (s.contains("next")) {
+                        url = s.substring(s.indexOf("<") + 1, s.indexOf(">; "));
+                        break;
+                    }
+                }
+                if (url != null) {
+                    loadPage(page + 1, url, LOAD_NEXT);
+                }
+            }
+
+            if (mode == CHECK_ETAG || mode == LOAD_PREV) {
+                // Try to check prev page URL
+                url = null;
+                for (String s : links.split(", ")) {
+                    if (s.contains("prev")) {
+                        url = s.substring(s.indexOf("<") + 1, s.indexOf(">; "));
+                        break;
+                    }
+                }
+                if (url != null) {
+                    loadPage(page - 1, url, LOAD_PREV);
+                }
+            }
+        }
+
+        return true;
    }

    @Override
    protected Void doInBackground(Void... voids) {
        Logger.dev("LoadRepos: Loading repos");

-        SharedPreferences prefs = magiskManager.prefs;
+        cached = repoDB.getRepoMap(false);
+        fetched = new ValueSortedMap<>();

-        RepoDatabaseHelper dbHelper = new RepoDatabaseHelper(magiskManager);
-
-        // Legacy data cleanup
-        File old = new File(prefsPath, "RepoMap.xml");
-        if (old.exists() || !prefs.getString("repomap", "empty").equals("empty")) {
-            old.delete();
-            prefs.edit().remove("version").remove("repomap").remove(ETAG_KEY).apply();
-            dbHelper.clearRepo();
+        if (!loadPage(0, null, CHECK_ETAG)) {
+            magiskManager.repoMap = repoDB.getRepoMap();
+            Logger.dev("LoadRepos: No updates, use DB");
+            return null;
        }

-        Map<String, String> header = new HashMap<>();
-        // Get cached ETag to add in the request header
-        String etag = prefs.getString(ETAG_KEY, "");
-        header.put("If-None-Match", etag);
+        repoDB.addRepoMap(fetched);
+        repoDB.removeRepo(cached);

-        magiskManager.repoMap = new ValueSortedMap<>();
-
-        // Make a request to main URL for repo info
-        String jsonString = WebService.request(REPO_URL, WebService.GET, null, header, false);
-
-        ValueSortedMap<String, Repo> cached = dbHelper.getRepoMap();
-
-        if (!TextUtils.isEmpty(jsonString)) {
-            try {
-                JSONArray jsonArray = new JSONArray(jsonString);
-                // If it gets to this point, the response is valid, update ETag
-                etag = WebService.getLastResponseHeader().get(ETAG_KEY).get(0);
-                // Maybe bug in Android build tools, sometimes the ETag has crap in it...
-                etag = etag.substring(etag.indexOf('\"'), etag.lastIndexOf('\"') + 1);
-
-                // Update repo info
-                for (int i = 0; i < jsonArray.length(); i++) {
-                    JSONObject jsonobject = jsonArray.getJSONObject(i);
-                    String id = jsonobject.getString("description");
-                    String name = jsonobject.getString("name");
-                    String lastUpdate = jsonobject.getString("pushed_at");
-                    SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
-                    Date updatedDate;
-                    try {
-                        updatedDate = format.parse(lastUpdate);
-                    } catch (ParseException e) {
-                        continue;
-                    }
-                    Repo repo = cached.get(id);
-                    try {
-                        if (repo == null) {
-                            Logger.dev("LoadRepos: Create new repo " + id);
-                            repo = new Repo(name, updatedDate);
-                        } else {
-                            // Popout from cached
-                            cached.remove(id);
-                            Logger.dev("LoadRepos: Update cached repo " + id);
-                            repo.update(updatedDate);
-                        }
-                        if (repo.getId() != null) {
-                            magiskManager.repoMap.put(id, repo);
-                        }
-                    } catch (BaseModule.CacheModException ignored) {}
-                }
-
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        } else {
-            // Use cached if no internet or no updates
-            Logger.dev("LoadRepos: No updates, use cached");
-            magiskManager.repoMap.putAll(cached);
-            cached.clear();
-        }
-
-        // Update the database
-        dbHelper.addRepoMap(magiskManager.repoMap);
-        // The leftover cached are those removed remote, cleanup db
-        dbHelper.removeRepo(cached);
        // Update ETag
-        prefs.edit().putString(ETAG_KEY, etag).apply();
+        StringBuilder etagBuilder = new StringBuilder();
+        for (int i = 0; i < etags.size(); ++i) {
+            if (i != 0) etagBuilder.append(",");
+            etagBuilder.append(etags.get(i));
+        }
+        prefs.edit().putString(ETAG_KEY, etagBuilder.toString()).apply();

-        Logger.dev("LoadRepos: Repo load done");
+        magiskManager.repoMap = repoDB.getRepoMap();
+        Logger.dev("LoadRepos: Done");
        return null;
    }

--- a/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
+++ b/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
@@ -13,8 +13,9 @@ import java.util.Collection;

 public class RepoDatabaseHelper extends SQLiteOpenHelper {

-    private static final int DATABASE_VER = 1;
+    private static final int DATABASE_VER = 2;
    private static final String TABLE_NAME = "repos";
+    private static final int MIN_TEMPLATE_VER = 3;

    public RepoDatabaseHelper(Context context) {
        super(context, "repo.db", null, DATABASE_VER);
@@ -33,14 +34,19 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
                    "(id TEXT, name TEXT, version TEXT, versionCode INT, " +
                    "author TEXT, description TEXT, repo_name TEXT, last_update INT, " +
                    "PRIMARY KEY(id))");
+            oldVersion++;
+        }
+        if (oldVersion == 1) {
+            db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD template INT");
+            oldVersion++;
        }
-        // No upgrades yet
    }

    public void addRepoMap(ValueSortedMap<String, Repo> map) {
        SQLiteDatabase db = getWritableDatabase();
        Collection<Repo> list = map.values();
        for (Repo repo : list) {
+            Logger.dev("Add to DB: " + repo.getId());
            db.replace(TABLE_NAME, null, repo.getContentValues());
        }
        db.close();
@@ -56,20 +62,29 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
        SQLiteDatabase db = getWritableDatabase();
        Collection<Repo> list = map.values();
        for (Repo repo : list) {
+            Logger.dev("Remove from DB: " + repo.getId());
            db.delete(TABLE_NAME, "id=?", new String[] { repo.getId() });
        }
        db.close();
    }

    public ValueSortedMap<String, Repo> getRepoMap() {
+        return getRepoMap(true);
+    }
+
+    public ValueSortedMap<String, Repo> getRepoMap(boolean filtered) {
        ValueSortedMap<String, Repo> ret = new ValueSortedMap<>();
        SQLiteDatabase db = getReadableDatabase();
        Repo repo;
        try (Cursor c = db.query(TABLE_NAME, null, null, null, null, null, null)) {
            while (c.moveToNext()) {
                repo = new Repo(c);
-                Logger.dev("Load from cache: " + repo.getId());
-                ret.put(repo.getId(), repo);
+                if (repo.getTemplateVersion() < MIN_TEMPLATE_VER && filtered) {
+                    Logger.dev("Outdated repo: " + repo.getId());
+                } else {
+                    // Logger.dev("Load from DB: " + repo.getId());
+                    ret.put(repo.getId(), repo);
+                }
            }
        }
        db.close();
--- a/app/src/main/java/com/topjohnwu/magisk/module/BaseModule.java
+++ b/app/src/main/java/com/topjohnwu/magisk/module/BaseModule.java
@@ -11,7 +11,7 @@ import java.util.List;
 public abstract class BaseModule implements Comparable<BaseModule> {

    private String mId, mName, mVersion, mAuthor, mDescription;
-    private int mVersionCode = 0;
+    private int mVersionCode = 0, templateVersion = 0;

    protected BaseModule() {}

@@ -22,6 +22,7 @@ public abstract class BaseModule implements Comparable<BaseModule> {
        mVersionCode = c.getInt(c.getColumnIndex("versionCode"));
        mAuthor = c.getString(c.getColumnIndex("author"));
        mDescription = c.getString(c.getColumnIndex("description"));
+        templateVersion = c.getInt(c.getColumnIndex("template"));
    }

    protected void parseProps(List<String> props) throws CacheModException { parseProps(props.toArray(new String[props.size()])); }
@@ -57,6 +58,10 @@ public abstract class BaseModule implements Comparable<BaseModule> {
                case "description":
                    mDescription = prop[1];
                    break;
+                case "template":
+                    try {
+                        templateVersion = Integer.parseInt(prop[1]);
+                    } catch (NumberFormatException ignored) {}
                case "cacheModule":
                    if (Boolean.parseBoolean(prop[1]))
                        throw new CacheModException(mId);
@@ -99,6 +104,10 @@ public abstract class BaseModule implements Comparable<BaseModule> {
        return mVersionCode;
    }

+    public int getTemplateVersion() {
+        return templateVersion;
+    }
+
    public static class CacheModException extends Exception {
        public CacheModException(String id) {
            Logger.error("Cache mods are no longer supported! id: " + id);
--- a/app/src/main/java/com/topjohnwu/magisk/module/Repo.java
+++ b/app/src/main/java/com/topjohnwu/magisk/module/Repo.java
@@ -29,14 +29,13 @@ public class Repo extends BaseModule {
    }

    public void update() throws CacheModException {
-        Logger.dev("Repo: Re-fetch prop");
-        String props = WebService.request(getManifestUrl(), WebService.GET, true);
+        String props = WebService.request(getManifestUrl(), WebService.GET);
        String lines[] = props.split("\\n");
        parseProps(lines);
+        Logger.dev("Repo: Fetching prop: " + getId());
    }

    public void update(Date lastUpdate) throws CacheModException {
-        Logger.dev("Repo: Local: " + mLastUpdate + " Remote: " + lastUpdate);
        if (lastUpdate.after(mLastUpdate)) {
            mLastUpdate = lastUpdate;
            update();
@@ -53,6 +52,7 @@ public class Repo extends BaseModule {
        values.put("description", getDescription());
        values.put("repo_name", repoName);
        values.put("last_update", mLastUpdate.getTime());
+        values.put("template", getTemplateVersion());
        return values;
    }

--- a/app/src/main/java/com/topjohnwu/magisk/utils/FABBehavior.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/FABBehavior.java
@@ -1,114 +0,0 @@
-package com.topjohnwu.magisk.utils;
-
-
-import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPropertyAnimatorCompat;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.github.clans.fab.FloatingActionMenu;
-
-import java.util.List;
-
-/**
- * Created by Matteo on 08/08/2015.
- *
- * Floating Action Menu Behavior for Clans.FloatingActionButton
- * https://github.com/Clans/FloatingActionButton/
- *
- * Use this behavior as your app:layout_behavior attribute in your Floating Action Menu to use the
- * FabMenu in a Coordinator Layout.
- *
- * Remember to use the correct namespace for the fab:
- * xmlns:app="http://schemas.android.com/apk/res-auto"
- */
-public class FABBehavior extends CoordinatorLayout.Behavior<View> {
-
-    private float mTranslationY;
-
-    public FABBehavior(Context context, AttributeSet attrs) {
-        super();
-    }
-
-    @Override
-    public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
-        return dependency instanceof Snackbar.SnackbarLayout;
-    }
-
-    @Override
-    public boolean onDependentViewChanged(CoordinatorLayout parent, View child, View dependency) {
-        if (dependency instanceof Snackbar.SnackbarLayout) {
-            updateTranslation(parent, child);
-        }
-
-        return false;
-    }
-
-    @Override
-    public void onDependentViewRemoved(CoordinatorLayout parent, View child, View dependency) {
-        if (dependency instanceof Snackbar.SnackbarLayout) {
-            revertTranslation(child);
-        }
-    }
-
-    private void updateTranslation(CoordinatorLayout parent, View child) {
-        float translationY = getTranslationY(parent, child);
-        if (translationY != mTranslationY) {
-            ViewPropertyAnimatorCompat anim = ViewCompat.animate(child);
-            anim.cancel();
-            anim.translationY(translationY).setDuration(100);
-            mTranslationY = translationY;
-        }
-    }
-
-    private void revertTranslation(View child) {
-        if (mTranslationY != 0) {
-            ViewPropertyAnimatorCompat anim = ViewCompat.animate(child);
-            anim.cancel();
-            anim.translationY(0).setDuration(100);
-            mTranslationY = 0;
-        }
-    }
-
-    private float getTranslationY(CoordinatorLayout parent, View child) {
-        float minOffset = 0.0F;
-        List<View> dependencies = parent.getDependencies(child);
-        int i = 0;
-
-        for (int z = dependencies.size(); i < z; ++i) {
-            View view = dependencies.get(i);
-            if (view instanceof Snackbar.SnackbarLayout && parent.doViewsOverlap(child, view)) {
-                minOffset = Math.min(minOffset, ViewCompat.getTranslationY(view) - (float) view.getHeight());
-            }
-        }
-
-        return minOffset;
-    }
-
-    /**
-     * onStartNestedScroll and onNestedScroll will hide/show the FabMenu when a scroll is detected.
-     */
-    @Override
-    public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, View child,
-                                       View directTargetChild, View target, int nestedScrollAxes) {
-        return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL ||
-                super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target,
-                        nestedScrollAxes);
-    }
-
-    @Override
-    public void onNestedScroll(CoordinatorLayout coordinatorLayout, View child, View target,
-                               int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
-        super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed,
-                dyUnconsumed);
-        FloatingActionMenu fabMenu = (FloatingActionMenu) child;
-        if (dyConsumed > 0 && !fabMenu.isMenuButtonHidden()) {
-            fabMenu.hideMenuButton(true);
-        } else if (dyConsumed < 0 && fabMenu.isMenuButtonHidden()) {
-            fabMenu.showMenuButton(true);
-        }
-    }
-}
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Logger.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Logger.java
@@ -13,28 +13,28 @@ public class Logger {
    }

    public static void error(String msg) {
-        Log.e(TAG, "ERROR: " + msg);
+        Log.e(TAG, "MANAGERERROR: " + msg);
    }

    public static void dev(String msg, Object... args) {
        if (MagiskManager.devLogging) {
            if (args.length == 1 && args[0] instanceof Throwable) {
-                Log.d(TAG, "DEV: " + msg, (Throwable) args[0]);
+                Log.d(TAG, "MANAGER: " + msg, (Throwable) args[0]);
            } else {
-                Log.d(TAG, "DEV: " + String.format(msg, args));
+                Log.d(TAG, "MANAGER: " + String.format(msg, args));
            }
        }
    }

    public static void dev(String msg) {
        if (MagiskManager.devLogging) {
-            Log.d(TAG, "DEV: " + msg);
+            Log.d(TAG, "MANAGER: " + msg);
        }
    }

    public static void shell(boolean root, String msg) {
        if (MagiskManager.shellLogging) {
-            Log.d(root ? "SU" : "SH", msg);
+            Log.d(TAG, root ? "MANAGERSU" : "MANAGERSH" + msg);
        }
    }
 }
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
@@ -91,10 +91,12 @@ public class Utils {
        isDownloading = true;

        DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link));
-        request.setDestinationUri(Uri.fromFile(file));

-        receiver.setDownloadID(downloadManager.enqueue(request));
+        if (link != null) {
+            DownloadManager.Request request = new DownloadManager.Request(Uri.parse(link));
+            request.setDestinationUri(Uri.fromFile(file));
+            receiver.setDownloadID(downloadManager.enqueue(request));
+        }
        receiver.setFilename(filename);
        context.registerReceiver(receiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
    }
--- a/app/src/main/java/com/topjohnwu/magisk/utils/WebService.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/WebService.java
@@ -1,13 +1,9 @@
 package com.topjohnwu.magisk.utils;

 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;

@@ -18,8 +14,6 @@ public class WebService {
    public final static int GET = 1;
    public final static int POST = 2;

-    private static Map<String, List<String>> responseHeader;
-
    /**
     * Making web service call
     *
@@ -27,11 +21,11 @@ public class WebService {
     * @requestmethod - http request method
     */
    public static String request(String url, int method) {
-        return request(url, method, null, null, false);
+        return request(url, method, null, true);
    }

    public static String request(String url, int method, boolean newline) {
-        return request(url, method, null, null, newline);
+        return request(url, method, null, newline);
    }

    /**
@@ -44,8 +38,7 @@ public class WebService {
     * @newline - true to append a newline each line
     */
    public static String request(String urlAddress, int method,
-                                 Map<String, String> params, Map<String, String> header,
-                                 boolean newline) {
+                                 Map<String, String> header, boolean newline) {
        Logger.dev("WebService: Service call " + urlAddress);
        URL url;
        StringBuilder response = new StringBuilder();
@@ -69,32 +62,6 @@ public class WebService {
                }
            }

-            if (params != null) {
-                OutputStream os = conn.getOutputStream();
-                BufferedWriter writer = new BufferedWriter(
-                        new OutputStreamWriter(os, "UTF-8"));
-
-                StringBuilder result = new StringBuilder();
-                boolean first = true;
-                for (Map.Entry<String, String> entry : params.entrySet()) {
-                    if (first) {
-                        first = false;
-                    } else {
-                        result.append("&");
-                    }
-
-                    result.append(URLEncoder.encode(entry.getKey(), "UTF-8"));
-                    result.append("=");
-                    result.append(URLEncoder.encode(entry.getValue(), "UTF-8"));
-                }
-
-                writer.write(result.toString());
-
-                writer.flush();
-                writer.close();
-                os.close();
-            }
-
            int responseCode = conn.getResponseCode();

            if (responseCode == HttpsURLConnection.HTTP_OK) {
@@ -107,9 +74,13 @@ public class WebService {
                        response.append(line);
                    }
                }
-                responseHeader = conn.getHeaderFields();
-            } else {
-                responseHeader = null;
+                if (header != null) {
+                    header.clear();
+                    for (Map.Entry<String, List<String>> entry : conn.getHeaderFields().entrySet()) {
+                        List<String> l = entry.getValue();
+                        header.put(entry.getKey(), l.get(l.size() - 1));
+                    }
+                }
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -118,8 +89,4 @@ public class WebService {
        return response.toString();
    }

-    public static Map<String, List<String>> getLastResponseHeader() {
-        return responseHeader;
-    }
-
 }
--- a/app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
@@ -997,7 +997,7 @@ public class ZipUtils {
                return manifest;
            }
            public Enumeration<JarEntry> entries() {
-                Iterator<Entry<String, Pair<JarEntry, ByteArrayOutputStream> >> i = entrySet().iterator();
+                Iterator<Map.Entry<String, Pair<JarEntry, ByteArrayOutputStream> >> i = entrySet().iterator();
                ArrayList<JarEntry> list = new ArrayList<>();
                while (i.hasNext())
                    list.add(i.next().getValue().first);
--- a/app/src/main/jni/zipadjust.c
+++ b/app/src/main/jni/zipadjust.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <zlib.h>
+#include <string.h>
 #include "zipadjust.h"

 size_t insize = 0, outsize = 0, alloc = 0;
--- a/app/src/main/res/layout/fragment_magisk_log.xml
+++ b/app/src/main/res/layout/fragment_magisk_log.xml
@@ -20,8 +20,10 @@
                android:id="@+id/txtLog"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+                android:fontFamily="monospace"
                android:padding="8dp"
-                android:textIsSelectable="true"/>
+                android:textIsSelectable="true"
+                android:textSize="10sp" />

            <ProgressBar
                android:id="@+id/progressBar"
--- a/app/src/main/res/layout/fragment_modules.xml
+++ b/app/src/main/res/layout/fragment_modules.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:fab="http://schemas.android.com/apk/res-auto"
+<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/swipeRefreshLayout"
    android:layout_width="match_parent"
    android:layout_height="fill_parent"
@@ -22,7 +22,8 @@
            android:layout_height="match_parent"
            android:clipToPadding="false"
            android:dividerHeight="@dimen/card_divider_space"
-            fab:layoutManager="android.support.v7.widget.LinearLayoutManager" />
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            app:layoutManager="android.support.v7.widget.LinearLayoutManager" />

        <TextView
            android:id="@+id/empty_rv"
@@ -36,39 +37,16 @@
            android:textStyle="italic"
            android:visibility="gone" />

-
-        <com.github.clans.fab.FloatingActionMenu
-            android:id="@+id/fabmenu"
-            android:layout_width="500dp"
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="bottom|center_horizontal"
-            android:layout_marginEnd="113dp"
-            android:layout_marginBottom="10dp"
-            fab:layout_behavior=".utils.FABBehavior"
-            fab:menu_fab_size="normal"
-            fab:menu_showShadow="true"
-            fab:menu_shadowColor="#66000000"
-            fab:menu_shadowRadius="4dp"
-            fab:menu_shadowXOffset="1dp"
-            fab:menu_shadowYOffset="3dp"
-            fab:menu_colorNormal="?android:colorAccent"
-            fab:menu_colorPressed="?attr/colorAccentFallback"
-            fab:menu_animationDelayPerItem="50"
-            fab:menu_icon="@drawable/ic_add"
-            fab:menu_buttonSpacing="0dp"
-            fab:menu_labels_position="left" >
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/fab"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:src="@drawable/ic_archive"
-                fab:fab_colorNormal="?android:colorAccent"
-                fab:fab_colorPressed="?attr/colorAccentFallback"
-                fab:fab_size="mini"
-                fab:fab_label="@string/fab_flash_zip" />
-
-        </com.github.clans.fab.FloatingActionMenu>
+            android:layout_margin="@dimen/fab_padding"
+            android:elevation="6dp"
+            android:src="@drawable/ic_add"
+            tools:fabSize="normal"
+            tools:pressedTranslationZ="12dp" />

    </android.support.design.widget.CoordinatorLayout>

--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -101,7 +101,7 @@
    <string name="proper_root">مروت فعلاً</string>
    <string name="advanced_settings_title">إعدادات متقدمة</string>
    <string name="boot_image_title">موقع ملف الإقلاع</string>
-    <string name="checking_safetyNet_status">التحقق من حالة SafetyNet...</string>
+    <string name="checking_safetyNet_status">التحقق من حالة SafetyNet…</string>
    <string name="copying_msg">نسخ الملف المضغوط إلى دليل مؤقت</string>
    <string name="detect_button">تحقق</string>
    <string name="downloading_toast">جاري التنزيل %1$s</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -14,7 +14,6 @@

    <!--Status Fragment-->
    <string name="magisk_version">Nainstalován Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s deaktivován</string>
    <string name="magisk_version_error">Magisk není nainstalován</string>

    <string name="checking_for_updates">Kontrola aktualizací…</string>
@@ -133,8 +132,6 @@
    <string name="settings_clear_cache_title">Smazat Uchovanou Mezipaměť</string>
    <string name="settings_clear_cache_summary">Smaže informace online použití v Mezipaměti, donutí aplikaci obnovit informace online</string>

-    <string name="settings_disable_title">Zakázat Magisk</string>
-    <string name="settings_disable_summary">Všechno kromě rootu (MagiskSU) bude deaktivováno</string>
    <string name="settings_magiskhide_summary">Skryje root (MagiskSU) před různými aplikacemi</string>
    <string name="settings_busybox_title">Povolit BusyBox</string>
    <string name="settings_busybox_summary">Nasadí vestavěný Magisk busybox do xbin</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,7 +17,6 @@

    <!--Status Fragment-->
    <string name="magisk_version">Magisk %1$s ist installiert</string>
-    <string name="magisk_version_disable">Magisk %1$s ist deaktiviert</string>
    <string name="magisk_version_error">Magisk ist nicht installiert</string>

    <string name="checking_for_updates">Suche nach Updates…</string>
@@ -136,8 +135,6 @@
    <string name="settings_clear_cache_title">Repo-Cache löschen</string>
    <string name="settings_clear_cache_summary">Löscht die zwischengespeicherten Informationen der Online-Repos. Erzwingt eine Aktualisierung</string>

-    <string name="settings_disable_title">Magisk deaktivieren</string>
-    <string name="settings_disable_summary">Deaktiviert alles außer den root-Zugang (MagiskSU)</string>
    <string name="settings_magiskhide_summary">Versteckt Magisk vor diversen Entdeckungsmethoden</string>
    <string name="settings_busybox_title">BusyBox aktivieren</string>
    <string name="settings_busybox_summary">Magisk\'s integriertes BusyBox nach xbin mounten</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -14,7 +14,6 @@

    <!--Magisk Fragment-->
    <string name="magisk_version">Instalado Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s está deshabilitado</string>
    <string name="magisk_version_error">Magisk no está instalado</string>

    <string name="checking_for_updates">Comprobando actualizaciones…</string>
@@ -29,13 +28,13 @@
    <string name="safetyNet_connection_failed">No puede conectar con la API de Google</string>
    <string name="safetyNet_connection_suspended">La conexión con la API de Google API fue suspendida</string>
    <string name="safetyNet_error">No puede comprobar SafetyNet, ¿No tiene internet?</string>
-    <string name="safetyNet_fail">SafetyNet falló: No coincide el perfil CTS</string>
-    <string name="safetyNet_pass">SafetyNet pasó</string>
+    <string name="safetyNet_fail">SafetyNet: Error, no coincide el perfil CTS</string>
+    <string name="safetyNet_pass">SafetyNet: Correcto</string>
    <string name="root_info_warning">Funcionalidad enormemente limitada</string>

    <!--Install Fragment-->
    <string name="auto_detect">(Auto) %1$s</string>
-    <string name="boot_image_title">Ubicación de imagen boot</string>
+    <string name="boot_image_title">Ubicación de la imagen boot</string>
    <string name="detect_button">Detectar</string>
    <string name="advanced_settings_title">Ajustes avanzados</string>
    <string name="keep_force_encryption">Mantener cifrado forzado</string>
@@ -50,9 +49,9 @@
    <string name="no_modules_found">No se han encontrado módulos</string>
    <string name="update_file_created">El módulo se actualizará en el siguiente reinicio</string>
    <string name="remove_file_created">El módulo se eliminará en el siguiente reinicio</string>
-    <string name="remove_file_deleted">El módulo no se eliminirá en el siguiente reinicio</string>
+    <string name="remove_file_deleted">El módulo no se eliminará en el siguiente reinicio</string>
    <string name="disable_file_created">El módulo se desactivará en el siguiente reinicio</string>
-    <string name="disable_file_removed">El móodulo se activará en el siguiente reinicio</string>
+    <string name="disable_file_removed">El módulo se activará en el siguiente reinicio</string>
    <string name="author">Creado por %1$s</string>
    <string name="fab_flash_zip">Flashear el zip del módulo</string>

@@ -65,7 +64,7 @@
    <string name="menuSaveToSd">Guardar en la SD</string>
    <string name="menuReload">Recargar</string>
    <string name="menuClearLog">Limpiar registro ahora</string>
-    <string name="logs_cleared">Registro Limpiado correctamente</string>
+    <string name="logs_cleared">Registro limpiado correctamente</string>
    <string name="log_is_empty">El registro está vacio</string>
    <string name="logs_save_failed">No se ha podido escribir el registro en la tarjeta SD:</string>

@@ -74,7 +73,7 @@
    <string name="app_developers">Desarroladores principales</string>
    <string name="app_developers_"><![CDATA[Aplicación creada por <a href="https://github.com/topjohnwu">topjohnwu</a> en colaboración con <a href="https://github.com/d8ahazard">Digitalhigh</a> y <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
    <string name="app_changelog">Registro de cambios de la aplicación</string>
-    <string name="translators"><![CDATA[Gawenda, netizen, <a href="https://github.com/DeicPro">Deiki</a>]]></string>
+    <string name="translators">Gawenda, netizen, Deiki, Nosi></string>
    <string name="app_version">Versión de la aplicación</string>
    <string name="app_source_code">Código fuente</string>
    <string name="donation">Donar</string>
@@ -84,8 +83,8 @@
    <!--Toasts, Dialogs-->
    <string name="permissionNotGranted">Esta opción no funcionará sin permiso de escritura en la memoria externa.</string>
    <string name="no_thanks">No gracias</string>
-    <string name="yes">Si</string>
-    <string name="ok">Vale</string>
+    <string name="yes">Sí</string>
+    <string name="ok">Aceptar</string>
    <string name="close">Cerrar</string>
    <string name="repo_install_title">Instalar %1$s</string>
    <string name="repo_install_msg">¿ Quieres instalar %1$s ?</string>
@@ -114,7 +113,7 @@
    <string name="start_magiskhide">Iniciando MagiskHide …</string>
    <string name="no_magisksu_title">¡No está usando MagiskSU!</string>
    <string name="no_magisksu_msg">No estás rooteado con MagiskSU, ¡Usando MagiskHide por si mismo podría no ser suficiente!\nNo está oficialmente soportado, y necesitaria herramientas adiccionales (ej. suhide) para pasar Safety Net.</string>
-    <string name="understand">Entiendo</string>
+    <string name="understand">Entendido</string>
    <string name="process_error">Error de proceso</string>
    <string name="internal_storage">El zip es almacenado en:\n[Internal Storage]%1$s</string>
    <string name="zip_process_title">Procesando</string>
@@ -126,8 +125,6 @@
    <string name="settings_clear_cache_title">Limpiar caché del repositorio</string>
    <string name="settings_clear_cache_summary">Limpiar la información en caché para los repositorios en línea, fuerza a la aplicación a actualizar en línea</string>

-    <string name="settings_disable_title">Deshabilitar Magisk</string>
-    <string name="settings_disable_summary">Todo será desactivado excepto el root (MagiskSU)</string>
    <string name="settings_magiskhide_summary">Ocultar Magisk de varias detecciones</string>
    <string name="settings_busybox_title">Habilitar BusyBox</string>
    <string name="settings_busybox_summary">Montar el busybox interno de Magisk en xbin</string>
@@ -157,7 +154,7 @@
    <!--Superuser-->
    <string name="su_request_title">Petición de superusuario</string>
    <string name="deny_with_str">Denegar%1$s</string>
-    <string name="deny">Denegrar</string>
+    <string name="deny">Denegar</string>
    <string name="prompt">Preguntar</string>
    <string name="grant">Permitir</string>
    <string name="su_warning">Permite acceso total a tu dispositivo.\n¡Denegar si no está seguro!</string>
@@ -172,13 +169,13 @@
    <string name="no_apps_found">No se encontraron aplicaciones</string>
    <string name="su_snack_grant">Derechos de superusuario para %1$s permitidos</string>
    <string name="su_snack_deny">Derechos de superusuario para %1$s denegados</string>
-    <string name="su_snack_notif_on">Noticiaciones de %1$s habilitadas</string>
+    <string name="su_snack_notif_on">Notificaciones de %1$s habilitadas</string>
    <string name="su_snack_notif_off">Notificaciones de %1$s deshabilitadas</string>
    <string name="su_snack_log_on">Registros de %1$s habilitados</string>
    <string name="su_snack_log_off">Registros de %1$s deshabilitados</string>
    <string name="su_snack_revoke">Anulados derechos de %1$s</string>
-    <string name="su_revoke_title">¿Anular?</string>
-    <string name="su_revoke_msg">¿Confirmar para anular derechos de %1$s?</string>
+    <string name="su_revoke_title">¿Revocar?</string>
+    <string name="su_revoke_msg">¿Confirmar para revocar derechos de %1$s?</string>
    <string name="toast">Aviso</string>
    <string name="none">Nada</string>

--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,181 @@
+<resources>
+    <!--Universal-->
+    <!--Welcome Activity-->
+    <string name="navigation_drawer_open">Ouvrir le menu de navigation</string>
+    <string name="navigation_drawer_close">Fermer le menu de navigation</string>
+    <string name="modules">Modules</string>
+    <string name="downloads">Téléchargements</string>
+    <string name="superuser">Superuser</string>
+    <string name="log">Journal</string>
+    <string name="settings">Paramètres</string>
+    <string name="status">État</string>
+    <string name="install">Installer</string>
+    <!--Status Fragment-->
+    <string name="magisk_version">Magisk v%1$s installée</string>
+    <string name="magisk_version_core_only">Magisk v%1$s installée (Mode Core uniquement)</string>
+    <string name="magisk_version_error">Magisk non installé</string>
+    <string name="checking_for_updates">Vérification de mises à jour…</string>
+    <string name="magisk_update_available">Magisk v%1$.1f disponible !</string>
+    <string name="cannot_check_updates">Impossible de vérifier les mises à jour, pas d\'Internet ?</string>
+    <string name="up_to_date">Dernière version %1$s installée</string>
+    <string name="root_error">Rooté mais aucune permission root, non acceptée ?</string>
+    <string name="not_rooted">Non rooté</string>
+    <string name="proper_root">Correctement rooté</string>
+    <string name="safetyNet_check_text">Appuyer pour lancer le contrôle SafetyNet</string>
+    <string name="checking_safetyNet_status">Vérification de l\'état de SafetyNet…</string>
+    <string name="safetyNet_connection_failed">Impossible de se connecter à l\'API Google</string>
+    <string name="safetyNet_connection_suspended">La connexion à l\'API Google a été suspendue</string>
+    <string name="safetyNet_error">Impossible de contrôler SafetyNet, pas d\'Internet?</string>
+    <string name="safetyNet_fail">Échec SafetyNet: erreur de profil CTS</string>
+    <string name="safetyNet_pass">SafetyNet réussi</string>
+    <string name="root_info_warning">Fonctionnalités largement limitées</string>
+    <!--Install Fragment-->
+    <string name="auto_detect">(Auto) %1$s</string>
+    <string name="cannot_auto_detect">(Auto détection impossible)</string>
+    <string name="boot_image_title">Emplacement de l\'Image Boot</string>
+    <string name="detect_button">Détection</string>
+    <string name="advanced_settings_title">Paramètres avancés</string>
+    <string name="keep_force_encryption">Garder le chiffrement forcé</string>
+    <string name="keep_dm_verity">Garder dm-verity</string>
+    <string name="current_magisk_title">Version Magisk Installée : %1$s</string>
+    <string name="install_magisk_title">Dernière Version Magisk : %1$s</string>
+    <string name="uninstall">Désinstaller</string>
+    <string name="reboot_countdown">Redémarrage dans %1$d</string>
+    <string name="uninstall_magisk_title">Désinstaller Magisk</string>
+    <string name="uninstall_magisk_msg">Cela va supprimer tous les modules, MagiskSU et éventuellement chiffrer vos données si vous n\'êtes pas chiffré\nÊtes-vous sûr de vouloir continuer ?</string>
+    <string name="version_none">(Aucune)</string>
+    <!--Module Fragment-->
+    <string name="no_info_provided">(Aucune information transmise)</string>
+    <string name="no_modules_found">Aucun module trouvé</string>
+    <string name="update_file_created">Le module va être mis à jour au prochain redémarrage</string>
+    <string name="remove_file_created">Le module va être supprimé au prochain redémarrage</string>
+    <string name="remove_file_deleted">Le modufle ne va pas être supprimé au prochain redémarrage</string>
+    <string name="disable_file_created">Le module va être désactivé au prochain redémarrage</string>
+    <string name="disable_file_removed">Le module va être activé au prochain redémarrage</string>
+    <string name="author">Créé par %1$s</string>
+    <string name="fab_flash_zip">Flasher un Module Zip</string>
+    <!--Repo Fragment-->
+    <string name="update_available">Mise à jour disponible</string>
+    <string name="installed">Installé</string>
+    <string name="not_installed">Non installé</string>
+    <!--Log Fragment-->
+    <string name="menuSaveToSd">Enregistrer sur SD</string>
+    <string name="menuReload">Actualiser</string>
+    <string name="menuClearLog">Effacer le journal maintenant</string>
+    <string name="logs_cleared">Journal effacé avec succès</string>
+    <string name="log_is_empty">Journal vide</string>
+    <string name="logs_save_failed">Impossible d\'écrire le journal sur la SD card:</string>
+    <!--About Activity-->
+    <string name="about">À propos</string>
+    <string name="app_developers">Principaux développeurs</string>
+    <string name="app_developers_"><![CDATA[App created by <a href="https://github.com/topjohnwu">topjohnwu</a> in collaboration with <a href="https://github.com/d8ahazard">Digitalhigh</a> and <a href="https://github.com/dvdandroid">Dvdandroid</a>.]]></string>
+    <string name="app_changelog">Modifications de l\'application</string>
+    <string name="translators" />
+    <string name="app_version">Version de l\'application</string>
+    <string name="app_source_code">Code source</string>
+    <string name="donation">Dons</string>
+    <string name="app_translators">Traducteurs de l\'application</string>
+    <string name="support_thread">Sujet pour support</string>
+    <!--Toasts, Dialogs-->
+    <string name="permissionNotGranted">Cette fonctionnalité ne marchera pas sans la permission d\'écriture sur le stockage externe.</string>
+    <string name="no_thanks">Non merci</string>
+    <string name="yes">Oui</string>
+    <string name="ok">OK</string>
+    <string name="close">Fermer</string>
+    <string name="repo_install_title">Installer %1$s</string>
+    <string name="repo_install_msg">Voulez-vous installer %1$s ?</string>
+    <string name="download_install">Télécharger &amp; Installer</string>
+    <string name="download">Télécharger</string>
+    <string name="goto_install">Aller à la section \"Installer\"</string>
+    <string name="download_file_error">Erreur de téléchargement du fichier</string>
+    <string name="install_error">Échec de l\'installation !</string>
+    <string name="invalid_zip">Ce zip n\'est pas un Module Magisk !!</string>
+    <string name="reboot_title">Installation réussie !</string>
+    <string name="reboot_msg">Voulez-vous redémarrer maintenant ?</string>
+    <string name="reboot">Redémarrer</string>
+    <string name="copying_msg">Copie du zip dans le répertoire temp</string>
+    <string name="zip_install_progress_title">Installation</string>
+    <string name="zip_unzip_msg">Décompression du fichier zip…</string>
+    <string name="zip_process_msg">Exécution du fichier zip…</string>
+    <string name="zip_install_progress_msg">Installation %1$s…</string>
+    <string name="no_magisk_title">Magisk non installé !</string>
+    <string name="no_magisk_msg">Voulez-vous télécharger et installer Magisk ?</string>
+    <string name="downloading_toast">Téléchargement %1$s</string>
+    <string name="magisk_update_title">Nouvelle mise à jour de Magisk disponible !</string>
+    <string name="settings_reboot_toast">Redémarrer pour appliquer les changements</string>
+    <string name="release_notes">Notes de version</string>
+    <string name="repo_cache_cleared">Cache du dépôt effacé</string>
+    <string name="safetyNet_hide_notice">Cette application utilise SafetyNet\nDéjà pris en charge par MagiskHide par défaut</string>
+    <string name="start_magiskhide">Lancement de MagiskHide …</string>
+    <string name="no_magisksu_title">MagiskSU non utilisé !</string>
+    <string name="no_magisksu_msg">Vous n\'êtes pas rooté avec MagiskSU, utiliser uniquement MagiskHide peut ne pas suffire !\nCeci n\'est officiellement pas supporté et vous devriez avoir besoin d\'autres outils (ex : suhide) pour passer SafetyNet.</string>
+    <string name="understand">Je comprends</string>
+    <string name="process_error">Erreur d\'exécution</string>
+    <string name="internal_storage">Le zip est stocké dans :\n[Internal Storage]%1$s</string>
+    <string name="zip_process_title">Exécution</string>
+    <string name="manual_boot_image">Veuillez sélectionner l\'image boot manuellement !</string>
+    <!--Settings Activity -->
+    <string name="settings_general_category">Général</string>
+    <string name="settings_dark_theme_title">Thème sombre</string>
+    <string name="settings_dark_theme_summary">Activer le thème sombre</string>
+    <string name="settings_notification_title">Notification de mise à jour</string>
+    <string name="settings_notification_summary">Afficher des notifications de mises à jour quand une nouvelle version est disponible</string>
+    <string name="settings_clear_cache_title">Effacer le cache du dépôt</string>
+    <string name="settings_clear_cache_summary">Effacer les informations en cache des dépôts en ligne, pour forcer une actualisation de l\'application</string>
+    <string name="settings_core_only_title">Mode Magisk Core uniquement</string>
+    <string name="settings_core_only_summary">Activer uniquement les fonctionnalités de base, tous les modules ne seront pas chargés. MagiskSU, MagiskHide, les hosts systemless et busybox restent activés</string>
+    <string name="settings_magiskhide_summary">Masquer Magisk de diverses détections</string>
+    <string name="settings_busybox_title">Activer BusyBox</string>
+    <string name="settings_busybox_summary">Monter le busybox de Magisk sur xbin</string>
+    <string name="settings_hosts_title">Hosts systemless</string>
+    <string name="settings_hosts_summary">Support hosts systemless pour les applications type Adblock</string>
+    <string name="settings_su_app_adb">Applications et ADB</string>
+    <string name="settings_su_app">Applications uniquement</string>
+    <string name="settings_su_adb">ADB uniquement</string>
+    <string name="settings_su_disable">Désactivé</string>
+    <string name="settings_su_request_10">10 secondes</string>
+    <string name="settings_su_request_20">20 secondes</string>
+    <string name="settings_su_request_30">30 secondes</string>
+    <string name="settings_su_request_60">60 secondes</string>
+    <string name="superuser_access">Accès Superuser</string>
+    <string name="auto_response">Réponse automatique</string>
+    <string name="request_timeout">Délai de requête</string>
+    <string name="superuser_notification">Notification Superuser</string>
+    <string name="request_timeout_summary">%1$s secondes</string>
+    <string name="settings_development_category">Dévellopement de l\'application</string>
+    <string name="settings_developer_logging_title">Activer le journal de débogage avancé</string>
+    <string name="settings_developer_logging_summary">Cocher ceci pour activer la journalisation "verbose" (tout)</string>
+    <string name="settings_shell_logging_title">Activer la journalisation de débogage de commande shell</string>
+    <string name="settings_shell_logging_summary">Cocher ceci pour activer la journalisation de toutes les commandes shell et leurs données de sortie</string>
+    <!--Superuser-->
+    <string name="su_request_title">Requête Superuser</string>
+    <string name="deny_with_str">Refuser%1$s</string>
+    <string name="deny">Refuser</string>
+    <string name="prompt">Demander</string>
+    <string name="grant">Accepter</string>
+    <string name="su_warning">Accepter un accès complet à votre appareil.\nRefuser si vous n\'êtes pas sûr!</string>
+    <string name="forever">Toujours</string>
+    <string name="once">Une fois</string>
+    <string name="tenmin">10 min</string>
+    <string name="twentymin">20 min</string>
+    <string name="thirtymin">30 min</string>
+    <string name="sixtymin">60 min</string>
+    <string name="su_allow_toast">%1$s a obtenu les droits Superuser</string>
+    <string name="su_deny_toast">%1$s n\'a pas obtenu les droits Superuser</string>
+    <string name="no_apps_found">Aucun application trouvée</string>
+    <string name="su_snack_grant">Les droits Superuser de %1$s sont accordés</string>
+    <string name="su_snack_deny">Les droits Superuser de %1$s sont refusés</string>
+    <string name="su_snack_notif_on">Les notifications pour %1$s sont activées</string>
+    <string name="su_snack_notif_off">Les notifications pour %1$s sont désactivées</string>
+    <string name="su_snack_log_on">La journalisation pour %1$s est activée</string>
+    <string name="su_snack_log_off">La journalisation pour %1$s est désactivée</string>
+    <string name="su_snack_revoke">Les droits de %1$s sont annulés</string>
+    <string name="su_revoke_title">Annuler ?</string>
+    <string name="su_revoke_msg">Vous confirmez l\'annulation des droits pour %1$s ?</string>
+    <string name="toast">Toast</string>
+    <string name="none">Aucun</string>
+    <!--Superuser logs-->
+    <string name="pid">PID :\u0020</string>
+    <string name="target_uid">Cible UID:\u0020</string>
+    <string name="command">Commande :\u0020</string>
+</resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -16,7 +16,6 @@
    
    <string name="magisk_version">Versione Magisk: v%1$s</string>
    <string name="magisk_version_error">Hai installato Magisk?</string>
-    <string name="magisk_version_disable">Magisk v%1$s disabilitato</string>
    <string name="checking_for_updates">Controlla aggiornamenti…</string>
    <string name="magisk_update_available">Magisk v%1$.1f update!</string>
    <string name="cannot_check_updates">Impossibile controllare aggiornamenti</string>
@@ -135,8 +134,6 @@
    <string name="settings_clear_cache_title">Pulisci Cache Repo</string>
    <string name="settings_clear_cache_summary">Clear the cached information for online repos, forces the app to refresh online</string>

-    <string name="settings_disable_title">Disabilita Magisk</string>
-    <string name="settings_disable_summary">Tutto sarà disattivato tranne il Root (MagiskSU)</string>
    <string name="settings_magiskhide_summary">Hide Magisk from various detections</string>
    <string name="settings_busybox_title">Abilita BusyBox</string>
    <string name="settings_busybox_summary">Bind mount Magisk\'s built-in busybox to xbin</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,196 @@
+<resources>
+    <!--Universal-->
+
+    <!--Welcome Activity-->
+    <string name="navigation_drawer_open">ナビゲーション• ドロワーを開く</string>
+    <string name="navigation_drawer_close">ナビゲーション• ドロワーを閉じる</string>
+    <string name="modules">モジュール</string>
+    <string name="downloads">ダウンロード</string>
+    <string name="superuser">スーパーユーザー</string>
+    <string name="log">ログ</string>
+    <string name="settings">設定</string>
+    <string name="status">状態</string>
+    <string name="install">インストール</string>
+
+    <!--Status Fragment-->
+    <string name="magisk_version">Magisk v%1$sインストールされた</string>
+    <string name="magisk_version_core_only">Magisk v%1$sインストールされた (コアのみモード)</string>
+    <string name="magisk_version_error">Magisk がインストールされていない</string>
+
+    <string name="checking_for_updates">更新をチェック中…</string>
+    <string name="magisk_update_available">Magisk v%1$.1fが利用可能！</string>
+    <string name="cannot_check_updates">更新を確認できない、インターネット接続なし？</string>
+    <string name="up_to_date">%1$sの最新バージョンがインストールされている</string>
+    <string name="root_error">root権限は許可されていない。許可してないか？</string>
+    <string name="not_rooted">rootされていない</string>
+    <string name="proper_root">正しくrootされた</string>
+    <string name="safetyNet_check_text">タップして、SafetyNetチェックを開始</string>
+    <string name="checking_safetyNet_status">SafetyNetの状態を確認している…</string>
+    <string name="safetyNet_connection_failed">Google APIに接続できない</string>
+    <string name="safetyNet_connection_suspended">Google APIへの接続が中断された</string>
+    <string name="safetyNet_error">SafetyNetチェックできない、ネットがないか？</string>
+    <string name="safetyNet_fail">SafetyNet失敗: CTSプロファイルが不一致</string>
+    <string name="safetyNet_pass">SafetyNet通過した</string>
+    <string name="root_info_warning">機能が大幅に制限されている。</string>
+
+    <!--Install Fragment-->
+    <string name="auto_detect">(自動) %1$s</string>
+    <string name="cannot_auto_detect">(自動検出できない)</string>
+    <string name="boot_image_title">Boot イメージ場所</string>
+    <string name="detect_button">検出</string>
+    <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">インストールされたMagiskバージョン： %1$s</string>
+    <string name="install_magisk_title">最新のMagiskバージョン： %1$s</string>
+    <string name="uninstall">アンインストール</string>
+    <string name="reboot_countdown">%1$dでリブートする</string>
+    <string name="uninstall_magisk_title">Magiskをアンインストールします</string>
+    <string name="uninstall_magisk_msg">これにより、すべてのモジュールとMagiskSUを削除する、暗号化されていないデータが暗号化される可能性があります。\ n続行しますか？</string>
+    <string name="version_none">(なし)</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>
+    <string name="fab_flash_zip">モジュールジップを焼く</string>
+
+    <!--Repo Fragment-->
+    <string name="update_available">利用可能な更新</string>
+    <string name="installed">インストールされた</string>
+    <string name="not_installed">いんすとーるさていない</string>
+
+    <!--Log Fragment-->
+    <string name="menuSaveToSd">SDカードに保存</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">に作成された</a>.]]></string>
+    <string name="app_changelog">アプリのチェンジログ</string>
+    <string name="translators" />神楽坂桜（Sakura_Sa233#Twitter）</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_install">ダウンロードとインストール</string>
+    <string name="download">ダウンロード</string>
+    <string name="goto_install">インストール画面に移動する</string>
+    <string name="download_file_error">ダウンロード中にエラーが発生した</string>
+    <string name="install_error">インストールエラー！</string>
+    <string name="invalid_zip">このジップはMagiskモジュールじゃない</string>
+    <string name="reboot_title">インストール成功した！</string>
+    <string name="reboot_msg">今すぐ再起動しますか？</string>
+    <string name="reboot">リブート</string>
+    <string name="copying_msg">一時ディレクトリへのzipをコピーしている</string>
+    <string name="zip_install_progress_title">インストール中…</string>
+    <string name="zip_unzip_msg">ZIPファイル解凍中…</string>
+    <string name="zip_process_msg">ZIPファイル処理中…</string>
+    <string name="zip_install_progress_msg">%1$sインストール中…</string>
+    <string name="no_magisk_title">Magiskがインストールされていない</string>
+    <string name="no_magisk_msg"> Magiskをダウンロードしてインストールしますか？</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="start_magiskhide">MagiskHide開始… </string>
+    <string name="no_magisksu_title">MagiskSUを使用してない！</string>
+    <string name="no_magisksu_msg">あなたのデバイスはMagiskSUにrootされていない、MagiskHideを使用するだけでは十分ではない。\nそれは正式にサポートされていなくて、あなたはSafetyNetを通過するための追加ツール（例えばsuhide）が必要です。</string>
+    <string name="understand">わかった</string>
+    <string name="process_error">プロセスエラー</string>
+    <string name="internal_storage">ジップは:\n[Internal Storage]%1$sに保存されている</string>
+    <string name="zip_process_title">処理</string>
+    <string name="manual_boot_image">ブートイメージを手動で選択してください！</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、BusyBoxは引き続き有効になります。</string>
+    <string name="settings_magiskhide_summary">さまざまな検出からMagiskを隠す</string>
+    <string name="settings_busybox_title">BusyBoxを有効にする</string>
+    <string name="settings_busybox_summary">Magiskに搭載するBusyBoxをxbinにバインドする</string>
+    <string name="settings_hosts_title">Systemless hosts</string>
+    <string name="settings_hosts_summary">Systemless hostsにAdblockアプリのサポート</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>
+
+    <string name="settings_development_category">アプリケーション開発</string>
+    <string name="settings_developer_logging_title">高度なデバッグログを有効にする</string>
+    <string name="settings_developer_logging_summary">詳細ログを有効にするにはこれをチェック</string>
+    <string name="settings_shell_logging_title">ェルコマンドデバッグログを有効にする</string>
+    <string name="settings_shell_logging_summary">これをチェックすると、すべてのシェルコマンドとその出力をログに記録することができる</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">のスーパーユーザー権限が許可されました</string>
+    <string name="su_snack_deny">%1$s のスーパーユーザー権限が拒否されました</string>
+    <string name="su_snack_notif_on">%1$の通知は有効になって。</string>
+    <string name="su_snack_notif_off">%1$の通知は無効になって。</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>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -14,7 +14,7 @@

    <!--Status Fragment-->
    <string name="magisk_version">Magisk v%1$s 설치됨</string>
-    <string name="magisk_version_disable">Magisk v%1$s 비활성화됨</string>
+    <string name="magisk_version_core_only">Magisk v%1$s 설치됨 (핵심 기능 모드)</string>
    <string name="magisk_version_error">Magisk가 설치되지 않음</string>

    <string name="checking_for_updates">업데이트 확인 중…</string>
@@ -35,6 +35,7 @@

    <!--Install Fragment-->
    <string name="auto_detect">(자동) %1$s</string>
+    <string name="cannot_auto_detect">(자동 감지 실패)</string>
    <string name="boot_image_title">부트 이미지 위치</string>
    <string name="detect_button">감지</string>
    <string name="advanced_settings_title">고급 설정</string>
@@ -44,6 +45,9 @@
    <string name="install_magisk_title">최신 Magisk 버전: %1$s</string>
    <string name="uninstall">제거</string>
    <string name="reboot_countdown">%1$d초 안에 다시 시작됨</string>
+    <string name="uninstall_magisk_title">Magisk 제거</string>
+    <string name="uninstall_magisk_msg">모든 모듈과 MagiskSU를 제거합니다. 또한 데이터가 암호화되어 있지 않은 경우 암호화될 가능성이 있습니다.\n정말 계속하시겠습니까?</string>
+    <string name="version_none">(없음)</string>

    <!--Module Fragment-->
    <string name="no_info_provided">(제공된 정보 없음)</string>
@@ -116,21 +120,25 @@
    <string name="understand">알겠습니다</string>
    <string name="process_error">처리 오류</string>
    <string name="internal_storage">zip 파일이 다음 위치에 저장됨:\n[내부 저장소]%1$s</string>
+    <string name="zip_process_title">처리 중</string>
+    <string name="manual_boot_image">부트 이미지를 직접 선택해 주세요!</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_disable_title">Magisk 비활성화</string>
-    <string name="settings_disable_summary">루팅(MagiskSU)을 제외한 모든 것이 비활성화됩니다.</string>
+    <string name="settings_core_only_title">Magisk 핵심 기능 모드</string>
+    <string name="settings_core_only_summary">핵심 기능만 사용합니다. 모든 모듈은 로드하지 않습니다. MagiskSU, MagiskHide, systemless hosts 및 busybox는 계속 사용할 수 있습니다.</string>
    <string name="settings_magiskhide_summary">다양한 감지로부터 Magisk를 숨깁니다.</string>
    <string name="settings_busybox_title">BusyBox 사용</string>
    <string name="settings_busybox_summary">xbin 디렉터리에 Magisk의 빌트인 busybox를 바인드합니다.</string>
-    <string name="settings_hosts_title">시스템리스 hosts</string>
-    <string name="settings_hosts_summary">애드블록 앱들에서 사용하는 시스템리스 hosts를 지원합니다.</string>
+    <string name="settings_hosts_title">systemless hosts</string>
+    <string name="settings_hosts_summary">광고 차단 앱에서 사용하는 systemless hosts를 지원합니다.</string>

    <string name="settings_su_app_adb">앱 및 ADB</string>
    <string name="settings_su_app">앱만</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -17,7 +17,7 @@

    <!--Status Fragment-->
    <string name="magisk_version">Zainstalowany Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s wyłaczony</string>
+	<string name="magisk_version_core_only">Zainstalowany Magisk v%1$s (Tylko Tryb Rdzeni)</string>
    <string name="magisk_version_error">Magisk nie jest zainstalowany</string>

    <string name="checking_for_updates">Sprawdzanie aktualizacji…</string>
@@ -136,8 +136,8 @@
    <string name="settings_clear_cache_title">Wyczyść Pamięć Repozytorium</string>
    <string name="settings_clear_cache_summary">Wymusza na aplikacji odświeżenie online repozytorium</string>

-    <string name="settings_disable_title">Wyłącz Magisk</string>
-    <string name="settings_disable_summary">Wszystko zostanie wyłączone za wyjątkiem roota (MagiskSU)</string>
+	    <string name="settings_core_only_title">Tylko Tryb Rdzeni Magisk</string>
+    <string name="settings_core_only_summary">Włącz tylko podstawowe funkcje, wszystkie moduły nie zostaną załadowane. MagiskSU, MagiskHide, systemless hosts i BusyBox nadal będą włączone</string>
    <string name="settings_magiskhide_summary">Włącz Hide Magisk dla wykrytych aplikacji</string>
    <string name="settings_busybox_title">Włącz BusyBox</string>
    <string name="settings_busybox_summary">Zmień montowanie Magisk z wbudowanego busybox do xbin</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -6,6 +6,7 @@
    <!--Welcome Activity-->
    <string name="navigation_drawer_open">Abrir gaveta de notificação</string>
    <string name="navigation_drawer_close">Fechar gaveta de notificação</string>
+	
    <string name="modules">Módulos</string>
    <string name="downloads">Baixar</string>
 	<string name="superuser">Superusuário</string>
@@ -16,6 +17,7 @@

    <!--Status Fragment-->
    <string name="magisk_version">Magisk v%1$s Instalado</string>
+	<string name="magisk_version_core_only">Magisk v%1$s Instalado(Somente em modo Core)</string>
    <string name="magisk_version_error">Magisk não instalado</string>

 	<string name="checking_for_updates">Checando por atualizações…</string>
@@ -36,6 +38,7 @@

    <!--Install Fragment-->
 	<string name="auto_detect">(Auto) %1$s</string>
+	<string name="cannot_auto_detect">(Não foi auto detectado)</string>
    <string name="boot_image_title">Local da Boot Image</string>
    <string name="detect_button">Detectar</string>
    <string name="advanced_settings_title">Configurações avançadas</string>
@@ -43,8 +46,12 @@
    <string name="keep_dm_verity">Keep dm-verity</string>
    <string name="current_magisk_title">Versão instalada do Magisk: %1$s</string>
    <string name="install_magisk_title">Última versão do Magisk: %1$s</string>
+	<string name="uninstall">Desinstalar</string>
+    <string name="reboot_countdown">Reiniciando em %1$d</string>
+    <string name="uninstall_magisk_title">Desinstalar Magisk</string>
+    <string name="uninstall_magisk_msg">Isso removerá todos os módulos, MagiskSU, e Potencialmente criptografar seus dados se não criptografados\nVocê deseja continuar?</string>
+    <string name="version_none">(Nenhum)</string>

-	
    <!--Module Fragment-->
    <string name="no_info_provided">(Nenhuma informação fornecida)</string>
    <string name="no_modules_found">Nenhum módulo encontrado</string>
@@ -85,9 +92,12 @@
    <string name="permissionNotGranted">Este recurso não funcionará sem permissão de escrita do armazenamento externo.</string>
    <string name="no_thanks">Não, Obrigado</string>
 	<string name="yes">Sim</string>
+	<string name="ok">OK</string>
+    <string name="close">Fechar</string>
    <string name="repo_install_title">Instalar %1$s</string>
    <string name="repo_install_msg">Você deseja instalar%1$s ?</string>
    <string name="download_install">Baixar &amp; instalar</string>
+	<string name="download">Baixar</string>
 	<string name="goto_install">Ir na seção \"Instalar\"</string>
    <string name="download_file_error">Erro ao baixar o arquivo</string>
    <string name="install_error">Erro na instalação!</string>
@@ -109,19 +119,25 @@
 	<string name="repo_cache_cleared">Cache do Repo. limpado</string>
    <string name="safetyNet_hide_notice">Este aplicativo usa SafetyNet\nJá manipulado pelo MagiskHide por padrão</string>
    <string name="start_magiskhide">Iniciando MagiskHide …</string>
-	
-	
-	
-	
-	
+	<string name="no_magisksu_title">Não está usando MagiskSU!</string>
+    <string name="no_magisksu_msg">Você não está rooteado com MagiskSU, Usar MagiskHide em si pode não ser suficiente!\Ele não é oficialmente suportado, E você precisaria de ferramentas adicionais (ex: suhide) para passar pelo Safety Net.</string>
+    <string name="understand">Eu entendo</string>
+    <string name="process_error">Erro no processo</string>
+    <string name="internal_storage">O zip foi salvo em:\n[Armazenamento interno]%1$s</string>
+    <string name="zip_process_title">Processando</string>
+    <string name="manual_boot_image">Por Favor, selecione manualmente a Boot Image</string>
 	
    <!--Settings Fragment -->
    <string name="settings_general_category">Geral</string>
    <string name="settings_dark_theme_title">Tema escuro</string>
    <string name="settings_dark_theme_summary">Ativa o tema escuro</string>
+	<string name="settings_notification_title">Notificação de Atualização</string>
+    <string name="settings_notification_summary">Mostrar notificações de atualização quando a nova versão estiver disponível</string>
    <string name="settings_clear_cache_title">Limpar Repo Cache</string>
    <string name="settings_clear_cache_summary">Limpe as informações armazenadas em cache para repos. online, forçando o aplicativo a atualizar online</string>

+	<string name="settings_core_only_title">Magisk modo somente Core</string>
+    <string name="settings_core_only_summary">Ativar somente recursos principais, todos os módulos não serão carregados. MagiskSU, MagiskHide, systemless hosts, e busybox ainda estará ativado</string>
    <string name="settings_magiskhide_summary">Ocultar Magisk de várias detecções</string>
    <string name="settings_busybox_title">Ativar BusyBox</string>
    <string name="settings_busybox_summary">Monta a busybox interna do Magisk\'s para xbin</string>
@@ -152,7 +168,7 @@
 	<string name="su_request_title">Solicitação de superusuário</string>
    <string name="deny_with_str">Negar%1$s</string>
    <string name="deny">Negar</string>
-    <string name="prompt">Painel</string>
+    <string name="prompt">Perguntar</string>
    <string name="grant">Permitir</string>
    <string name="su_warning">Concede acesso total ao seu dispositivo.\nNegue se você não tiver certeza!</string>
    <string name="forever">Sempre</string>
@@ -173,15 +189,13 @@
    <string name="su_snack_revoke">%1$s Direitos foi revogados</string>
    <string name="su_revoke_title">Revogar?</string>
    <string name="su_revoke_msg">Revogar os diretos do %1$s, Confirmar?</string>
-    <string name="toast">Notificação simples</string>
+    <string name="toast">Notificação(Toast)</string>
    <string name="none">Nenhum</string>

    <!--Superuser logs-->
    <string name="pid">PID:\u0020</string>
    <string name="target_uid">Alvo UID:\u0020</string>
    <string name="command">Comando:\u0020</string>
-	<string name="settings_disable_title">Desativar Magic Mount</string>
-    <string name="settings_disable_summary">Desativa Magic Mount, Isso impedirá que todos os módulos funcionem</string>
-	
-	
+
+
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -12,7 +12,6 @@

    <!--Status Fragment-->
    <string name="magisk_version">Установлен Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s выключен</string>
    <string name="magisk_version_error">Magisk не установлен</string>

    <string name="checking_for_updates">Проверка обновлений…</string>
@@ -119,8 +118,6 @@
    <string name="settings_clear_cache_title">Очистить кэш репозиториев</string>
    <string name="settings_clear_cache_summary">Удалить сохранённую информацию о сетевых репозиториях, чтобы приложение обновило информацию из сети</string>

-    <string name="settings_disable_title">Отключить Magisk</string>
-    <string name="settings_disable_summary">Будет выключено все, кроме рута (MagiskSU)</string>
    <string name="settings_magiskhide_summary">Скрыть Magisk от различных проверок</string>
    <string name="settings_busybox_title">Включить BusyBox</string>
    <string name="settings_busybox_summary">Примонтировать встроенный busybox из Magisk в xbin</string>
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="fab_padding">24dp</dimen>
+</resources>
--- a/app/src/main/res/values-sw600dp-v21/styles.xml
+++ b/app/src/main/res/values-sw600dp-v21/styles.xml
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -12,8 +12,7 @@

    <!--Status Fragment-->
    <string name="magisk_version">Magisk v%1$s yüklü</string>
-    <string name="magisk_version_disable">Magisk v%1$s devre dışı</string>
-    <string name="magisk_version_error">Magisk yüklü değil</string>
+     <string name="magisk_version_error">Magisk yüklü değil</string>

    <string name="checking_for_updates">Güncelleştirmeler denetleniyor…</string>
    <string name="magisk_update_available">Magisk v%1$.1f mevcut!</string>
@@ -131,9 +130,7 @@
    <string name="settings_clear_cache_title">Repo Önbelleğini Temizle</string>
    <string name="settings_clear_cache_summary">Çevrimiçi repolar için önbellek bilgilerini temizle, uygulamayı çevrimiçi yenilemeye zorla</string>

-    <string name="settings_disable_title">"Magisk'i devre dışı bırak"</string>
-    <string name="settings_disable_summary">Root (MagiskSU) dışında her şey devre dışı bırakılır</string>
-    <string name="settings_magiskhide_summary">"Magisk'i çeşitli algılamalardan gizle"</string>
+     <string name="settings_magiskhide_summary">"Magisk'i çeşitli algılamalardan gizle"</string>
    <string name="settings_busybox_title">"BusyBox'ı etkinleştir"</string>
    <string name="settings_busybox_summary">"Magisk'in dahili busybox'ını xbin'e bağla"</string>
    <string name="settings_hosts_title">Sistemsiz host</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,12 +1,9 @@
 <resources>
    <!--Universal-->
-    <string name="app_name" translatable="false">Magisk Manager</string>
-    <string name="magisk" translatable="false">Magisk</string>

    <!--Welcome Activity-->
    <string name="navigation_drawer_open">Mở thanh điều hướng</string>
    <string name="navigation_drawer_close">Đóng thanh điều hướng</string>
-    <string name="magiskhide" translatable="false">Magisk Hide</string>
    <string name="modules">Mô-đun</string>
    <string name="downloads">Tải xuống</string>
    <string name="superuser">Superuser</string>
@@ -17,7 +14,6 @@

    <!--Status Fragment-->
    <string name="magisk_version">Đã cài Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s disabled</string>
    <string name="magisk_version_error">Magisk chưa được cài đặt</string>

    <string name="checking_for_updates">Đang kiểm tra cập nhật…</string>
@@ -136,8 +132,6 @@
    <string name="settings_clear_cache_title">Xoá bộ đệm kho</string>
    <string name="settings_clear_cache_summary">Xoá thông tin truy cập nhật về các kho mô-đun, buộc ứng dụng làm mới trực tuyến</string>

-    <string name="settings_disable_title">Vô hiệu Magisk</string>
-    <string name="settings_disable_summary">Vô hiệu tất cả trừ root (MagiskSU)</string>
    <string name="settings_magiskhide_summary">Ẩn Magisk khỏi nhiều phương thức phát hiện</string>
    <string name="settings_busybox_title">Dùng BusyBox</string>
    <string name="settings_busybox_summary">Gắn kết busy có sẵn của Magisk tới xbin</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -14,7 +14,7 @@

    <!--Status Fragment-->
    <string name="magisk_version">已安装 Magisk v%1$s</string>
-    <string name="magisk_version_disable">已禁用 Magisk v%1$s</string>
+    <string name="magisk_version_core_only">已安装 Magisk v%1$s (仅核心功能)</string>
    <string name="magisk_version_error">未安装 Magisk</string>

    <string name="checking_for_updates">正在检查更新…</string>
@@ -128,8 +128,7 @@
    <string name="settings_clear_cache_title">清除资源库缓存</string>
    <string name="settings_clear_cache_summary">清除已缓存的在线资源库信息，强制刷新在线数据</string>

-    <string name="settings_disable_title">禁用 Magisk</string>
-    <string name="settings_disable_summary">除 ROOT (MagiskSU) 以外，其他都将被禁用</string>
+    <string name="settings_core_only_summary">仅启用核心功能，所有模组将不会被载入。MagiskSU丶MagiskHide丶systemless hosts丶和 busybox 仍会持续运作</string>
    <string name="settings_magiskhide_summary">隐藏 Magisk 使其不被多种方法检测到</string>
    <string name="settings_busybox_title">启用 BusyBox</string>
    <string name="settings_busybox_summary">将 Magisk 内置的 Busybox 挂载到 xbin</string>
@@ -188,5 +187,6 @@
    <string name="pid">PID:\u0020</string>
    <string name="target_uid">目标 UID:\u0020</string>
    <string name="command">命令:\u0020</string>
+    <string name="settings_core_only_title">Magisk 核心功能模式</string>

 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -14,7 +14,6 @@

    <!--Status Fragment-->
    <string name="magisk_version">已安裝 Magisk v%1$s</string>
-    <string name="magisk_version_disable">已禁用 Magisk v%1$s</string>
    <string name="magisk_version_error">未安裝 Magisk</string>

    <string name="checking_for_updates">正在檢查更新…</string>
@@ -120,8 +119,7 @@
    <string name="settings_clear_cache_title">清除資源庫快取</string>
    <string name="settings_clear_cache_summary">清除已暫存的在線資源庫快取，強制刷新在線數據</string>

-    <string name="settings_disable_title">禁用 Magisk</string>
-    <string name="settings_disable_summary">除 ROOT (MagiskSU) 以外，其他都將被禁用</string>
+    <string name="settings_core_only_title">Magisk 核心功能模式</string>
    <string name="settings_magiskhide_summary">隱藏 Magisk 使其不被多種方法檢測到</string>
    <string name="settings_busybox_title">啟用 BusyBox</string>
    <string name="settings_busybox_summary">將 Magisk 內置的 Busybox 掛載到 xbin</string>
@@ -193,5 +191,7 @@
    <string name="cannot_auto_detect">(無法自動偵測)</string>
    <string name="settings_notification_summary">有更新的時候顯示通知</string>
    <string name="settings_notification_title">更新通知</string>
+    <string name="magisk_version_core_only">已安裝 Magisk v%1$s (僅核心功能)</string>
+    <string name="settings_core_only_summary">僅啟用核心功能，所有模組將不會被載入。MagiskSU、MagiskHide、systemless hosts、和 busybox 仍會持續運作</string>

 </resources>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,4 +11,5 @@
    <dimen name="card_textview_width">300dip</dimen>
    <dimen name="checkbox_padding">3dp</dimen>
    <dimen name="card_appicon_size">50dp</dimen>
+    <dimen name="fab_padding">16dp</dimen>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@

    <!--Status Fragment-->
    <string name="magisk_version">Installed Magisk v%1$s</string>
-    <string name="magisk_version_disable">Magisk v%1$s disabled</string>
+    <string name="magisk_version_core_only">Installed Magisk v%1$s (Core Only Mode)</string>
    <string name="magisk_version_error">Magisk not installed</string>

    <string name="checking_for_updates">Checking for updates…</string>
@@ -136,8 +136,8 @@
    <string name="settings_clear_cache_title">Clear Repo Cache</string>
    <string name="settings_clear_cache_summary">Clear the cached information for online repos, forces the app to refresh online</string>

-    <string name="settings_disable_title">Disable Magisk</string>
-    <string name="settings_disable_summary">Everything will be disabled except root (MagiskSU)</string>
+    <string name="settings_core_only_title">Magisk Core Only Mode</string>
+    <string name="settings_core_only_summary">Enable only core features, all modules will not be loaded. MagiskSU, MagiskHide, systemless hosts, and busybox will still be enabled</string>
    <string name="settings_magiskhide_summary">Hide Magisk from various detections</string>
    <string name="settings_busybox_title">Enable BusyBox</string>
    <string name="settings_busybox_summary">Bind mount Magisk\'s built-in busybox to xbin</string>
--- a/app/src/main/res/xml/app_settings.xml
+++ b/app/src/main/res/xml/app_settings.xml
@@ -10,7 +10,7 @@
            android:summary="@string/settings_dark_theme_summary"
            android:key="dark_theme" />

-        <CheckBoxPreference
+        <SwitchPreference
            android:title="@string/settings_notification_title"
            android:summary="@string/settings_notification_summary"
            android:key="notification" />
@@ -28,8 +28,8 @@

        <CheckBoxPreference
            android:key="disable"
-            android:title="@string/settings_disable_title"
-            android:summary="@string/settings_disable_summary" />
+            android:title="@string/settings_core_only_title"
+            android:summary="@string/settings_core_only_summary" />

        <SwitchPreference
            android:key="busybox"
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.4.0-alpha6'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 17 11:39:12 CEST 2016
+#Wed Apr 05 09:31:45 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
Author	SHA1	Message	Date
topjohnwu	2b3bbf7e67	Bump version	2017-04-26 00:59:56 +08:00
topjohnwu	464fe627a3	Swap tabs	2017-04-26 00:27:55 +08:00
topjohnwu	6a9e39c470	Support unlimited amount of repos	2017-04-26 00:15:53 +08:00
topjohnwu	7fec9a3cc6	Fix string.xml errors	2017-04-24 22:26:40 +08:00
Primokorn	008f6ef462	Update french strings.xml Better translation.	2017-04-24 21:54:34 +08:00
lilymaniac	2440c108ca	Update values-ko/strings.xml	2017-04-24 21:54:22 +08:00
linar10	430baad8a4	Update strings pl	2017-04-24 21:54:05 +08:00
Nosi	51132e74b4	Changes Spanish	2017-04-24 21:53:48 +08:00
killer7Mod	a4f33e106a	Update Portuguese translation	2017-04-24 21:53:21 +08:00
SakuraSa233	baba3190e0	Add Japanese Translation	2017-04-24 21:53:05 +08:00
topjohnwu	47b13aa5ea	Use stock FAB; Log monospace; Fixes	2017-04-24 21:52:23 +08:00
topjohnwu	ae88d3054d	Finally, official Java 8 support	2017-04-05 17:02:18 +08:00
topjohnwu	411b600e14	Screw that Jack compiler, use retrolambda	2017-03-31 16:04:12 +08:00
topjohnwu	0a0ad9a184	Bump to 4.3.1	2017-03-31 13:17:58 +08:00
topjohnwu	234bead59e	Bump version	2017-03-31 06:58:47 +08:00
Primokorn	76de310986	Create french strings.xml Hope it's not too late for the update :)	2017-03-31 03:23:23 +08:00
topjohnwu	817f050bcd	Say goodbye to old modules	2017-03-30 06:52:18 +08:00
topjohnwu	60ae685d1e	Change disable to Core Only Mode	2017-03-30 05:16:50 +08:00
Wang Han	4c7bdbb284	Fix crashing when selecting release notes on some devices	2017-03-26 23:55:11 +08:00