From 879e8f98bd683e82d4eab2fbdc4d18d9e0ccc799 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 9 Feb 2026 13:05:28 -0400
Subject: [PATCH] Ensure lint configuration is applied to all modules.

---
 app/build.gradle.kts                          |  1 +
 .../src/main/java/signal-library.gradle.kts   |  1 +
 build.gradle.kts                              |  5 +--
 .../res/layout/activity_contact_lookup.xml    |  3 +-
 .../src/main/res/layout/activity_main.xml     |  3 +-
 .../src/main/res/layout/child_item.xml        |  3 +-
 .../src/main/res/layout/activity_main.xml     |  4 +-
 .../src/main/res/layout/activity_main.xml     |  3 +-
 .../src/main/res/layout/activity_main.xml     |  3 +-
 demo/qr/src/main/res/layout/activity_main.xml |  3 +-
 .../util/PreviewRegistrationDependencies.kt   | 42 +++++++++----------
 .../SpinnerTestSqliteOpenHelper.kt            |  6 +--
 .../src/main/res/layout/activity_main.xml     |  3 +-
 .../registration/RegistrationNavigation.kt    |  3 +-
 .../phonenumber/PhoneNumberEntryViewModel.kt  |  3 +-
 .../pincreation/PinCreationViewModel.kt       | 12 ++++--
 .../PinEntryForRegistrationLockViewModel.kt   |  8 ++--
 .../PinEntryForSvrRestoreViewModel.kt         |  3 +-
 .../VerificationCodeViewModel.kt              |  5 ++-
 .../org/signal/spinner/AssetTemplateLoader.kt |  6 +--
 app/lint.xml => lint.xml                      |  4 +-
 21 files changed, 73 insertions(+), 51 deletions(-)
 rename app/lint.xml => lint.xml (93%)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1bcb25826e..5f4afcbea2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -456,6 +456,7 @@ android {
     ignoreWarnings = true
     quiet = true
     disable += "LintError"
+    lintConfig = rootProject.file("lint.xml")
   }
 
   androidComponents {
diff --git a/build-logic/plugins/src/main/java/signal-library.gradle.kts b/build-logic/plugins/src/main/java/signal-library.gradle.kts
index e36cf008b3..ba04071de8 100644
--- a/build-logic/plugins/src/main/java/signal-library.gradle.kts
+++ b/build-logic/plugins/src/main/java/signal-library.gradle.kts
@@ -37,6 +37,7 @@ android {
 
   lint {
     disable += "InvalidVectorPath"
+    lintConfig = rootProject.file("lint.xml")
   }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index c3e881c748..2f65548095 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -135,18 +135,17 @@ tasks.register("checkStopship") {
   doLast {
     val excludedFiles = listOf(
       "build.gradle.kts",
-      "app/lint.xml"
+      "lint.xml"
     )
 
     val excludedDirectories = listOf(
-      "app/build",
-      "libsignal-service/build",
       ".idea"
     )
 
     val allowedExtensions = setOf("kt", "kts", "java", "xml")
 
     val allFiles = cachedProjectDir.walkTopDown()
+      .onEnter { it.name != "build" || it.relativeTo(cachedProjectDir).path.contains("src") }
       .asSequence()
       .filter { it.isFile && it.extension in allowedExtensions }
       .filterNot {
diff --git a/demo/contacts/src/main/res/layout/activity_contact_lookup.xml b/demo/contacts/src/main/res/layout/activity_contact_lookup.xml
index f140eba874..35b21f2aab 100644
--- a/demo/contacts/src/main/res/layout/activity_contact_lookup.xml
+++ b/demo/contacts/src/main/res/layout/activity_contact_lookup.xml
@@ -21,7 +21,8 @@
       android:layout_height="wrap_content"
       android:text="Lookup"
       app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintTop_toTopOf="parent"/>
+      app:layout_constraintTop_toTopOf="parent"
+      tools:ignore="HardcodedText" />
 
   <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/list"
diff --git a/demo/contacts/src/main/res/layout/activity_main.xml b/demo/contacts/src/main/res/layout/activity_main.xml
index 07e62dd5d8..6fd34e60e2 100644
--- a/demo/contacts/src/main/res/layout/activity_main.xml
+++ b/demo/contacts/src/main/res/layout/activity_main.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".MainActivity"
+    tools:ignore="HardcodedText" >
 
     <Button
         android:id="@+id/contact_list_button"
diff --git a/demo/contacts/src/main/res/layout/child_item.xml b/demo/contacts/src/main/res/layout/child_item.xml
index 258a63caed..8c505972a4 100644
--- a/demo/contacts/src/main/res/layout/child_item.xml
+++ b/demo/contacts/src/main/res/layout/child_item.xml
@@ -8,7 +8,8 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     app:cardCornerRadius="5dp"
-    app:cardElevation="5dp">
+    app:cardElevation="5dp"
+    tools:ignore="HardcodedText">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/demo/debuglogs-viewer/src/main/res/layout/activity_main.xml b/demo/debuglogs-viewer/src/main/res/layout/activity_main.xml
index b266e69d6e..44a680e19f 100644
--- a/demo/debuglogs-viewer/src/main/res/layout/activity_main.xml
+++ b/demo/debuglogs-viewer/src/main/res/layout/activity_main.xml
@@ -5,9 +5,11 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:ignore="HardcodedText" >
 
     <LinearLayout
         android:id="@+id/buttonRow"
diff --git a/demo/device-transfer/src/main/res/layout/activity_main.xml b/demo/device-transfer/src/main/res/layout/activity_main.xml
index 4e0b843ba8..8bc7885c71 100644
--- a/demo/device-transfer/src/main/res/layout/activity_main.xml
+++ b/demo/device-transfer/src/main/res/layout/activity_main.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".MainActivity"
+    tools:ignore="HardcodedText" >
 
 
     <Button
diff --git a/demo/paging/src/main/res/layout/activity_main.xml b/demo/paging/src/main/res/layout/activity_main.xml
index 0baa1e7192..a1b9a31473 100644
--- a/demo/paging/src/main/res/layout/activity_main.xml
+++ b/demo/paging/src/main/res/layout/activity_main.xml
@@ -5,7 +5,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".MainActivity"
+    tools:ignore="HardcodedText" >
 
   <HorizontalScrollView
       android:id="@+id/buttons"
diff --git a/demo/qr/src/main/res/layout/activity_main.xml b/demo/qr/src/main/res/layout/activity_main.xml
index 1989a03c61..55cc80cf3c 100644
--- a/demo/qr/src/main/res/layout/activity_main.xml
+++ b/demo/qr/src/main/res/layout/activity_main.xml
@@ -5,7 +5,8 @@
     android:layout_height="match_parent"
     android:layout_gravity="center"
     android:gravity="center_horizontal"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:ignore="HardcodedText" >
 
     <Button
         android:id="@+id/camera_switch"
diff --git a/demo/registration/src/main/java/org/signal/registration/sample/util/PreviewRegistrationDependencies.kt b/demo/registration/src/main/java/org/signal/registration/sample/util/PreviewRegistrationDependencies.kt
index 03b2f3d667..e723e2a91d 100644
--- a/demo/registration/src/main/java/org/signal/registration/sample/util/PreviewRegistrationDependencies.kt
+++ b/demo/registration/src/main/java/org/signal/registration/sample/util/PreviewRegistrationDependencies.kt
@@ -30,11 +30,11 @@ private class PreviewNewtorkController : NetworkController {
     mcc: String?,
     mnc: String?
   ): NetworkController.RegistrationNetworkResult<NetworkController.SessionMetadata, NetworkController.CreateSessionError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun getSession(sessionId: String): NetworkController.RegistrationNetworkResult<NetworkController.SessionMetadata, NetworkController.GetSessionStatusError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun updateSession(
@@ -42,7 +42,7 @@ private class PreviewNewtorkController : NetworkController {
     pushChallengeToken: String?,
     captchaToken: String?
   ): NetworkController.RegistrationNetworkResult<NetworkController.SessionMetadata, NetworkController.UpdateSessionError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun requestVerificationCode(
@@ -51,14 +51,14 @@ private class PreviewNewtorkController : NetworkController {
     androidSmsRetrieverSupported: Boolean,
     transport: NetworkController.VerificationCodeTransport
   ): NetworkController.RegistrationNetworkResult<NetworkController.SessionMetadata, NetworkController.RequestVerificationCodeError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun submitVerificationCode(
     sessionId: String,
     verificationCode: String
   ): NetworkController.RegistrationNetworkResult<NetworkController.SessionMetadata, NetworkController.SubmitVerificationCodeError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun registerAccount(
@@ -72,74 +72,74 @@ private class PreviewNewtorkController : NetworkController {
     fcmToken: String?,
     skipDeviceTransfer: Boolean
   ): NetworkController.RegistrationNetworkResult<NetworkController.RegisterAccountResponse, NetworkController.RegisterAccountError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun getFcmToken(): String? {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun awaitPushChallengeToken(): String? {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override fun getCaptchaUrl(): String {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun restoreMasterKeyFromSvr(
     svr2Credentials: NetworkController.SvrCredentials,
     pin: String
   ): NetworkController.RegistrationNetworkResult<NetworkController.MasterKeyResponse, NetworkController.RestoreMasterKeyError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun setPinAndMasterKeyOnSvr(
     pin: String,
     masterKey: MasterKey
   ): NetworkController.RegistrationNetworkResult<Unit, NetworkController.BackupMasterKeyError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun enableRegistrationLock(): NetworkController.RegistrationNetworkResult<Unit, NetworkController.SetRegistrationLockError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun disableRegistrationLock(): NetworkController.RegistrationNetworkResult<Unit, NetworkController.SetRegistrationLockError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun getSvrCredentials(): NetworkController.RegistrationNetworkResult<NetworkController.SvrCredentials, NetworkController.GetSvrCredentialsError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun setAccountAttributes(attributes: NetworkController.AccountAttributes): NetworkController.RegistrationNetworkResult<Unit, NetworkController.SetAccountAttributesError> {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 }
 
 private class PreviewStorageController : StorageController {
   override suspend fun generateAndStoreKeyMaterial(): KeyMaterial {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun saveNewRegistrationData(newRegistrationData: NewRegistrationData) {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun getPreExistingRegistrationData(): PreExistingRegistrationData? {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun saveValidatedPinAndTemporaryMasterKey(pin: String, isAlphanumeric: Boolean, masterKey: MasterKey, registrationLockEnabled: Boolean) {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun saveNewlyCreatedPin(pin: String, isAlphanumeric: Boolean) {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override suspend fun clearAllData() {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 }
diff --git a/demo/spinner/src/main/java/org/signal/spinnertest/SpinnerTestSqliteOpenHelper.kt b/demo/spinner/src/main/java/org/signal/spinnertest/SpinnerTestSqliteOpenHelper.kt
index 03fe577ee0..3402082412 100644
--- a/demo/spinner/src/main/java/org/signal/spinnertest/SpinnerTestSqliteOpenHelper.kt
+++ b/demo/spinner/src/main/java/org/signal/spinnertest/SpinnerTestSqliteOpenHelper.kt
@@ -43,7 +43,7 @@ class SpinnerTestSqliteOpenHelper(context: Context) : SQLiteOpenHelper(context,
     }
 
   override fun compileStatement(sql: String): SupportSQLiteStatement {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override fun beginTransaction() {
@@ -96,11 +96,11 @@ class SpinnerTestSqliteOpenHelper(context: Context) : SQLiteOpenHelper(context,
   }
 
   override fun query(query: SupportSQLiteQuery): Cursor {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override fun query(query: SupportSQLiteQuery, cancellationSignal: CancellationSignal?): Cursor {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override fun insert(table: String, conflictAlgorithm: Int, values: ContentValues): Long {
diff --git a/demo/spinner/src/main/res/layout/activity_main.xml b/demo/spinner/src/main/res/layout/activity_main.xml
index e7618050d4..83b51c2075 100644
--- a/demo/spinner/src/main/res/layout/activity_main.xml
+++ b/demo/spinner/src/main/res/layout/activity_main.xml
@@ -7,7 +7,8 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="8dp"
-    tools:context=".MainActivity">
+    tools:context=".MainActivity"
+    tools:ignore="HardcodedText">
     
     <TextView
         android:layout_width="match_parent"
diff --git a/feature/registration/src/main/java/org/signal/registration/RegistrationNavigation.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationNavigation.kt
index fd07d11aa9..3b50eb4ac3 100644
--- a/feature/registration/src/main/java/org/signal/registration/RegistrationNavigation.kt
+++ b/feature/registration/src/main/java/org/signal/registration/RegistrationNavigation.kt
@@ -273,7 +273,8 @@ private fun EntryProviderScope<NavKey>.navigationEntries(
   // -- Country Code Picker
   entry<RegistrationRoute.CountryCodePicker> {
     // We'll also want this to be some sort of launch-for-result flow as well
-    TODO()
+    // TODO [registration] - display country code picker
+    throw NotImplementedError("Country Code Picker not implemented")
   }
 
   // -- Captcha Screen
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt
index 84ab490b50..ba551d173d 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt
@@ -388,7 +388,8 @@ class PhoneNumberEntryViewModel(
             state
           }
           is NetworkController.RequestVerificationCodeError.MissingRequestInformationOrAlreadyVerified -> {
-            TODO()
+            // TODO [registration] - Error handling not implemented
+            throw NotImplementedError()
           }
           is NetworkController.RequestVerificationCodeError.SessionNotFound -> {
             parentEventEmitter(RegistrationFlowEvent.ResetState)
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt
index 4c6097e08e..1f315d7d5a 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt
@@ -72,7 +72,8 @@ class PinCreationViewModel(
         )
       }
       is PinCreationScreenEvents.LearnMore -> {
-        TODO("Show learn more dialog or navigate to help screen")
+        // TODO [registration] - Show learn more dialog or navigate to help screen
+        throw NotImplementedError("Show learn more dialog or navigate to help screen")
       }
     }
   }
@@ -104,7 +105,8 @@ class PinCreationViewModel(
         when (result.error) {
           is NetworkController.BackupMasterKeyError.EnclaveNotFound -> {
             Log.w(TAG, "[PinSubmitted] SVR enclave not found.")
-            TODO("Report to UI and indicate to library user that pin could not be created")
+            // TODO [registration] - Report to UI and indicate to library user that pin could not be created
+            throw NotImplementedError("Report to UI and indicate to library user that pin could not be created")
           }
           is NetworkController.BackupMasterKeyError.NotRegistered -> {
             Log.w(TAG, "[PinSubmitted] Account not registered. This should not happen. Resetting.")
@@ -115,11 +117,13 @@ class PinCreationViewModel(
       }
       is NetworkController.RegistrationNetworkResult.NetworkError -> {
         Log.w(TAG, "[PinSubmitted] Network error when backing up master key.", result.exception)
-        TODO("Report to UI and indicate to library user that pin could not be created")
+        // TODO [registration] - Report to UI and indicate to library user that pin could not be created
+        throw NotImplementedError("Report to UI and indicate to library user that pin could not be created")
       }
       is NetworkController.RegistrationNetworkResult.ApplicationError -> {
         Log.w(TAG, "[PinSubmitted] Application error when backing up master key.", result.exception)
-        TODO("Report to UI and indicate to library user that pin could not be created")
+        // TODO [registration] - Report to UI and indicate to library user that pin could not be created
+        throw NotImplementedError("Report to UI and indicate to library user that pin could not be created")
       }
     }
   }
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt
index 67f2423bfe..29a78d7161 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt
@@ -147,7 +147,8 @@ class PinEntryForRegistrationLockViewModel(
         when (registerResult.error) {
           is NetworkController.RegisterAccountError.SessionNotFoundOrNotVerified -> {
             Log.w(TAG, "[PinEntered] Session not found or verified: ${registerResult.error.message}")
-            TODO()
+            // TODO [registration] - Handle session not found or verified.
+            throw NotImplementedError("Handle session not found or verified")
           }
           is NetworkController.RegisterAccountError.RegistrationLock -> {
             Log.w(TAG, "[PinEntered] Still getting registration lock error after providing token. This shouldn't happen. Resetting state.")
@@ -168,7 +169,8 @@ class PinEntryForRegistrationLockViewModel(
           }
           is NetworkController.RegisterAccountError.RegistrationRecoveryPasswordIncorrect -> {
             Log.w(TAG, "[PinEntered] Registration recovery password incorrect: ${registerResult.error.message}")
-            TODO()
+            // TODO [registration] - Handle incorrect password
+            throw NotImplementedError("Handle incorrect password")
           }
         }
       }
@@ -185,7 +187,7 @@ class PinEntryForRegistrationLockViewModel(
 
   private fun handleSkip() {
     Log.d(TAG, "Skip requested - this will result in account data loss after timeRemaining: $timeRemaining ms")
-    // TODO: Show confirmation dialog warning about data loss, then proceed without PIN
+    // TODO [registration] - Show confirmation dialog warning about data loss, then proceed without PIN
   }
 
   class Factory(
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt
index 3ea2b3af02..88c7940ace 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt
@@ -146,7 +146,8 @@ class PinEntryForSvrRestoreViewModel(
   }
 
   private fun handleSkip() {
-    TODO("Handle skip")
+    // TODO [registration] - Handle skip
+    throw NotImplementedError("Handle skip")
   }
 
   class Factory(
diff --git a/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt
index 622cf743dc..0498e54820 100644
--- a/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt
+++ b/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt
@@ -54,7 +54,7 @@ class VerificationCodeViewModel(
       is VerificationCodeScreenEvents.WrongNumber -> state.also { parentEventEmitter.navigateTo(RegistrationRoute.PhoneNumberEntry) }
       is VerificationCodeScreenEvents.ResendSms -> transformResendCode(state, NetworkController.VerificationCodeTransport.SMS)
       is VerificationCodeScreenEvents.CallMe -> transformResendCode(state, NetworkController.VerificationCodeTransport.VOICE)
-      is VerificationCodeScreenEvents.HavingTrouble -> TODO("having trouble flow")
+      is VerificationCodeScreenEvents.HavingTrouble -> throw NotImplementedError("having trouble flow") // TODO [registration] - Having trouble flow
       is VerificationCodeScreenEvents.ConsumeInnerOneTimeEvent -> state.copy(oneTimeEvent = null)
     }
   }
@@ -148,7 +148,8 @@ class VerificationCodeViewModel(
       is NetworkController.RegistrationNetworkResult.Failure -> {
         when (registerResult.error) {
           is NetworkController.RegisterAccountError.SessionNotFoundOrNotVerified -> {
-            TODO()
+            // TODO [registration] Handle session not found or not verified case.
+            throw NotImplementedError("Handle session not found or not verified case.")
           }
           is NetworkController.RegisterAccountError.DeviceTransferPossible -> {
             Log.w(TAG, "[Register] Got told a device transfer is possible. We should never get into this state. Resetting.")
diff --git a/lib/spinner/src/main/java/org/signal/spinner/AssetTemplateLoader.kt b/lib/spinner/src/main/java/org/signal/spinner/AssetTemplateLoader.kt
index 7cc82f0885..d7131381da 100644
--- a/lib/spinner/src/main/java/org/signal/spinner/AssetTemplateLoader.kt
+++ b/lib/spinner/src/main/java/org/signal/spinner/AssetTemplateLoader.kt
@@ -30,15 +30,15 @@ class AssetTemplateLoader(private val context: Context) : TemplateLoader {
   }
 
   override fun setPrefix(prefix: String) {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override fun setSuffix(suffix: String) {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override fun setCharset(charset: Charset?) {
-    TODO("Not yet implemented")
+    throw NotImplementedError()
   }
 
   override fun getCharset(): Charset {
diff --git a/app/lint.xml b/lint.xml
similarity index 93%
rename from app/lint.xml
rename to lint.xml
index 20134c9334..cf65be60ec 100644
--- a/app/lint.xml
+++ b/lint.xml
@@ -22,7 +22,9 @@
 
     <issue id="CanvasSize" severity="error" />
     <issue id="HardcodedText" severity="error" />
-    <issue id="VectorRaster" severity="error" />
+    <issue id="VectorRaster" severity="error">
+        <ignore path="*/donate_with_googlepay_button_content.xml" /> <!-- Externally provided by Google -->
+    </issue>
     <issue id="ButtonOrder" severity="error" />
     <issue id="ExtraTranslation" severity="warning" />
     <issue id="UnspecifiedImmutableFlag" severity="error" />