From 721994723737878565b69dcff41136dfbaf17c79 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 8 Apr 2019 21:05:11 -0400
Subject: [PATCH] Update libsu

Close #1314
---
 app/build.gradle                                       |  2 +-
 app/src/main/java/com/topjohnwu/magisk/Config.java     |  2 +-
 .../com/topjohnwu/magisk/tasks/MagiskInstaller.java    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 64373ffe9..eb5ebe967 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation 'androidx.work:work-runtime:2.0.0'
     implementation 'androidx.transition:transition:1.1.0-alpha02'
 
-    def libsuVersion = '2.3.3'
+    def libsuVersion = '2.4.0'
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/Config.java b/app/src/main/java/com/topjohnwu/magisk/Config.java
index 7300898f8..fe12378ff 100644
--- a/app/src/main/java/com/topjohnwu/magisk/Config.java
+++ b/app/src/main/java/com/topjohnwu/magisk/Config.java
@@ -119,7 +119,7 @@ public class Config {
     public static void initialize() {
         SharedPreferences pref = App.self.prefs;
         SharedPreferences.Editor editor = pref.edit();
-        SuFile config = new SuFile("/data/adb/" + Const.MANAGER_CONFIGS);
+        File config = SuFile.open("/data/adb", Const.MANAGER_CONFIGS);
         if (config.exists()) {
             try {
                 SuFileInputStream is = new SuFileInputStream(config);
diff --git a/app/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java b/app/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
index 2e2334472..f958aabd4 100644
--- a/app/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
+++ b/app/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
@@ -164,9 +164,9 @@ public abstract class MagiskInstaller {
             return false;
         }
 
-        SuFile init64 = new SuFile(installDir, "magiskinit64");
+        File init64 = SuFile.open(installDir, "magiskinit64");
         if (Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_64_BIT_ABIS.length != 0) {
-            init64.renameTo(new SuFile(installDir, "magiskinit"));
+            init64.renameTo(SuFile.open(installDir, "magiskinit"));
         } else {
             init64.delete();
         }
@@ -214,8 +214,8 @@ public abstract class MagiskInstaller {
                     ShellUtils.pump(tarIn, tarOut);
                 }
             }
-            SuFile boot = new SuFile(installDir, "boot.img");
-            SuFile recovery = new SuFile(installDir, "recovery.img");
+            File boot = SuFile.open(installDir, "boot.img");
+            File recovery = SuFile.open(installDir, "recovery.img");
             if (vbmeta && recovery.exists() && boot.exists()) {
                 // Install Magisk to recovery
                 srcBoot = recovery.getPath();
@@ -320,7 +320,7 @@ public abstract class MagiskInstaller {
     }
 
     protected boolean storeBoot() {
-        SuFile patched = new SuFile(installDir, "new-boot.img");
+        File patched = SuFile.open(installDir, "new-boot.img");
         try {
             OutputStream os;
             if (isTar) {