Performance improvements 🚀

app/build.gradle.kts

@@ -35,15 +35,28 @@ android {
 
     buildTypes {
         debug {
+            isDebuggable = true
             enableUnitTestCoverage = true
             enableAndroidTestCoverage = true
+            // versionNameSuffix = "-release" // Optional: Adds a suffix to the version name for differentiation
+            buildConfigField("Boolean", "IS_DEVELOPER_MODE_ENABLED", "true")
+        }
+        create("benchmark") {
+            initWith(buildTypes.getByName("release"))
+            signingConfig = signingConfigs.getByName("debug")
+            matchingFallbacks += listOf("release")
         }
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            // Configures the signing with the debug key for now so that we can run the release build
+            signingConfig = signingConfigs.getByName("debug")
+            isDebuggable = false // Disables debugging for security reasons
+            isShrinkResources = true // Further reduces the size of the APK by removing unused resources
+            buildConfigField("Boolean", "IS_DEVELOPER_MODE_ENABLED", "false")
         }
     }
 

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
+        android:name=".TangaApp"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -11,8 +12,11 @@
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/Theme.SplashScreenTheme"
-        android:name=".TangaApp"
         tools:targetApi="31">
+        <profileable
+            android:shell="true"
+            tools:targetApi="29" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -26,23 +30,28 @@
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
-        </activity>
-
-    <!-- Required: set your sentry.io project identifier (DSN) -->
-    <meta-data android:name="io.sentry.dsn" android:value="https://d3da1b415af3e6a3482e2c7fee0740a0@o4506014737104896.ingest.sentry.io/4506014893342720" />
-
-    <!-- enable automatic breadcrumbs for user interactions (clicks, swipes, scrolls) -->
-    <meta-data android:name="io.sentry.traces.user-interaction.enable" android:value="true" />
-    <meta-data android:name="io.sentry.breadcrumbs.user-interaction" android:value="true" />
-    <!-- enable screenshot for crashes (could contain sensitive/PII data) -->
-    <meta-data android:name="io.sentry.attach-screenshot" android:value="true" />
-    <!-- enable view hierarchy for crashes -->
-    <meta-data android:name="io.sentry.attach-view-hierarchy" android:value="true" />
-
-    <!-- enable the performance API by setting a sample-rate, adjust in production env -->
-    <meta-data android:name="io.sentry.traces.sample-rate" android:value="1.0" />
-    <!-- enable profiling when starting transactions, adjust in production env -->
-    <meta-data android:name="io.sentry.traces.profiling.sample-rate" android:value="1.0" />
-</application>
+        </activity> <!-- Required: set your sentry.io project identifier (DSN) -->
+        <meta-data
+            android:name="io.sentry.dsn"
+            android:value="https://d3da1b415af3e6a3482e2c7fee0740a0@o4506014737104896.ingest.sentry.io/4506014893342720" /> <!-- enable automatic breadcrumbs for user interactions (clicks, swipes, scrolls) -->
+        <meta-data
+            android:name="io.sentry.traces.user-interaction.enable"
+            android:value="true" />
+        <meta-data
+            android:name="io.sentry.breadcrumbs.user-interaction"
+            android:value="true" /> <!-- enable screenshot for crashes (could contain sensitive/PII data) -->
+        <meta-data
+            android:name="io.sentry.attach-screenshot"
+            android:value="true" /> <!-- enable view hierarchy for crashes -->
+        <meta-data
+            android:name="io.sentry.attach-view-hierarchy"
+            android:value="true" /> <!-- enable the performance API by setting a sample-rate, adjust in production env -->
+        <meta-data
+            android:name="io.sentry.traces.sample-rate"
+            android:value="1.0" /> <!-- enable profiling when starting transactions, adjust in production env -->
+        <meta-data
+            android:name="io.sentry.traces.profiling.sample-rate"
+            android:value="1.0" />
+    </application>
 
 </manifest>

app/src/main/java/app/books/tanga/TangaApp.kt

@@ -1,6 +1,7 @@
 package app.books.tanga
 
 import android.app.Application
+import android.os.StrictMode
 import app.books.tanga.di.TimberTrees
 import app.books.tanga.di.plantAll
 import app.books.tanga.errors.TangaErrorTracker
