Fix F2FS crashes on SQLite 3.21.0

src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java

@@ -7,6 +7,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Build;
 import android.os.Process;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.widget.Toast;
 
@@ -17,6 +18,7 @@ import com.topjohnwu.magisk.container.SuLogEntry;
 import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.io.SuFile;
 
 import java.io.File;
 import java.text.DateFormat;
@@ -37,6 +39,7 @@ public class SuDatabaseHelper {
     private SQLiteDatabase mDb;
     private File DB_FILE;
 
+    @NonNull
     public static SuDatabaseHelper getInstance(MagiskManager mm) {
         try {
             return new SuDatabaseHelper(mm);
@@ -61,7 +64,7 @@ public class SuDatabaseHelper {
     }
 
     private SQLiteDatabase openDatabase(MagiskManager mm) {
-        String GLOBAL_DB = "/data/adb/magisk.db";
+        final SuFile GLOBAL_DB = new SuFile("/data/adb/magisk.db", true);
         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
                 ? mm.createDeviceProtectedStorageContext() : mm;
@@ -89,16 +92,23 @@ public class SuDatabaseHelper {
                 mm.deleteDatabase("su.db");
                 de.deleteDatabase("su.db");
                 if (mm.magiskVersionCode < 1460) {
-                    // v14.5 global DB location
+                    // Link to new path
-                    GLOBAL_DB = new File(de.getFilesDir().getParentFile().getParentFile(),
+                    File oldDB = new File(de.getFilesDir().getParentFile().getParentFile(),
-                            "magisk.db").getPath();
+                            "magisk.db");
+                    Shell.Sync.su(Utils.fmt("mv -f %s %s; ln -s %s %s",
+                            oldDB, GLOBAL_DB, GLOBAL_DB, oldDB));
                 }
                 if (mm.magiskVersionCode < 1550) {
                     // We need some additional policies on old versions
                     Shell.Sync.su("magiskpolicy --live " +
                             "'create su_file' 'allow * su_file file *' 'allow * su_file dir *'");
                 }
-                Shell.Sync.su("sudb_setup " + Process.myUid() + " " + GLOBAL_DB);
+                if (!GLOBAL_DB.exists()) {
+                    Shell.Sync.su("sudb_init");
+                    SQLiteDatabase.openOrCreateDatabase(GLOBAL_DB, null).close();
+                    Shell.Sync.su("sudb_restore");
+                }
+                Shell.Sync.su("sudb_setup " + Process.myUid());
             }
         }
         // Not using legacy mode, open the mounted global DB
@@ -106,7 +116,6 @@ public class SuDatabaseHelper {
     }
 
     public void onUpgrade(SQLiteDatabase db, int oldVersion) {
-        try {
         if (oldVersion == 0) {
             createTables(db);
             oldVersion = 3;
@@ -139,10 +148,6 @@ public class SuDatabaseHelper {
             db.execSQL(Utils.fmt("UPDATE %s SET uid=uid%%100000", POLICY_TABLE));
             ++oldVersion;
         }
-        } catch (Exception e) {
-            e.printStackTrace();
-            onDowngrade(db);
-        }
     }
 
     // Remove everything, we do not support downgrade

src/main/java/com/topjohnwu/magisk/utils/Utils.java

@@ -27,7 +27,6 @@ import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.SplashActivity;
 import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
 import com.topjohnwu.magisk.receivers.DownloadReceiver;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ShellUtils;

src/main/res/raw/sudb.sh

@@ -3,17 +3,28 @@ sudb_clean() {
   local DIR="/sbin/.core/db-${USERID}"
   umount -l /data/user*/*/*/databases/su.db $DIR $DIR/*
   rm -rf $DIR
+  [ "$USERID" = "*" ] && rm -f /data/adb/magisk.db
+}
+
+sudb_init() {
+  ADB_CONTEXT=`/system/bin/ls -dZ /data/adb | awk '{print $1}'`
+  chcon u:object_r:su_file:s0 /data/adb
+  chmod 777 /data/adb
+}
+
+sudb_restore() {
+  chcon $ADB_CONTEXT /data/adb
+  chmod 700 /data/adb
 }
 
 sudb_setup() {
   local USER=$1
-  local GLOBAL_DB=$2
   local USERID=$(($USER / 100000))
   local DIR=/sbin/.core/db-${USERID}
-  touch $GLOBAL_DB
   mkdir -p $DIR
   touch $DIR/magisk.db
-  mount -o bind $GLOBAL_DB $DIR/magisk.db
+  mount -o bind /data/adb/magisk.db $DIR/magisk.db
+  rm -f /data/adb/magisk.db-journal
   chcon u:object_r:su_file:s0 $DIR $DIR/*
   chmod 700 $DIR
   chown $USER.$USER $DIR