From 0a7929ad62139732832c1b76ad3269ad3ca19fb1 Mon Sep 17 00:00:00 2001 From: arm64v8a <48624112+arm64v8a@users.noreply.github.com> Date: Wed, 15 Mar 2023 14:19:25 +0900 Subject: [PATCH] cleanup --- .../1.json | 330 ------------------ .../1.json | 46 --- .../moe.matsuri.nb4a.TempDatabase/1.json | 46 --- buildScript/zipVersion/downloadZip.sh | 24 -- .../android/en-US/full_description.txt | 1 - .../android/en-US/short_description.txt | 1 - .../android/zh-CN/full_description.txt | 1 - .../android/zh-CN/short_description.txt | 1 - settings.gradle.kts | 2 +- 9 files changed, 1 insertion(+), 451 deletions(-) delete mode 100644 app/schemas/io.nekohasekai.sagernet.database.SagerDatabase/1.json delete mode 100644 app/schemas/io.nekohasekai.sagernet.database.preference.PublicDatabase/1.json delete mode 100644 app/schemas/moe.matsuri.nb4a.TempDatabase/1.json delete mode 100644 buildScript/zipVersion/downloadZip.sh delete mode 100644 fastlane/metadata/android/en-US/full_description.txt delete mode 100644 fastlane/metadata/android/en-US/short_description.txt delete mode 100644 fastlane/metadata/android/zh-CN/full_description.txt delete mode 100644 fastlane/metadata/android/zh-CN/short_description.txt diff --git a/app/schemas/io.nekohasekai.sagernet.database.SagerDatabase/1.json b/app/schemas/io.nekohasekai.sagernet.database.SagerDatabase/1.json deleted file mode 100644 index 5e9db91..0000000 --- a/app/schemas/io.nekohasekai.sagernet.database.SagerDatabase/1.json +++ /dev/null @@ -1,330 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 1, - "identityHash": "f66fd943df1d9e86d281a2e32c9fdd47", - "entities": [ - { - "tableName": "proxy_groups", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userOrder` INTEGER NOT NULL, `ungrouped` INTEGER NOT NULL, `name` TEXT, `type` INTEGER NOT NULL, `subscription` BLOB, `order` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "userOrder", - "columnName": "userOrder", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "ungrouped", - "columnName": "ungrouped", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "subscription", - "columnName": "subscription", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "order", - "columnName": "order", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [], - "foreignKeys": [] - }, - { - "tableName": "proxy_entities", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `groupId` INTEGER NOT NULL, `type` INTEGER NOT NULL, `userOrder` INTEGER NOT NULL, `tx` INTEGER NOT NULL, `rx` INTEGER NOT NULL, `status` INTEGER NOT NULL, `ping` INTEGER NOT NULL, `uuid` TEXT NOT NULL, `error` TEXT, `socksBean` BLOB, `httpBean` BLOB, `ssBean` BLOB, `vmessBean` BLOB, `trojanBean` BLOB, `trojanGoBean` BLOB, `naiveBean` BLOB, `hysteriaBean` BLOB, `tuicBean` BLOB, `sshBean` BLOB, `wgBean` BLOB, `chainBean` BLOB, `nekoBean` BLOB, `configBean` BLOB)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "groupId", - "columnName": "groupId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "userOrder", - "columnName": "userOrder", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "tx", - "columnName": "tx", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "rx", - "columnName": "rx", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "status", - "columnName": "status", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "ping", - "columnName": "ping", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "uuid", - "columnName": "uuid", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "error", - "columnName": "error", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "socksBean", - "columnName": "socksBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "httpBean", - "columnName": "httpBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "ssBean", - "columnName": "ssBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "vmessBean", - "columnName": "vmessBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "trojanBean", - "columnName": "trojanBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "trojanGoBean", - "columnName": "trojanGoBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "naiveBean", - "columnName": "naiveBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "hysteriaBean", - "columnName": "hysteriaBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "tuicBean", - "columnName": "tuicBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "sshBean", - "columnName": "sshBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "wgBean", - "columnName": "wgBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "chainBean", - "columnName": "chainBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "nekoBean", - "columnName": "nekoBean", - "affinity": "BLOB", - "notNull": false - }, - { - "fieldPath": "configBean", - "columnName": "configBean", - "affinity": "BLOB", - "notNull": false - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [ - { - "name": "groupId", - "unique": false, - "columnNames": [ - "groupId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `groupId` ON `${TABLE_NAME}` (`groupId`)" - } - ], - "foreignKeys": [] - }, - { - "tableName": "rules", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `userOrder` INTEGER NOT NULL, `enabled` INTEGER NOT NULL, `domains` TEXT NOT NULL, `ip` TEXT NOT NULL, `port` TEXT NOT NULL, `sourcePort` TEXT NOT NULL, `network` TEXT NOT NULL, `source` TEXT NOT NULL, `protocol` TEXT NOT NULL, `outbound` INTEGER NOT NULL, `packages` TEXT NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "userOrder", - "columnName": "userOrder", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "enabled", - "columnName": "enabled", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "domains", - "columnName": "domains", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "ip", - "columnName": "ip", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "port", - "columnName": "port", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "sourcePort", - "columnName": "sourcePort", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "network", - "columnName": "network", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "source", - "columnName": "source", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "protocol", - "columnName": "protocol", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "outbound", - "columnName": "outbound", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "packages", - "columnName": "packages", - "affinity": "TEXT", - "notNull": true - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f66fd943df1d9e86d281a2e32c9fdd47')" - ] - } -} \ No newline at end of file diff --git a/app/schemas/io.nekohasekai.sagernet.database.preference.PublicDatabase/1.json b/app/schemas/io.nekohasekai.sagernet.database.preference.PublicDatabase/1.json deleted file mode 100644 index 4986920..0000000 --- a/app/schemas/io.nekohasekai.sagernet.database.preference.PublicDatabase/1.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 1, - "identityHash": "f1aab1fb633378621635c344dbc8ac7b", - "entities": [ - { - "tableName": "KeyValuePair", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `valueType` INTEGER NOT NULL, `value` BLOB NOT NULL, PRIMARY KEY(`key`))", - "fields": [ - { - "fieldPath": "key", - "columnName": "key", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "valueType", - "columnName": "valueType", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "value", - "columnName": "value", - "affinity": "BLOB", - "notNull": true - } - ], - "primaryKey": { - "columnNames": [ - "key" - ], - "autoGenerate": false - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f1aab1fb633378621635c344dbc8ac7b')" - ] - } -} \ No newline at end of file diff --git a/app/schemas/moe.matsuri.nb4a.TempDatabase/1.json b/app/schemas/moe.matsuri.nb4a.TempDatabase/1.json deleted file mode 100644 index 4986920..0000000 --- a/app/schemas/moe.matsuri.nb4a.TempDatabase/1.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 1, - "identityHash": "f1aab1fb633378621635c344dbc8ac7b", - "entities": [ - { - "tableName": "KeyValuePair", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `valueType` INTEGER NOT NULL, `value` BLOB NOT NULL, PRIMARY KEY(`key`))", - "fields": [ - { - "fieldPath": "key", - "columnName": "key", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "valueType", - "columnName": "valueType", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "value", - "columnName": "value", - "affinity": "BLOB", - "notNull": true - } - ], - "primaryKey": { - "columnNames": [ - "key" - ], - "autoGenerate": false - }, - "indices": [], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f1aab1fb633378621635c344dbc8ac7b')" - ] - } -} \ No newline at end of file diff --git a/buildScript/zipVersion/downloadZip.sh b/buildScript/zipVersion/downloadZip.sh deleted file mode 100644 index 937265d..0000000 --- a/buildScript/zipVersion/downloadZip.sh +++ /dev/null @@ -1,24 +0,0 @@ -set -e - -# $1 is work dir -# $2 is name list file -# $3 is download URL list file - -NAMELIST=$(realpath $2) -URLLIST=$(realpath $3) - -cd $1 - -count=`wc -l $NAMELIST|cut -d " " -f 1` - -# download all -for ((i=1; i<=$(($count)); i++)) -do - name=$(sed -n $i'p' $NAMELIST) - url=$(sed -n $i'p' $URLLIST) - - curl -L -o "$name".zip "$url" > /dev/null 2>&1 - unzip "$name".zip > /dev/null 2>&1 - rm "$name".zip - mv "$name"-* "$name" -done diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt deleted file mode 100644 index 2adcbda..0000000 --- a/fastlane/metadata/android/en-US/full_description.txt +++ /dev/null @@ -1 +0,0 @@ -A proxy toolchain for Android, written in Kotlin. This is a fork of SagerNet with different features and improved experience in some situations. \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt deleted file mode 100644 index b689352..0000000 --- a/fastlane/metadata/android/en-US/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -Proxy toolchain for Android \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt deleted file mode 100644 index 502739e..0000000 --- a/fastlane/metadata/android/zh-CN/full_description.txt +++ /dev/null @@ -1 +0,0 @@ -适用于 Android 的代理工具链，用 Kotlin 编写。这是 SagerNet 的一个分支，部分功能不同，改进了部分情况下的体验。 \ No newline at end of file diff --git a/fastlane/metadata/android/zh-CN/short_description.txt b/fastlane/metadata/android/zh-CN/short_description.txt deleted file mode 100644 index db19d64..0000000 --- a/fastlane/metadata/android/zh-CN/short_description.txt +++ /dev/null @@ -1 +0,0 @@ -适用于 Android 的代理工具链 \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index ce2d295..b40289e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,4 +2,4 @@ include(":external:preferencex:preferencex") include(":external:preferencex:preferencex-simplemenu") include(":app") -rootProject.name = "Matsuri" \ No newline at end of file +rootProject.name = "NB4A"