@@ -22,5 +23,30 @@ class TangaApp : Application() {
 
         // Initialize the error tracker
         errorTracker.init()
+
+        configureStrictMode()
+    }
+
+    private fun configureStrictMode() {
+        if (BuildConfig.DEBUG) {
+            StrictMode.setThreadPolicy(
+                StrictMode.ThreadPolicy.Builder()
+                    .detectDiskReads()
+                    .detectDiskWrites()
+                    .detectNetwork()
+                    .penaltyLog()
+                    .penaltyFlashScreen()
+                    .build()
+            )
+
+            StrictMode.setVmPolicy(
+                StrictMode.VmPolicy.Builder()
+                    .detectLeakedSqlLiteObjects()
+                    .detectLeakedClosableObjects()
+                    .detectActivityLeaks()
+                    .penaltyLog()
+                    .build()
+            )
+        }
     }
 }

app/src/main/java/app/books/tanga/common/urls/DownloadUrlGenerator.kt

@@ -1,5 +1,6 @@
 package app.books.tanga.common.urls
 
+import app.books.tanga.di.IoDispatcher
 import app.books.tanga.entity.SummaryId
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.storage.FirebaseStorage
@@ -11,7 +12,10 @@ import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.tasks.await
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 /**
@@ -35,7 +39,8 @@ interface DownloadUrlGenerator {
  * using Firebase Storage.
  */
 class StorageDownloadUrlGenerator @Inject constructor(
-    private val storage: FirebaseStorage
+    private val storage: FirebaseStorage,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
 ) : DownloadUrlGenerator {
 
     /**
@@ -44,10 +49,12 @@ class StorageDownloadUrlGenerator @Inject constructor(
      */
     override suspend fun generateCoverDownloadUrl(
         summaryId: SummaryId
-    ): String? = SummaryCoverUrlCache.get(summaryId) ?: getSummaryReference(summaryId).generateDownloadUrl(
-        path = SummaryFormatType.COVER.filename
-    ).also { url ->
-        url?.let { SummaryCoverUrlCache.put(summaryId, it) }
+    ): String? = withContext(ioDispatcher) {
+        SummaryCoverUrlCache.get(summaryId) ?: getSummaryReference(summaryId).generateDownloadUrl(
+            path = SummaryFormatType.COVER.filename
+        ).also { url ->
+            url?.let { SummaryCoverUrlCache.put(summaryId, it) }
+        }
     }
 
     override suspend fun generateTextDownloadUrl(summaryId: SummaryId): String? = getSummaryReference(
@@ -86,7 +93,7 @@ class StorageDownloadUrlGenerator @Inject constructor(
          * Singleton instance of [StorageDownloadUrlGenerator] for convenience in places where when can't use Hilt DI.
          */
         val instance: StorageDownloadUrlGenerator
-            get() = StorageDownloadUrlGenerator(storage = Firebase.storage)
+            get() = StorageDownloadUrlGenerator(storage = Firebase.storage, ioDispatcher = Dispatchers.IO)
     }
 }
 

app/src/main/java/app/books/tanga/di/GoogleSignInModule.kt

@@ -38,7 +38,7 @@
                 .builder()
                 .setSupported(true)
                 .setServerClientId(clientId)
-                .setFilterByAuthorizedAccounts(true)
+                .setFilterByAuthorizedAccounts(false)
                 .build()
         ).setAutoSelectEnabled(true)
         .build()
@@ -55,7 +55,7 @@
                 .builder()
                 .setSupported(true)
                 .setServerClientId(clientId)
-                .setFilterByAuthorizedAccounts(true)
+                .setFilterByAuthorizedAccounts(false)
                 .build()
         ).build()
 

app/src/main/java/app/books/tanga/feature/auth/AnonymousAuthService.kt

