Merge remote-tracking branch 'origin/release/1.5' into release/1.5

TUM-Dev · Apr 5, 2018 · 3b67637 · 3b67637
2 parents b9ec29f + ed9c115
commit 3b67637
Show file tree

Hide file tree

Showing 55 changed files with 1,525 additions and 827 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,6 +5,7 @@ plugins {
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'io.fabric'
 apply from: '../findbugs.gradle'
 apply from: '../pmd.gradle'
 apply from: '../jacoco.gradle'
@@ -71,7 +72,7 @@ android {
 
 def androidSupportVersion = '27.1.0'
 def retrofitVersion = '2.3.0'
-def firebaseVersion = '12.0.0'
+def firebaseVersion = '12.0.1'
 def roomVersion = '1.0.0'
 
 configurations.all {
@@ -120,6 +121,7 @@ dependencies {
     annotationProcessor "android.arch.persistence.room:compiler:$roomVersion"
     implementation "com.google.android.gms:play-services-location:$firebaseVersion"
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.1'
 
     //DB Debugging: adb forward tcp:8080 tcp:8080 - look for DebugDB in logcat
     debugImplementation 'com.amitshekhar.android:debug-db:1.0.3'

diff --git a/app/schemas/de.tum.in.tumcampusapp.database.TcaDb/6.json b/app/schemas/de.tum.in.tumcampusapp.database.TcaDb/6.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 6,
-    "identityHash": "79480a1b912d08c5b86181728be135c1",
+    "identityHash": "d787f26c3fa1a02011b0487146cae485",
     "entities": [
       {
         "tableName": "Cafeteria",
@@ -356,7 +356,7 @@
       },
       {
         "tableName": "chat_message",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER NOT NULL, `previous` INTEGER NOT NULL, `room` INTEGER NOT NULL, `text` TEXT, `timestamp` TEXT, `signature` TEXT, `member` TEXT, `read` INTEGER NOT NULL, `sending` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` INTEGER NOT NULL, `previous` INTEGER NOT NULL, `room` INTEGER NOT NULL, `text` TEXT, `timestamp` TEXT, `signature` TEXT, `member` TEXT, `sending` INTEGER NOT NULL, PRIMARY KEY(`_id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -400,12 +400,6 @@
             "affinity": "TEXT",
             "notNull": false
           },
-          {
-            "fieldPath": "read",
-            "columnName": "read",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
           {
             "fieldPath": "sendingStatus",
             "columnName": "sending",
@@ -1032,7 +1026,7 @@
       },
       {
         "tableName": "chat_room",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`room` INTEGER NOT NULL, `name` TEXT NOT NULL, `semester` TEXT NOT NULL, `semester_id` TEXT NOT NULL, `joined` INTEGER NOT NULL, `_id` INTEGER NOT NULL, `contributor` TEXT NOT NULL, `members` INTEGER NOT NULL, PRIMARY KEY(`name`, `_id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`room` INTEGER NOT NULL, `name` TEXT NOT NULL, `semester` TEXT NOT NULL, `semester_id` TEXT NOT NULL, `joined` INTEGER NOT NULL, `_id` INTEGER NOT NULL, `contributor` TEXT NOT NULL, `members` INTEGER NOT NULL, `last_read` INTEGER NOT NULL, PRIMARY KEY(`name`, `_id`))",
         "fields": [
           {
             "fieldPath": "room",
@@ -1081,6 +1075,12 @@
             "columnName": "members",
             "affinity": "INTEGER",
             "notNull": true
+          },
+          {
+            "fieldPath": "lastRead",
+            "columnName": "last_read",
+            "affinity": "INTEGER",
+            "notNull": true
           }
         ],
         "primaryKey": {
@@ -1096,7 +1096,7 @@
     ],
     "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, \"79480a1b912d08c5b86181728be135c1\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"d787f26c3fa1a02011b0487146cae485\")"
     ]
   }
 }