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

Try to flush database before uninstalling

Browse Source
This commit is contained in:
topjohnwu 2018-10-20 15:31:41 -04:00
parent e7e580e177
commit 6557070ae1
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/full/java/com/topjohnwu/magisk/asyncs/PatchAPK.java
View File

@ -111,6 +111,7 @@ public class PatchAPK {
repack.delete(); repack.delete();
mm.mDB.setStrings(Const.Key.SU_MANAGER, pkg); mm.mDB.setStrings(Const.Key.SU_MANAGER, pkg);
mm.mDB.flush();
Data.exportPrefs(); Data.exportPrefs();
RootUtils.uninstallPkg(Const.ORIG_PKG_NAME); RootUtils.uninstallPkg(Const.ORIG_PKG_NAME);

9
app/src/full/java/com/topjohnwu/magisk/database/MagiskDatabaseHelper.java
View File

@ -57,6 +57,10 @@ public class MagiskDatabaseHelper {
private MagiskDatabaseHelper() { private MagiskDatabaseHelper() {
pm = Data.MM().getPackageManager(); pm = Data.MM().getPackageManager();
init();
}
private void init() {
db = openDatabase(); db = openDatabase();
db.disableWriteAheadLogging(); db.disableWriteAheadLogging();
int version = Data.magiskVersionCode >= Const.MAGISK_VER.DBVER_SIX ? DATABASE_VER : OLD_DATABASE_VER; int version = Data.magiskVersionCode >= Const.MAGISK_VER.DBVER_SIX ? DATABASE_VER : OLD_DATABASE_VER;
@ -171,6 +175,11 @@ public class MagiskDatabaseHelper {
"(key TEXT, value INT, PRIMARY KEY(key))"); "(key TEXT, value INT, PRIMARY KEY(key))");
} }
public void flush() {
db.close();
init();
}
public void clearOutdated() { public void clearOutdated() {
// Clear outdated policies // Clear outdated policies
db.delete(POLICY_TABLE, Utils.fmt("until > 0 AND until < %d", System.currentTimeMillis() / 1000), null); db.delete(POLICY_TABLE, Utils.fmt("until > 0 AND until < %d", System.currentTimeMillis() / 1000), null);