Use stable build tools + retrolambda

Signed-off-by: lindwurm <lindwurm.q@gmail.com>

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

app/build.gradle

@@ -1,19 +1,16 @@
 apply plugin: 'com.android.application'
+apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.topjohnwu.magisk"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 27
-        versionName "4.3.0"
-        jackOptions {
-            enabled true
-            jackInProcess true
-        }
+        versionCode 31
+        versionName "4.3.3"
         ndk {
             moduleName 'zipadjust'
             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
@@ -38,6 +35,14 @@ android {
             path 'src/main/jni/CMakeLists.txt'
         }
     }
+    lintOptions {
+        disable 'MissingTranslation'
+    }
+    retrolambda {
+        javaVersion JavaVersion.VERSION_1_7
+        defaultMethods false
+        incremental true
+    }
 }
 repositories {
     jcenter()
@@ -52,7 +57,6 @@ dependencies {
     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'

app/proguard-rules.pro

@@ -22,4 +22,9 @@
 -keep interface android.support.v7.** { *; }
 
 # SpongyCastle
--keep class org.spongycastle.** {*;}
+-keep class org.spongycastle.** { *; }
+-dontwarn javax.naming.**
+
+# retrolambda
+-dontwarn java.lang.invoke.*
+

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;

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;

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;

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;

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,94 +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);
 
-        // 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(false), fetched = new ValueSortedMap<>();
-
-        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) {
-                            fetched.put(id, repo);
-                        }
-                    } catch (BaseModule.CacheModException ignored) {}
-
-                    // Update the database
-                    dbHelper.addRepoMap(fetched);
-                    // The leftover cached are those removed remote, cleanup db
-                    dbHelper.removeRepo(cached);
-                    // Update ETag
-                    prefs.edit().putString(ETAG_KEY, etag).apply();
-                }
-
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
+        // Update ETag
+        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();
 
-        magiskManager.repoMap = dbHelper.getRepoMap();
-
-        Logger.dev("LoadRepos: Repo load done");
+        magiskManager.repoMap = repoDB.getRepoMap();
+        Logger.dev("LoadRepos: Done");
         return null;
     }
 

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

@@ -15,6 +15,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
     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);
@@ -45,6 +46,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
         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();
@@ -60,6 +62,7 @@ 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();
@@ -76,12 +79,12 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
         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());
-                if (repo.getTemplateVersion() < 3 && filtered) {
+                if (repo.getTemplateVersion() < MIN_TEMPLATE_VER && filtered) {
                     Logger.dev("Outdated repo: " + repo.getId());
-                    continue;
+                } else {
+                    // Logger.dev("Load from DB: " + repo.getId());
+                    ret.put(repo.getId(), repo);
                 }
-                ret.put(repo.getId(), repo);
             }
         }
         db.close();

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();

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);
-        }
-    }
-}

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);
         }
     }
 }

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;
-    }
-
 }

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);

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;

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"

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>
 

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>

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

@@ -190,6 +190,5 @@
     <string name="pid">PID:\u0020</string>
     <string name="target_uid">Cílové UID:\u0020</string>
     <string name="command">Příkaz:\u0020</string>
-    <string name="settings_core_only_summary"></string>
 
 </resources>

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

@@ -28,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>
@@ -49,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>
 
@@ -64,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>
 
@@ -73,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>
@@ -83,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>
@@ -113,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>
@@ -154,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>
@@ -169,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>
 

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

@@ -126,7 +126,7 @@
     <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">Relier le busybox de Magisk à xbin</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>

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

@@ -0,0 +1,198 @@
+<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 Statusをチェック中…</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 Failed: CTSプロファイルが不一致</string>
+    <string name="safetyNet_pass">SafetyNet Passed</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">モジュールの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">Dvdandroid</a>によって作られました。]]></string>
+    <string name="app_changelog">アプリの更新履歴</string>
+    <string name="translators">神楽坂桜（Sakura_Sa233#Twitter）/ hota (@lindwurm)</string>
+    <string name="app_version">アプリのバージョン</string>
+    <string name="app_source_code">ソースコード</string>
+    <string name="donation">寄付</string>
+    <string name="app_translators">アプリの翻訳者</string>
+    <string name="support_thread">サポートスレッド</string>
+
+    <!--Toasts, Dialogs-->
+    <string name="permissionNotGranted">この機能は外部ストレージを書き込む権限がないと作動しません</string>
+    <string name="no_thanks">いいえ</string>
+    <string name="yes">はい</string>
+    <string name="ok">OK</string>
+    <string name="close">閉じる</string>
+    <string name="repo_install_title">%1$s をインストール</string>
+    <string name="repo_install_msg">%1$s をインストールしますか？</string>
+    <string name="download_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">この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">zipは:\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">AdblockのためのSystemless hostsサポート</string>
+
+    <string name="settings_su_app_adb">アプリとADB</string>
+    <string name="settings_su_app">アプリのみ</string>
+    <string name="settings_su_adb">ADBのみ</string>
+    <string name="settings_su_disable">無効</string>
+    <string name="settings_su_request_10">10秒</string>
+    <string name="settings_su_request_20">20秒</string>
+    <string name="settings_su_request_30">30秒</string>
+    <string name="settings_su_request_60">60秒</string>
+    <string name="superuser_access">スーパーユーザーアクセス</string>
+    <string name="auto_response">自動反応</string>
+    <string name="request_timeout">リクエストタイムアウト</string>
+    <string name="superuser_notification">スーパーユーザー通知</string>
+    <string name="request_timeout_summary">%1$s秒</string>
+
+    <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">%1$sのスーパーユーザー権限が許可されました</string>
+    <string name="su_snack_deny">%1$s のスーパーユーザー権限は拒否されました</string>
+    <string name="su_snack_notif_on">%1$s の通知は有効です</string>
+    <string name="su_snack_notif_off">%1$s の通知は無効です</string>
+    <string name="su_snack_log_on">%1$s のログは有効です</string>
+    <string name="su_snack_log_off">%1$s のログは無効です</string>
+    <string name="su_snack_revoke">％1$s の権限は取り消されました</string>
+    <string name="su_revoke_title">取り消し？</string>
+    <string name="su_revoke_msg">%1$s の権限を取り消すことを承認しますか？</string>
+    <string name="toast">通知</string>
+    <string name="none">なし</string>
+
+    <!--Superuser logs-->
+    <string name="pid">PID:\u0020</string>
+    <string name="target_uid">ターゲット UID:\u0020</string>
+    <string name="command">コマンド:\u0020</string>
+
+</resources>

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

@@ -14,6 +14,7 @@
 
     <!--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>
@@ -34,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>
@@ -43,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>
@@ -115,19 +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_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>

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

@@ -17,6 +17,7 @@
 
     <!--Status Fragment-->
     <string name="magisk_version">Zainstalowany Magisk v%1$s</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>
@@ -135,6 +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_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>

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

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>

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>

build.gradle

@@ -6,7 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'me.tatarka:gradle-retrolambda:3.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#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