Skip to content

Commit

Permalink
Merge pull request #197 from LivingWithHippos/dev
Browse files Browse the repository at this point in the history
Merge dev with master -> 4.33.10-beta
  • Loading branch information
LivingWithHippos authored Apr 15, 2022
2 parents a13115b + a87ae93 commit a7a7d4f
Show file tree
Hide file tree
Showing 48 changed files with 2,204 additions and 596 deletions.
2 changes: 1 addition & 1 deletion app/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ android {
minSdk 22
targetSdk 31
versionCode 28
versionName "4.27.5-beta"
versionName "4.33.10-beta"
// limit resources for a list of locales
// resConfigs "en", "it"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"formatVersion": 1,
"database": {
"version": 5,
"identityHash": "a9eb4b16072a8d3f777035518f34c789",
"entities": [
{
"tableName": "host_regex",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`regex` TEXT NOT NULL, `type` INTEGER NOT NULL, PRIMARY KEY(`regex`))",
"fields": [
{
"fieldPath": "regex",
"columnName": "regex",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"regex"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "kodi_device",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `ip` TEXT NOT NULL, `port` INTEGER NOT NULL, `username` TEXT, `password` TEXT, `is_default` INTEGER NOT NULL, PRIMARY KEY(`name`))",
"fields": [
{
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "ip",
"columnName": "ip",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "port",
"columnName": "port",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "username",
"columnName": "username",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "password",
"columnName": "password",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "isDefault",
"columnName": "is_default",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"name"
],
"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, 'a9eb4b16072a8d3f777035518f34c789')"
]
}
}
Loading

0 comments on commit a7a7d4f

Please sign in to comment.