Mercury-IM/Mercury-IM
Mercury-IM/Mercury-IM
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Mercury-IM synced 2024-06-18 09:34:52 +02:00
Code Issues Projects Releases Wiki Activity

Small changes

Browse source
This commit is contained in:
Paul Schaub 2019-09-13 01:22:54 +02:00
parent 6ecfdb0c79
commit 3b996ef745
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
.idea/gradle.xml
View file

@ -49,9 +49,39 @@
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/core" />
<option value="$PROJECT_DIR$/libs/Smack" />
<option value="$PROJECT_DIR$/libs/Smack/smack-android" />
<option value="$PROJECT_DIR$/libs/Smack/smack-android-extensions" />
<option value="$PROJECT_DIR$/libs/Smack/smack-bosh" />
<option value="$PROJECT_DIR$/libs/Smack/smack-compression-jzlib" />
<option value="$PROJECT_DIR$/libs/Smack/smack-core" />
<option value="$PROJECT_DIR$/libs/Smack/smack-debug" />
<option value="$PROJECT_DIR$/libs/Smack/smack-debug-slf4j" />
<option value="$PROJECT_DIR$/libs/Smack/smack-experimental" />
<option value="$PROJECT_DIR$/libs/Smack/smack-extensions" />
<option value="$PROJECT_DIR$/libs/Smack/smack-im" />
<option value="$PROJECT_DIR$/libs/Smack/smack-integration-test" />
<option value="$PROJECT_DIR$/libs/Smack/smack-java7" />
<option value="$PROJECT_DIR$/libs/Smack/smack-jingle-old" />
<option value="$PROJECT_DIR$/libs/Smack/smack-legacy" />
<option value="$PROJECT_DIR$/libs/Smack/smack-omemo" />
<option value="$PROJECT_DIR$/libs/Smack/smack-omemo-signal" />
<option value="$PROJECT_DIR$/libs/Smack/smack-omemo-signal-integration-test" />
<option value="$PROJECT_DIR$/libs/Smack/smack-openpgp" />
<option value="$PROJECT_DIR$/libs/Smack/smack-repl" />
<option value="$PROJECT_DIR$/libs/Smack/smack-resolver-dnsjava" />
<option value="$PROJECT_DIR$/libs/Smack/smack-resolver-javax" />
<option value="$PROJECT_DIR$/libs/Smack/smack-resolver-minidns" />
<option value="$PROJECT_DIR$/libs/Smack/smack-resolver-minidns-dox" />
<option value="$PROJECT_DIR$/libs/Smack/smack-sasl-javax" />
<option value="$PROJECT_DIR$/libs/Smack/smack-sasl-provided" />
<option value="$PROJECT_DIR$/libs/Smack/smack-tcp" />
<option value="$PROJECT_DIR$/libs/Smack/smack-xmlparser" />
<option value="$PROJECT_DIR$/libs/Smack/smack-xmlparser-stax" />
<option value="$PROJECT_DIR$/libs/Smack/smack-xmlparser-xpp3" />
<option value="$PROJECT_DIR$/persistence" />
<option value="$PROJECT_DIR$/persistence-room" />
<option value="$PROJECT_DIR$/xmpp_core" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />

10
persistence-room/schemas/org.mercury_im.messenger.persistence.room.AppDatabase/1.json
View file

@ -2,7 +2,7 @@
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "3101152b94f78344b348b040386bb144",
"identityHash": "6322b5b46e09460ae6f30134786c9221",
"entities": [
{
"tableName": "accounts",
@ -121,7 +121,7 @@
},
{
"tableName": "contacts",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`pk_contact_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fk_entity_id` INTEGER NOT NULL, `rostername` TEXT, `direction` TEXT, `sub_pending` INTEGER NOT NULL, `approved` INTEGER NOT NULL, FOREIGN KEY(`fk_entity_id`) REFERENCES `entities`(`pk_entity_id`) ON UPDATE NO ACTION ON DELETE RESTRICT )",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`pk_contact_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `fk_entity_id` INTEGER NOT NULL, `rostername` TEXT, `sub_direction` TEXT, `sub_pending` INTEGER NOT NULL, `sub_approved` INTEGER NOT NULL, FOREIGN KEY(`fk_entity_id`) REFERENCES `entities`(`pk_entity_id`) ON UPDATE NO ACTION ON DELETE RESTRICT )",
"fields": [
{
"fieldPath": "id",
@ -143,7 +143,7 @@
},
{
"fieldPath": "direction",
"columnName": "direction",
"columnName": "sub_direction",
"affinity": "TEXT",
"notNull": false
},
@ -155,7 +155,7 @@
},
{
"fieldPath": "approved",
"columnName": "approved",
"columnName": "sub_approved",
"affinity": "INTEGER",
"notNull": true
}
@ -512,7 +512,7 @@
"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, '3101152b94f78344b348b040386bb144')"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6322b5b46e09460ae6f30134786c9221')"
]
}
}