@@ -29,7 +29,7 @@ class AnonymousAuthServiceImpl @Inject constructor(
     @Suppress("TooGenericExceptionThrown")
     override suspend fun signInAnonymously(): AuthResult {
         val result = auth.signInAnonymously().await()
-        val firebaseUser = result.user ?: throw Throwable("Failed to sign in anonymously")
+        val firebaseUser = result.user ?: throw Throwable("Anonymous sign in returned null user")
 
         val user = firebaseUser.toAnonymousUser()
 

app/src/main/java/app/books/tanga/feature/auth/AuthenticationInteractor.kt

@@ -33,7 +33,7 @@ class AuthenticationInteractor @Inject constructor(
         val authResult = anonymousAuthService.signInAnonymously()
         authResult.user
     }.onFailure {
-        Timber.e("Anonymous sign in failed", it)
+        Timber.e(it, "Anonymous sign in failed")
         return Result.failure(DomainError.AuthenticationError(it))
     }
 
@@ -65,6 +65,7 @@ class AuthenticationInteractor @Inject constructor(
         sessionManager.openSession(sessionId)
         user
     }.onFailure {
+        Timber.e(it, "Complete Google sign in failed")
         return Result.failure(DomainError.UnableToSignInWithGoogleError(it))
     }
 

app/src/main/java/app/books/tanga/feature/onboarding/OnboardingScreen.kt

@@ -13,6 +13,7 @@
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -57,6 +58,15 @@
 
     val pagerState = rememberPagerState()
     val scope = rememberCoroutineScope()
+    val onNextClick: () -> Unit = remember {
+        {
+            scope.launch {
+                if (pagerState.currentPage < MAX_PAGER_INDEX) {
+                    pagerState.animateScrollToPage(pagerState.currentPage + 1)
+                }
+            }
+        }
+    }
 
     Column(
         modifier = modifier
@@ -85,11 +95,7 @@
         FinishOnboardingButton(
             modifier = Modifier.weight(1f),
             pagerState = pagerState,
-            onNextClick = {
-                scope.launch {
-                    pagerState.animateScrollToPage(pagerState.currentPage.inc())
-                }
-            },
+            onNextClick = onNextClick,
             onFinishClick = {
                 onboardingViewModel.onOnboardingCompleted()
                 navController.popBackStack()

app/src/test/java/app/books/tanga/StorageDownloadUrlGeneratorTest.kt

@@ -12,13 +12,16 @@ import io.mockk.mockk
 import io.mockk.mockkStatic
 import io.mockk.unmockkAll
 import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.tasks.await
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class StorageDownloadUrlGeneratorTest {
 
     private lateinit var generator: StorageDownloadUrlGenerator
@@ -28,6 +31,8 @@ class StorageDownloadUrlGeneratorTest {
     private val mockkStorageReferenceSummary = mockk<StorageReference>()
     private val mockkStorageReferenceSummaryCover = mockk<StorageReference>()
 
+    private val testDispatcher = UnconfinedTestDispatcher()
+
     @BeforeEach
     fun setUp() {
         mockkStatic("kotlinx.coroutines.tasks.TasksKt")
@@ -37,7 +42,7 @@ class StorageDownloadUrlGeneratorTest {
         every { mockkStorageReferenceSummary.child(any()) } returns mockkStorageReferenceSummaryCover
         coEvery { mockkStorageReferenceSummaryCover.downloadUrl.await().toString() } returns mockUrl
 
-        generator = StorageDownloadUrlGenerator(storage = mockStorage)
+        generator = StorageDownloadUrlGenerator(storage = mockStorage, testDispatcher)
     }
 
     @Test

benchmark/.gitignore

@@ -0,0 +1 @@
+/build

benchmark/build.gradle.kts

@@ -0,0 +1,52 @@
+plugins {
+    alias(libs.plugins.androidTest)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "app.books.tanga.benchmark"
+    compileSdk = 34
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+
+    defaultConfig {
+        minSdk = 24
+        targetSdk = 34
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        // This benchmark buildType is used for benchmarking, and should function like your
+        // release build (for example, with minification on). It"s signed with a debug key
+        // for easy local/CI testing.
+        create("benchmark") {
+            isDebuggable = false
+            signingConfig = getByName("debug").signingConfig
+            matchingFallbacks += listOf("release")
+        }
+    }
+
+    targetProjectPath = ":app"
+    experimentalProperties["android.experimental.self-instrumenting"] = true
+}
+
+dependencies {
+    implementation(libs.android.test.junit)
+    implementation(libs.android.espresso.core)
+    implementation(libs.uiautomator)
+    implementation(libs.benchmark.macro.junit4)
+}
+
+androidComponents {
+    beforeVariants(selector().all()) {
+        it.enable = it.buildType == "benchmark"
+    }
+}

benchmark/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest />