diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt
index 8ffb6c267..504910492 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt
@@ -111,7 +111,7 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh
       lottie.visible = true
       lottie.playAnimation()
       lottie.addAnimatorListener(object : AnimationCompleteListener() {
-        override fun onAnimationEnd(animation: Animator?) {
+        override fun onAnimationEnd(animation: Animator) {
           lottie.removeAnimatorListener(this)
           lottie.setMinAndMaxFrame(30, 91)
           lottie.repeatMode = LottieDrawable.RESTART
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt
index f8675128a..55c93bb04 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView.kt
@@ -202,7 +202,7 @@ class ConversationListFilterPullView @JvmOverloads constructor(
     animateHelpText = 0
     helpTextStartFraction = ANIMATE_HELP_TEXT_START_FRACTION
     binding.helpText.animate().alpha(0f).setListener(object : AnimationCompleteListener() {
-      override fun onAnimationEnd(animation: Animator?) {
+      override fun onAnimationEnd(animation: Animator) {
         binding.helpText.visibility = INVISIBLE
       }
     })
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt
index 0e3b175e7..e9e89c2ba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/KeyboardPageSearchView.kt
@@ -155,7 +155,7 @@ class KeyboardPageSearchView @JvmOverloads constructor(
         .setDuration(REVEAL_DURATION)
         .alpha(0f)
         .setListener(object : AnimationCompleteListener() {
-          override fun onAnimationEnd(animation: Animator?) {
+          override fun onAnimationEnd(animation: Animator) {
             visibility = INVISIBLE
           }
         })
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPlayerControlView.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPlayerControlView.kt
index 60ee576a3..f42e2c435 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPlayerControlView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPlayerControlView.kt
@@ -103,14 +103,14 @@ class LottieAnimatedButton @JvmOverloads constructor(
       MotionEvent.ACTION_UP -> {
         if (isAnimating) {
           addAnimatorListener(object : AnimatorListener {
-            override fun onAnimationEnd(animation: Animator?) {
+            override fun onAnimationEnd(animation: Animator) {
               removeAllAnimatorListeners()
               playAnimationReverse()
             }
 
-            override fun onAnimationStart(animation: Animator?) {}
-            override fun onAnimationCancel(animation: Animator?) {}
-            override fun onAnimationRepeat(animation: Animator?) {}
+            override fun onAnimationStart(animation: Animator) {}
+            override fun onAnimationCancel(animation: Animator) {}
+            override fun onAnimationRepeat(animation: Animator) {}
           })
         } else {
           playAnimationReverse()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt
index d3be567bb..3a714e7d7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt
@@ -183,11 +183,11 @@ class RotationDialView @JvmOverloads constructor(
   }
 
   private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
-    override fun onDown(e: MotionEvent?): Boolean {
+    override fun onDown(e: MotionEvent): Boolean {
       return true
     }
 
-    override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, distanceX: Float, distanceY: Float): Boolean {
+    override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
       val degreeIncrement: Float = distanceX / dimensions.spaceBetweenAngleIndicators
       val prevDialDegrees = getDialDegrees(degrees)
       val newDialDegrees = getDialDegrees(degrees + degreeIncrement)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/ScaleTransition.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/ScaleTransition.kt
index 0c3082f0c..e43df2830 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/ScaleTransition.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/ScaleTransition.kt
@@ -108,7 +108,7 @@ class ScaleTransition : Transition {
       ofFloat(View.SCALE_Y, 1f)
     ).apply {
       addListener(object : AnimatorListenerAdapter() {
-        override fun onAnimationEnd(animation: Animator?) {
+        override fun onAnimationEnd(animation: Animator) {
           resetValues(start.view)
           resetValues(end.view)
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryFirstTimeNavigationView.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryFirstTimeNavigationView.kt
index a0fba2c4d..046c565a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryFirstTimeNavigationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryFirstTimeNavigationView.kt
@@ -125,7 +125,7 @@ class StoryFirstTimeNavigationView @JvmOverloads constructor(
 
     isPlayingAnimations = true
     tapToAdvance.addAnimatorListener(object : AnimatorListenerAdapter() {
-      override fun onAnimationEnd(animation: Animator?) {
+      override fun onAnimationEnd(animation: Animator) {
         if (isPlayingAnimations) {
           swipeUp.playAnimation()
         }
@@ -133,7 +133,7 @@ class StoryFirstTimeNavigationView @JvmOverloads constructor(
     })
 
     swipeUp.addAnimatorListener(object : AnimatorListenerAdapter() {
-      override fun onAnimationEnd(animation: Animator?) {
+      override fun onAnimationEnd(animation: Animator) {
         if (isPlayingAnimations) {
           swipeRight.playAnimation()
         }
@@ -141,7 +141,7 @@ class StoryFirstTimeNavigationView @JvmOverloads constructor(
     })
 
     swipeRight.addAnimatorListener(object : AnimatorListenerAdapter() {
-      override fun onAnimationEnd(animation: Animator?) {
+      override fun onAnimationEnd(animation: Animator) {
         postDelayed({
           if (isPlayingAnimations) {
             startLottieAnimations()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
index e13ce8087..d00ed05ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
@@ -1184,7 +1184,7 @@ class StoryViewerPageFragment :
       scaleFactor = 1f
       isPerformingEndAnimation = true
       card.animate().scaleX(1f).scaleY(1f).setListener(object : AnimationCompleteListener() {
-        override fun onAnimationEnd(animation: Animator?) {
+        override fun onAnimationEnd(animation: Animator) {
           isPerformingEndAnimation = false
           viewModel.setIsUserScaling(false)
           sharedViewModel.setIsChildScrolling(false)
@@ -1255,7 +1255,7 @@ class StoryViewerPageFragment :
       return true
     }
 
-    override fun onFling(e1: MotionEvent?, e2: MotionEvent?, velocityX: Float, velocityY: Float): Boolean {
+    override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
       val isSideSwipe = abs(velocityX) > abs(velocityY)
       if (!isSideSwipe) {
         return false
diff --git a/build.gradle b/build.gradle
index cd53100e3..8f37eaa3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ buildscript {
 ext {
     BUILD_TOOL_VERSION = '32.0.0'
 
-    COMPILE_SDK = 32
+    COMPILE_SDK = 33
     TARGET_SDK  = 31
     MINIMUM_SDK = 19
 
diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile
index 94aed8982..be84de623 100644
--- a/reproducible-builds/Dockerfile
+++ b/reproducible-builds/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update -y && apt-get install -y $(cat docker/dependencies.txt)
 RUN docker/print-versions.sh docker/dependencies.txt
 
 ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-7583922_latest.zip
-ENV ANDROID_API_LEVELS                  android-32
+ENV ANDROID_API_LEVELS                  android-33
 ENV ANDROID_BUILD_TOOLS_VERSION         32.0.0
 
 ENV ANDROID_HOME /usr/local/android-sdk-linux