TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-20 08:48:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop package_name column

Browse Source
This commit is contained in:
topjohnwu 2022-03-28 02:05:09 -07:00
parent 7e7ddeb9e2
commit efb3239cbd
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/topjohnwu/magisk/core/magiskdb/PolicyDao.kt
View File

@ -26,8 +26,10 @@ class PolicyDao : MagiskDB() {
suspend fun update(policy: SuPolicy) { suspend fun update(policy: SuPolicy) {
val map = policy.toMap() val map = policy.toMap()
// Put in package_name for old database if (!Const.Version.isCanary()) {
map["package_name"] = AppContext.packageManager.getNameForUid(policy.uid)!! // Put in package_name for old database
map["package_name"] = AppContext.packageManager.getNameForUid(policy.uid)!!
}
val query = "REPLACE INTO ${Table.POLICY} ${map.toQuery()}" val query = "REPLACE INTO ${Table.POLICY} ${map.toQuery()}"
exec(query) exec(query)
} }

33
native/jni/core/db.cpp
View File

@ -7,7 +7,7 @@
#include <socket.hpp> #include <socket.hpp>
#include <utils.hpp> #include <utils.hpp>
#define DB_VERSION 11 #define DB_VERSION 12
using namespace std; using namespace std;
@ -158,8 +158,8 @@ static char *open_and_init_db(sqlite3 *&db) {
auto create_policy = [&] { auto create_policy = [&] {
sqlite3_exec(db, sqlite3_exec(db,
"CREATE TABLE IF NOT EXISTS policies " "CREATE TABLE IF NOT EXISTS policies "
"(uid INT, package_name TEXT, policy INT, until INT, " "(uid INT, policy INT, until INT, logging INT, "
"logging INT, notification INT, PRIMARY KEY(uid))", "notification INT, PRIMARY KEY(uid))",
nullptr, nullptr, &err); nullptr, nullptr, &err);
}; };
auto create_settings = [&] { auto create_settings = [&] {
@ -185,11 +185,12 @@ static char *open_and_init_db(sqlite3 *&db) {
// //
// 0 - 6: DB stored in app private data. There are no longer any code in the project to // 0 - 6: DB stored in app private data. There are no longer any code in the project to
// migrate these data, so no need to take any of these versions into consideration. // migrate these data, so no need to take any of these versions into consideration.
// 7 : create table 'hidelist' (process TEXT, PRIMARY KEY(process)) // 7 : create table `hidelist` (process TEXT, PRIMARY KEY(process))
// 8 : add new column (package_name TEXT) to table 'hidelist' // 8 : add new column (package_name TEXT) to table `hidelist`
// 9 : rebuild table 'hidelist' to update primary key (PRIMARY KEY(package_name, process)) // 9 : rebuild table `hidelist` to change primary key (PRIMARY KEY(package_name, process))
// 10: remove table 'logs' // 10: remove table `logs`
// 11: remove table 'hidelist' and create table 'denylist' (same data structure) // 11: remove table `hidelist` and create table `denylist` (same data structure)
// 12: rebuild table `policies` to drop column `package_name`
if (/* 0, 1, 2, 3, 4, 5, 6 */ ver <= 6) { if (/* 0, 1, 2, 3, 4, 5, 6 */ ver <= 6) {
create_policy(); create_policy();
@ -251,6 +252,22 @@ static char *open_and_init_db(sqlite3 *&db) {
ver = 11; ver = 11;
upgrade = true; upgrade = true;
} }
if (ver == 11) {
sqlite3_exec(db,
"BEGIN TRANSACTION;"
"ALTER TABLE policies RENAME TO policies_tmp;"
"CREATE TABLE IF NOT EXISTS policies "
"(uid INT, policy INT, until INT, logging INT, "
"notification INT, PRIMARY KEY(uid));"
"INSERT INTO policies "
"SELECT uid, policy, until, logging, notification FROM policies_tmp;"
"DROP TABLE policies_tmp;"
"COMMIT;",
nullptr, nullptr, &err);
err_ret(err);
ver = 12;
upgrade = true;
}
if (upgrade) { if (upgrade) {
// Set version // Set version