Merge pull request #5466 from simpledotorg/master

Author: tramline-github[bot]

CHANGELOG.md

@@ -17,6 +17,10 @@
 - Migrate assigned facility view to Jetpack Compose
 - Migrate next appointment view to Jetpack Compose
 - Migrate patient status view to Jetpack Compose
+- Migrate clinical decision support alert to Jetpack Compose
+- Bump sqlite-android version to 3.49.0
+- Replace `android-database-sqlcipher` library with `sqlcipher-android`
+- Replace Flipper with Chucker for network inspection
 
 ## 2025.05.20
 

README.md

@@ -163,22 +163,6 @@ There are currently 2 ways to build an app pointing to different environments:
 Simple Server is in a separate repository, and you should follow
 the [instructions there](https://github.com/simpledotorg/simple-server/blob/master/README.md).
 
-## Execute SQL Queries
-
-You can use [Flipper](https://fbflipper.com/) to run SQL queries on Simple:
-
-1. Install Flipper using brew or download from their [website](https://fbflipper.com/).
-
-```sh 
-brew install Flipper
-```
-
-2. Launch Flipper (you might have to allow Flipper to launch from System Preferences > Security > General as it’s from an unknown developer to Apple).
-3. Run the Simple app in an emulator or your physical device(as Flipper loads the data from your device's local database).
-4. In the Plugins section in the sidebar menu click on Disabled and enable the Database plugin.
-5. Click on Databases, select `red-db` and choose whichever table’s data you want to inspect.
-6. Click on SQL at the top to execute SQL queries.
-
 ## Resources
 
 Check out the following documents for more information.

app/build.gradle.kts

@@ -285,9 +285,8 @@ dependencies {
    * Debug dependencies
    */
   debugImplementation(libs.faker)
-  debugImplementation(libs.bundles.flipper)
   debugImplementation(libs.leakcanary)
-  debugImplementation(libs.soloader)
+  debugImplementation(libs.chucker)
 
   /**
    * Prod dependencies
@@ -476,6 +475,8 @@ dependencies {
   runtimeOnly(libs.jackson.core)
 
   androidTestImplementation(libs.apache.commons.math)
+
+  releaseImplementation(libs.chucker.no.op)
 }
 
 tasks.withType<Test> {

app/src/androidTest/java/org/simple/clinic/storage/DatabaseEncryptorTest.kt

@@ -4,13 +4,14 @@ import android.app.Application
 import androidx.room.Room
 import com.google.common.truth.Truth.assertThat
 import com.squareup.moshi.Moshi
-import net.sqlcipher.database.SupportFactory
+import net.zetetic.database.sqlcipher.SupportOpenHelperFactory
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.simple.clinic.AppDatabase
 import org.simple.clinic.FakeMinimumMemoryChecker
 import org.simple.clinic.TestClinicApp
+import org.simple.clinic.TestData
 import org.simple.clinic.questionnaire.component.BaseComponentData
 import org.simple.clinic.storage.DatabaseEncryptor.State.DOES_NOT_EXIST
 import org.simple.clinic.storage.DatabaseEncryptor.State.ENCRYPTED
@@ -19,7 +20,6 @@ import org.simple.clinic.storage.DatabaseEncryptor.State.UNENCRYPTED
 import org.simple.clinic.user.User
 import org.simple.clinic.user.UserStatus
 import org.simple.clinic.util.MinimumMemoryChecker
-import org.simple.clinic.TestData
 import java.time.Instant
 import java.util.UUID
 import javax.inject.Inject
@@ -94,7 +94,7 @@ class DatabaseEncryptorTest {
     val encryptedDatabase = Room.databaseBuilder(appContext, AppDatabase::class.java, DB_NAME)
         .allowMainThreadQueries()
         .addTypeConverter(BaseComponentData.RoomTypeConverter(moshi))
-        .openHelperFactory(SupportFactory(passphrase, null, false))
+        .openHelperFactory(SupportOpenHelperFactory(passphrase))
         .build()
 
     val encryptedUser = encryptedDatabase.userDao().userImmediate()
@@ -104,7 +104,7 @@ class DatabaseEncryptorTest {
   }
 
   @Test
-  fun if_device_doesnt_have_min_req_memory_then_skip_database_encryption() {
+  fun if_device_does_not_have_min_req_memory_then_skip_database_encryption() {
     // given
     (minimumMemoryChecker as FakeMinimumMemoryChecker).hasMinMemory = false
 
@@ -114,4 +114,49 @@ class DatabaseEncryptorTest {
     // then
     assertThat(databaseEncryptor.databaseState(DB_NAME)).isEqualTo(SKIPPED)
   }
+
+  @Test
+  fun when_database_is_already_encrypted_it_should_do_nothing() {
+    // given
+    val passphrase = databaseEncryptor.passphrase
+    val encryptedDatabase = Room.databaseBuilder(appContext, AppDatabase::class.java, DB_NAME)
+        .allowMainThreadQueries()
+        .addTypeConverter(BaseComponentData.RoomTypeConverter(moshi))
+        .openHelperFactory(SupportOpenHelperFactory(passphrase))
+        .build()
+
+    val expectedUser = TestData.loggedInUser(uuid = UUID.randomUUID())
+    encryptedDatabase.userDao().createOrUpdate(expectedUser)
+    encryptedDatabase.close()
+
+    assertThat(databaseEncryptor.databaseState(DB_NAME)).isEqualTo(ENCRYPTED)
+
+    // when
+    databaseEncryptor.execute(databaseName = DB_NAME)
+
+    // then
+    assertThat(databaseEncryptor.databaseState(DB_NAME)).isEqualTo(ENCRYPTED)
+
+    val reOpenedEncryptedDb = Room.databaseBuilder(appContext, AppDatabase::class.java, DB_NAME)
+        .allowMainThreadQueries()
+        .addTypeConverter(BaseComponentData.RoomTypeConverter(moshi))
+        .openHelperFactory(SupportOpenHelperFactory(passphrase))
+        .build()
+
+    val actualUser = reOpenedEncryptedDb.userDao().userImmediate()
+    assertThat(actualUser).isEqualTo(expectedUser)
+    reOpenedEncryptedDb.close()
+  }
+
+  @Test
+  fun when_database_does_not_exist_it_should_do_nothing() {
+    // given
+    assertThat(databaseEncryptor.databaseState(DB_NAME)).isEqualTo(DOES_NOT_EXIST)
+
+    // when
+    databaseEncryptor.execute(databaseName = DB_NAME)
+
+    // then
+    assertThat(databaseEncryptor.databaseState(DB_NAME)).isEqualTo(DOES_NOT_EXIST)
+  }
 }

app/src/debug/AndroidManifest.xml

@@ -23,10 +23,6 @@
       android:name=".playground.AwaitActivity"
       android:exported="true" />
 
-    <activity
-      android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
-      android:exported="true" />
-
     <activity
       android:name=".WebviewTestActivity"
       android:enabled="false"

app/src/debug/java/org/simple/clinic/DebugClinicApp.kt

@@ -3,13 +3,6 @@ package org.simple.clinic
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.os.StrictMode
-import com.facebook.flipper.android.AndroidFlipperClient
-import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin
-import com.facebook.flipper.plugins.inspector.DescriptorMapping
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
-import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
-import com.facebook.soloader.SoLoader
 import hu.akarnokd.rxjava3.debug.RxJavaAssemblyTracking
 import io.github.inflationx.viewpump.ViewPump
 import org.simple.clinic.activity.SimpleActivityLifecycleCallbacks
@@ -21,19 +14,10 @@ import org.simple.clinic.main.TheActivity
 import org.simple.clinic.util.AppSignature
 import org.simple.clinic.widgets.ProxySystemKeyboardEnterToImeOption
 import timber.log.Timber
-import javax.inject.Inject
 
 @SuppressLint("Registered")
 class DebugClinicApp : ClinicApp() {
 
-  /*
-  We are injecting this because we need to share the same instance with the OkHttp interceptor.
-
-  See debug/HttpInterceptorsModule for more info.
-  */
-  @Inject
-  lateinit var networkFlipperPlugin: NetworkFlipperPlugin
-
   private lateinit var signature: AppSignature
 
   companion object {
@@ -46,12 +30,9 @@ class DebugClinicApp : ClinicApp() {
     addStrictModeChecks()
     RxJavaAssemblyTracking.enable()
     super.onCreate()
-    SoLoader.init(this, false)
 
     appComponent().inject(this)
 
-    setupFlipper()
-
     Timber.plant(Timber.DebugTree())
     showDebugNotification()
 
@@ -62,22 +43,6 @@ class DebugClinicApp : ClinicApp() {
     signature = AppSignature(this)
   }
 
-  private fun setupFlipper() {
-    val context = this
-
-    with(AndroidFlipperClient.getInstance(this)) {
-      addPlugin(InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()))
-      addPlugin(networkFlipperPlugin)
-
-      val databasePlugin = DatabasesFlipperPlugin(ReadOnlySqliteDatabaseDriver(context))
-      addPlugin(databasePlugin)
-
-      addPlugin(SharedPreferencesFlipperPlugin(context, "${context.packageName}_preferences"))
-
-      start()
-    }
-  }
-
   private fun showDebugNotification() {
     registerActivityLifecycleCallbacks(object : SimpleActivityLifecycleCallbacks() {
       override fun onActivityStarted(activity: Activity) {

app/src/debug/java/org/simple/clinic/ReadOnlySqliteDatabaseDriver.kt

@@ -1,7 +1,7 @@
 package org.simple.clinic.di.network
 
-import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor
-import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
+import android.app.Application
+import com.chuckerteam.chucker.api.ChuckerInterceptor
 import dagger.Module
 import dagger.Provides
 import io.sentry.okhttp.SentryOkHttpInterceptor
@@ -13,12 +13,17 @@ import org.simple.clinic.user.LoggedInUserHttpInterceptor
 @Module
 class HttpInterceptorsModule {
 
+  @Provides
+  fun chuckerInterceptor(context: Application): ChuckerInterceptor {
+    return ChuckerInterceptor(context)
+  }
+
   @Provides
   fun providerInterceptors(
       loggedInInterceptor: LoggedInUserHttpInterceptor,
       appInfoHttpInterceptor: AppInfoHttpInterceptor,
-      networkPlugin: NetworkFlipperPlugin,
-      compressRequestInterceptor: CompressRequestInterceptor
+      compressRequestInterceptor: CompressRequestInterceptor,
+      chuckerInterceptor: ChuckerInterceptor,
   ): List<Interceptor> {
     val loggingInterceptor = HttpLoggingInterceptor().apply {
       level = BODY
@@ -29,8 +34,8 @@ class HttpInterceptorsModule {
         loggedInInterceptor,
         appInfoHttpInterceptor,
         loggingInterceptor,
-        FlipperOkhttpInterceptor(networkPlugin),
-        compressRequestInterceptor
+        compressRequestInterceptor,
+        chuckerInterceptor,
     )
   }
 }

app/src/debug/java/org/simple/clinic/di/FlipperModule.kt

@@ -86,7 +86,6 @@ import javax.inject.Named
   HttpInterceptorsModule::class,
   RetrofitModule::class,
   ClearPatientDataModule::class,
-  FlipperModule::class,
   PinVerificationModule::class,
   SessionModule::class,
   UuidGeneratorModule::class,