Commit 3f55be96 authored by topjohnwu's avatar topjohnwu

Update the method to handle global su db

parent b05d2d3a
...@@ -119,7 +119,7 @@ public class MagiskManager extends Shell.ContainerApp { ...@@ -119,7 +119,7 @@ public class MagiskManager extends Shell.ContainerApp {
} catch (PackageManager.NameNotFoundException ignored) { /* Expected */ } } catch (PackageManager.NameNotFoundException ignored) { /* Expected */ }
} }
suDB = SuDatabaseHelper.getSuDB(false); suDB = SuDatabaseHelper.getInstance(this);
repoDB = new RepoDatabaseHelper(this); repoDB = new RepoDatabaseHelper(this);
defaultLocale = Locale.getDefault(); defaultLocale = Locale.getDefault();
setLocale(); setLocale();
...@@ -219,11 +219,6 @@ public class MagiskManager extends Shell.ContainerApp { ...@@ -219,11 +219,6 @@ public class MagiskManager extends Shell.ContainerApp {
ret = Shell.Sync.su("echo \"$BOOTIMAGE\""); ret = Shell.Sync.su("echo \"$BOOTIMAGE\"");
if (Utils.isValidShellResponse(ret)) if (Utils.isValidShellResponse(ret))
bootBlock = ret.get(0); bootBlock = ret.get(0);
if (suDB != null && !SuDatabaseHelper.verified) {
suDB.close();
suDB = SuDatabaseHelper.getSuDB(true);
}
} }
public void getDefaultInstallFlags() { public void getDefaultInstallFlags() {
......
...@@ -4,13 +4,13 @@ import android.app.Activity; ...@@ -4,13 +4,13 @@ import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.widget.Toast; import android.widget.Toast;
import com.topjohnwu.utils.JarMap;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.utils.Const; import com.topjohnwu.magisk.utils.Const;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
import com.topjohnwu.magisk.utils.ZipUtils; import com.topjohnwu.magisk.utils.ZipUtils;
import com.topjohnwu.superuser.Shell; import com.topjohnwu.superuser.Shell;
import com.topjohnwu.utils.JarMap;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
......
...@@ -7,7 +7,6 @@ import android.os.Build; ...@@ -7,7 +7,6 @@ import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import com.topjohnwu.utils.SignBoot;
import com.topjohnwu.magisk.FlashActivity; import com.topjohnwu.magisk.FlashActivity;
import com.topjohnwu.magisk.MagiskManager; import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.container.TarEntry; import com.topjohnwu.magisk.container.TarEntry;
...@@ -15,6 +14,7 @@ import com.topjohnwu.magisk.utils.Const; ...@@ -15,6 +14,7 @@ import com.topjohnwu.magisk.utils.Const;
import com.topjohnwu.magisk.utils.Utils; import com.topjohnwu.magisk.utils.Utils;
import com.topjohnwu.magisk.utils.ZipUtils; import com.topjohnwu.magisk.utils.ZipUtils;
import com.topjohnwu.superuser.Shell; import com.topjohnwu.superuser.Shell;
import com.topjohnwu.utils.SignBoot;
import org.kamranzafar.jtar.TarInputStream; import org.kamranzafar.jtar.TarInputStream;
import org.kamranzafar.jtar.TarOutputStream; import org.kamranzafar.jtar.TarOutputStream;
......
...@@ -68,7 +68,7 @@ public class RequestActivity extends Activity { ...@@ -68,7 +68,7 @@ public class RequestActivity extends Activity {
pm = getPackageManager(); pm = getPackageManager();
mm = Utils.getMagiskManager(this); mm = Utils.getMagiskManager(this);
mm.suDB.cleanup(); mm.suDB.clearOutdated();
Intent intent = getIntent(); Intent intent = getIntent();
socketPath = intent.getStringExtra("socket"); socketPath = intent.getStringExtra("socket");
......
...@@ -28,6 +28,7 @@ import com.topjohnwu.magisk.MagiskManager; ...@@ -28,6 +28,7 @@ import com.topjohnwu.magisk.MagiskManager;
import com.topjohnwu.magisk.R; import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.SplashActivity; import com.topjohnwu.magisk.SplashActivity;
import com.topjohnwu.magisk.components.SnackbarMaker; import com.topjohnwu.magisk.components.SnackbarMaker;
import com.topjohnwu.magisk.database.SuDatabaseHelper;
import com.topjohnwu.magisk.receivers.DownloadReceiver; import com.topjohnwu.magisk.receivers.DownloadReceiver;
import com.topjohnwu.superuser.Shell; import com.topjohnwu.superuser.Shell;
...@@ -80,7 +81,8 @@ public class Utils { ...@@ -80,7 +81,8 @@ public class Utils {
} }
public static void uninstallPkg(String pkg) { public static void uninstallPkg(String pkg) {
Shell.Sync.su(fmt("umount -l /data/user*/*/%s/*/*.db 2>/dev/null; pm uninstall %s", pkg, pkg)); SuDatabaseHelper.cleanup();
Shell.Sync.su("pm uninstall " + pkg);
} }
public static void dlAndReceive(Context context, DownloadReceiver receiver, String link, String filename) { public static void dlAndReceive(Context context, DownloadReceiver receiver, String link, String filename) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment