Greenstand · S1210 · May 31, 2023
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,11 +44,11 @@ android {
         buildConfigField 'Boolean', 'BLUR_DETECTION_ENABLED', "false"
         buildConfigField 'Boolean', 'USE_AWS_S3', "false"
         buildConfigField 'Boolean', 'ORG_LINK', "false"
+        buildConfigField 'String', 'CRYPTO_KEY', "\"THE_BEST_APP_IN_THE_WORLD\""
 
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+        kapt {
+            arguments {
+                arg("room.schemaLocation", "$projectDir/schemas")
             }
         }
     }
@@ -228,9 +228,13 @@ dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
 
     //Database
-    implementation 'androidx.room:room-runtime:2.4.0-beta01'
-    implementation 'androidx.room:room-ktx:2.4.0-beta01'
-    kapt "androidx.room:room-compiler:2.4.0-beta01"
+    implementation 'androidx.room:room-runtime:2.4.0'
+    implementation 'androidx.room:room-ktx:2.4.0'
+    kapt "androidx.room:room-compiler:2.4.0"
+
+    // Sqlcipher
+    implementation "net.zetetic:android-database-sqlcipher:4.4.2"
+    implementation "androidx.sqlite:sqlite:2.1.0"
 
     devImplementation 'com.amitshekhar.android:debug-db:1.0.6'
 

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -51,3 +51,7 @@
 # The SDK has several references of Apache HTTP client
 -dontwarn com.amazonaws.http.**
 -dontwarn com.amazonaws.metrics.**
+
+# SQLCipher
+-keep,includedescriptorclasses class net.sqlcipher.** { *; }
+-keep,includedescriptorclasses interface net.sqlcipher.** { *; }
diff --git a/...d.TreeTracker.database.AppDatabase/1.json → ...eeTracker.database.app.AppDatabase/1.json b/...d.TreeTracker.database.AppDatabase/1.json → ...eeTracker.database.app.AppDatabase/1.json
diff --git a/...d.TreeTracker.database.AppDatabase/2.json → ...eeTracker.database.app.AppDatabase/2.json b/...d.TreeTracker.database.AppDatabase/2.json → ...eeTracker.database.app.AppDatabase/2.json
diff --git a/...d.TreeTracker.database.AppDatabase/3.json → ...eeTracker.database.app.AppDatabase/3.json b/...d.TreeTracker.database.AppDatabase/3.json → ...eeTracker.database.app.AppDatabase/3.json
diff --git a/...d.TreeTracker.database.AppDatabase/4.json → ...eeTracker.database.app.AppDatabase/4.json b/...d.TreeTracker.database.AppDatabase/4.json → ...eeTracker.database.app.AppDatabase/4.json
diff --git a/...d.TreeTracker.database.AppDatabase/6.json → ...eeTracker.database.app.AppDatabase/6.json b/...d.TreeTracker.database.AppDatabase/6.json → ...eeTracker.database.app.AppDatabase/6.json
diff --git a/...d.TreeTracker.database.AppDatabase/7.json → ...eeTracker.database.app.AppDatabase/7.json b/...d.TreeTracker.database.AppDatabase/7.json → ...eeTracker.database.app.AppDatabase/7.json
diff --git a/...d.TreeTracker.database.AppDatabase/8.json → ...eeTracker.database.app.AppDatabase/8.json b/...d.TreeTracker.database.AppDatabase/8.json → ...eeTracker.database.app.AppDatabase/8.json
diff --git a/...d.TreeTracker.database.AppDatabase/9.json → ...eeTracker.database.app.AppDatabase/9.json b/...d.TreeTracker.database.AppDatabase/9.json → ...eeTracker.database.app.AppDatabase/9.json
diff --git a/....messages.database.MessageDatabase/1.json → ....database.messages.MessageDatabase/1.json b/....messages.database.MessageDatabase/1.json → ....database.messages.MessageDatabase/1.json
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/dashboard/DashboardViewModel.kt b/app/src/main/java/org/greenstand/android/TreeTracker/dashboard/DashboardViewModel.kt
@@ -35,7 +35,7 @@ import kotlinx.coroutines.withContext
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.analytics.Analytics
 import org.greenstand.android.TreeTracker.background.TreeSyncWorker
-import org.greenstand.android.TreeTracker.database.TreeTrackerDAO
+import org.greenstand.android.TreeTracker.database.app.dao.TreeTrackerDAO
 import org.greenstand.android.TreeTracker.models.FeatureFlags
 import org.greenstand.android.TreeTracker.models.location.LocationDataCapturer
 import org.greenstand.android.TreeTracker.models.messages.MessagesRepo

diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/dashboard/TreesToSyncHelper.kt b/app/src/main/java/org/greenstand/android/TreeTracker/dashboard/TreesToSyncHelper.kt
@@ -15,7 +15,7 @@
  */
 package org.greenstand.android.TreeTracker.dashboard
 
-import org.greenstand.android.TreeTracker.database.TreeTrackerDAO
+import org.greenstand.android.TreeTracker.database.app.dao.TreeTrackerDAO
 import org.greenstand.android.TreeTracker.preferences.PrefKey
 import org.greenstand.android.TreeTracker.preferences.PrefKeys
 import org.greenstand.android.TreeTracker.preferences.Preferences

diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/database/AppDatabase.kt b/app/src/main/java/org/greenstand/android/TreeTracker/database/AppDatabase.kt
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/database/app/AppDatabase.kt b/app/src/main/java/org/greenstand/android/TreeTracker/database/app/AppDatabase.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.database.app
+
+import androidx.room.AutoMigration
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import org.greenstand.android.TreeTracker.database.app.dao.TreeTrackerDAO
+import org.greenstand.android.TreeTracker.database.app.entity.DeviceConfigEntity
+import org.greenstand.android.TreeTracker.database.app.entity.LocationEntity
+import org.greenstand.android.TreeTracker.database.app.entity.OrganizationEntity
+import org.greenstand.android.TreeTracker.database.app.entity.SessionEntity
+import org.greenstand.android.TreeTracker.database.app.entity.TreeEntity
+import org.greenstand.android.TreeTracker.database.app.entity.UserEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.entity.LocationDataEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.entity.PlanterCheckInEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.entity.PlanterInfoEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.entity.TreeAttributeEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.entity.TreeCaptureEntity
+
+@Database(
+    version = 9,
+    exportSchema = true,
+    entities = [
+        PlanterCheckInEntity::class,
+        PlanterInfoEntity::class,
+        TreeAttributeEntity::class,
+        TreeCaptureEntity::class,
+        LocationDataEntity::class,
+        SessionEntity::class,
+        UserEntity::class,
+        LocationEntity::class,
+        TreeEntity::class,
+        DeviceConfigEntity::class,
+        OrganizationEntity::class,
+    ],
+    autoMigrations = [
+        // 8 -> 9 for v2.2
+        AutoMigration(from = 8, to = 9)
+    ],
+)
+@TypeConverters(Converters::class)
+abstract class AppDatabase : RoomDatabase() {
+
+    abstract fun treeTrackerDao(): TreeTrackerDAO
+
+    companion object {
+
+        const val DB_NAME = "treetracker.v2.db"
+        const val DB_NAME_ENCRYPT = "treetracker.v2-encrypt.db"
+
+    }
+}
diff --git a/...ndroid/TreeTracker/database/Converters.kt → ...id/TreeTracker/database/app/Converters.kt b/...ndroid/TreeTracker/database/Converters.kt → ...id/TreeTracker/database/app/Converters.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database
+package org.greenstand.android.TreeTracker.database.app
 
 import androidx.room.TypeConverter
 import com.google.gson.Gson

diff --git a/...ndroid/TreeTracker/database/Migrations.kt → ...id/TreeTracker/database/app/Migrations.kt b/...ndroid/TreeTracker/database/Migrations.kt → ...id/TreeTracker/database/app/Migrations.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database
+package org.greenstand.android.TreeTracker.database.app
 
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import org.greenstand.android.TreeTracker.database.legacy.entity.PlanterInfoEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.entity.PlanterInfoEntity
 
 val MIGRATION_6_7 = object : Migration(6, 7) {
 

diff --git a/...id/TreeTracker/database/TreeTrackerDAO.kt → ...racker/database/app/dao/TreeTrackerDAO.kt b/...id/TreeTracker/database/TreeTrackerDAO.kt → ...racker/database/app/dao/TreeTrackerDAO.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database
+package org.greenstand.android.TreeTracker.database.app.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -23,17 +23,17 @@ import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Update
 import kotlinx.coroutines.flow.Flow
-import org.greenstand.android.TreeTracker.database.entity.DeviceConfigEntity
-import org.greenstand.android.TreeTracker.database.entity.LocationEntity
-import org.greenstand.android.TreeTracker.database.entity.OrganizationEntity
-import org.greenstand.android.TreeTracker.database.entity.SessionEntity
-import org.greenstand.android.TreeTracker.database.entity.TreeEntity
-import org.greenstand.android.TreeTracker.database.entity.UserEntity
-import org.greenstand.android.TreeTracker.database.legacy.entity.PlanterCheckInEntity
-import org.greenstand.android.TreeTracker.database.legacy.entity.PlanterInfoEntity
-import org.greenstand.android.TreeTracker.database.legacy.entity.TreeAttributeEntity
-import org.greenstand.android.TreeTracker.database.legacy.entity.TreeCaptureEntity
-import org.greenstand.android.TreeTracker.database.legacy.views.TreeMapMarkerDbView
+import org.greenstand.android.TreeTracker.database.app.entity.DeviceConfigEntity
+import org.greenstand.android.TreeTracker.database.app.entity.LocationEntity
+import org.greenstand.android.TreeTracker.database.app.entity.OrganizationEntity
+import org.greenstand.android.TreeTracker.database.app.entity.SessionEntity
+import org.greenstand.android.TreeTracker.database.app.entity.TreeEntity
+import org.greenstand.android.TreeTracker.database.app.entity.UserEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.entity.PlanterCheckInEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.entity.PlanterInfoEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.entity.TreeAttributeEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.entity.TreeCaptureEntity
+import org.greenstand.android.TreeTracker.database.app.legacy.views.TreeMapMarkerDbView
 
 @Dao
 interface TreeTrackerDAO {

diff --git a/...ker/database/entity/DeviceConfigEntity.kt → ...database/app/entity/DeviceConfigEntity.kt b/...ker/database/entity/DeviceConfigEntity.kt → ...database/app/entity/DeviceConfigEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.entity
+package org.greenstand.android.TreeTracker.database.app.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...Tracker/database/entity/LocationEntity.kt → ...ker/database/app/entity/LocationEntity.kt b/...Tracker/database/entity/LocationEntity.kt → ...ker/database/app/entity/LocationEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.entity
+package org.greenstand.android.TreeTracker.database.app.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...ker/database/entity/OrganizationEntity.kt → ...database/app/entity/OrganizationEntity.kt b/...ker/database/entity/OrganizationEntity.kt → ...database/app/entity/OrganizationEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.entity
+package org.greenstand.android.TreeTracker.database.app.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...eTracker/database/entity/SessionEntity.kt → ...cker/database/app/entity/SessionEntity.kt b/...eTracker/database/entity/SessionEntity.kt → ...cker/database/app/entity/SessionEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.entity
+package org.greenstand.android.TreeTracker.database.app.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...TreeTracker/database/entity/TreeEntity.kt → ...Tracker/database/app/entity/TreeEntity.kt b/...TreeTracker/database/entity/TreeEntity.kt → ...Tracker/database/app/entity/TreeEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.entity
+package org.greenstand.android.TreeTracker.database.app.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...TreeTracker/database/entity/UserEntity.kt → ...Tracker/database/app/entity/UserEntity.kt b/...TreeTracker/database/entity/UserEntity.kt → ...Tracker/database/app/entity/UserEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.entity
+package org.greenstand.android.TreeTracker.database.app.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...abase/legacy/entity/LocationDataEntity.kt → ...e/app/legacy/entity/LocationDataEntity.kt b/...abase/legacy/entity/LocationDataEntity.kt → ...e/app/legacy/entity/LocationDataEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.legacy.entity
+package org.greenstand.android.TreeTracker.database.app.legacy.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...ase/legacy/entity/PlanterCheckInEntity.kt → ...app/legacy/entity/PlanterCheckInEntity.kt b/...ase/legacy/entity/PlanterCheckInEntity.kt → ...app/legacy/entity/PlanterCheckInEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.legacy.entity
+package org.greenstand.android.TreeTracker.database.app.legacy.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...tabase/legacy/entity/PlanterInfoEntity.kt → ...se/app/legacy/entity/PlanterInfoEntity.kt b/...tabase/legacy/entity/PlanterInfoEntity.kt → ...se/app/legacy/entity/PlanterInfoEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.legacy.entity
+package org.greenstand.android.TreeTracker.database.app.legacy.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...base/legacy/entity/TreeAttributeEntity.kt → .../app/legacy/entity/TreeAttributeEntity.kt b/...base/legacy/entity/TreeAttributeEntity.kt → .../app/legacy/entity/TreeAttributeEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.legacy.entity
+package org.greenstand.android.TreeTracker.database.app.legacy.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...tabase/legacy/entity/TreeCaptureEntity.kt → ...se/app/legacy/entity/TreeCaptureEntity.kt b/...tabase/legacy/entity/TreeCaptureEntity.kt → ...se/app/legacy/entity/TreeCaptureEntity.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.legacy.entity
+package org.greenstand.android.TreeTracker.database.app.legacy.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

diff --git a/...abase/legacy/views/TreeMapMarkerDbView.kt → ...e/app/legacy/views/TreeMapMarkerDbView.kt b/...abase/legacy/views/TreeMapMarkerDbView.kt → ...e/app/legacy/views/TreeMapMarkerDbView.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.legacy.views
+package org.greenstand.android.TreeTracker.database.app.legacy.views
 
 class TreeMapMarkerDbView(
     val latitude: Double,

diff --git a/...database/legacy/views/TreeUploadDbView.kt → ...base/app/legacy/views/TreeUploadDbView.kt b/...database/legacy/views/TreeUploadDbView.kt → ...base/app/legacy/views/TreeUploadDbView.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.greenstand.android.TreeTracker.database.legacy.views
+package org.greenstand.android.TreeTracker.database.app.legacy.views
 
 // @DatabaseView("""
 //        SELECT