More MagidkDB fixes

app/src/main/java/com/topjohnwu/magisk/data/database/base/MagiskQueryBuilder.kt

@@ -75,7 +75,11 @@ open class Insert : MagiskQueryBuilder {
 
     private val keys get() = _values.keys.joinToString(",")
     private val values get() = _values.values.joinToString(",") {
-        if (it is String) "\"$it\"" else it.toString()
+        when (it) {
+            is Boolean -> if (it) "1" else "0"
+            is Number -> it.toString()
+            else -> "\"$it\""
+        }
     }
     private var _values: Map<String, Any> = mapOf()
 

app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskLog.kt

@@ -38,7 +38,6 @@ fun Map<String, String>.toLog(): MagiskLog {
 
 fun Long.toDate() = Date(this)
 
-
 fun MagiskLog.toMap() = mapOf(
     "from_uid" to fromUid,
     "to_uid" to toUid,
@@ -47,8 +46,8 @@ fun MagiskLog.toMap() = mapOf(
     "app_name" to appName,
     "command" to command,
     "action" to action,
-    "time" to date
-).mapValues { it.toString() }
+    "time" to date.time
+)
 
 fun MagiskPolicy.toLog(
     toUid: Int,

app/src/main/java/com/topjohnwu/magisk/model/entity/MagiskPolicy.kt

@@ -24,42 +24,14 @@ data class MagiskPolicy(
 
 }
 
-/*@Throws(PackageManager.NameNotFoundException::class)
-fun ContentValues.toPolicy(pm: PackageManager): MagiskPolicy {
-    val uid = getAsInteger("uid")
-    val packageName = getAsString("package_name")
-    val info = pm.getApplicationInfo(packageName, 0)
-    if (info.uid != uid)
-        throw PackageManager.NameNotFoundException()
-    return MagiskPolicy(
-        uid = uid,
-        packageName = packageName,
-        policy = getAsInteger("policy"),
-        until = getAsInteger("until").toLong(),
-        logging = getAsInteger("logging") != 0,
-        notification = getAsInteger("notification") != 0,
-        applicationInfo = info,
-        appName = info.loadLabel(pm).toString()
-    )
-}
-fun MagiskPolicy.toContentValues() = ContentValues().apply {
-    put("uid", uid)
-    put("uid", uid)
-    put("package_name", packageName)
-    put("policy", policy)
-    put("until", until)
-    put("logging", if (logging) 1 else 0)
-    put("notification", if (notification) 1 else 0)
-}*/
-
 fun MagiskPolicy.toMap() = mapOf(
     "uid" to uid,
     "package_name" to packageName,
     "policy" to policy,
     "until" to until,
-    "logging" to if (logging) 1 else 0,
-    "notification" to if (notification) 1 else 0
-).mapValues { it.value.toString() }
+    "logging" to logging,
+    "notification" to notification
+)
 
 @Throws(PackageManager.NameNotFoundException::class)
 fun Map<String, String>.toPolicy(pm: PackageManager): MagiskPolicy {