MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix multiusers conflicting

Browse Source
This commit is contained in:
topjohnwu 2018-02-13 06:05:20 +08:00
parent bffa837825
commit ae5277a898
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
View File

@ -41,16 +41,21 @@ public class SuDatabaseHelper {
try { try {
return new SuDatabaseHelper(mm); return new SuDatabaseHelper(mm);
} catch (Exception e) { } catch (Exception e) {
// Let's cleanup and try again // Let's cleanup everything and try again
cleanup(); cleanup("*");
return new SuDatabaseHelper(mm); return new SuDatabaseHelper(mm);
} }
} }
public static void cleanup() { public static void cleanup() {
cleanup(String.valueOf(Const.USER_ID));
}
public static void cleanup(String s) {
Shell.Sync.su( Shell.Sync.su(
"umount -l /data/user*/*/*/databases/su.db /sbin/.core/db-*/magisk.db", "umount -l /data/user*/*/*/databases/su.db",
"rm -rf /sbin/.core/db-*"); "umount -l /sbin/.core/db-" + s + "/magisk.db",
"rm -rf /sbin/.core/db-" + s);
} }
private SuDatabaseHelper(MagiskManager mm) { private SuDatabaseHelper(MagiskManager mm) {
@ -68,7 +73,7 @@ public class SuDatabaseHelper {
private SQLiteDatabase openDatabase(MagiskManager mm) { private SQLiteDatabase openDatabase(MagiskManager mm) {
String GLOBAL_DB = "/data/adb/magisk.db"; String GLOBAL_DB = "/data/adb/magisk.db";
DB_FILE = new File(Utils.fmt("/sbin/.core/db-%s/magisk.db", mm.getPackageName())); DB_FILE = new File(Utils.fmt("/sbin/.core/db-%d/magisk.db", Const.USER_ID));
Context de = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N Context de = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
? mm.createDeviceProtectedStorageContext() : mm; ? mm.createDeviceProtectedStorageContext() : mm;
if (!DB_FILE.exists()) { if (!DB_FILE.exists()) {