update SDK to 34 (Android 14)

GrapheneOS · Aug 25, 2023 · 0e07eca · 0e07eca
1 parent ed13fec
commit 0e07eca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -39,7 +39,7 @@ android {
         }
     }
 
-    compileSdk = 33
+    compileSdk = 34
     buildToolsVersion = "34.0.0"
 
     namespace = "app.grapheneos.camera"

diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/MainActivity.kt
@@ -1341,21 +1341,25 @@ open class MainActivity : AppCompatActivity(),
         return false
     }
 
-    override fun onScroll(p0: MotionEvent, p1: MotionEvent, p2: Float, p3: Float): Boolean {
+    override fun onScroll(p0: MotionEvent?, p1: MotionEvent, p2: Float, p3: Float): Boolean {
         return false
     }
 
     override fun onLongPress(p0: MotionEvent) {}
 
     override fun onFling(
-        e1: MotionEvent, e2: MotionEvent,
-        velocityX: Float, velocityY: Float
+        p0: MotionEvent?,
+        e1: MotionEvent,
+        velocityX: Float,
+        velocityY: Float
     ): Boolean {
 
         var result = false
         try {
-            val diffY = e2.y - e1.y
-            val diffX = e2.x - e1.x
+            p0 ?: return false
+
+            val diffY = e1.y - p0.y
+            val diffX = e1.x - p0.x
 
             if (abs(diffX) > abs(diffY)) {
                 if (abs(diffX) > SWIPE_THRESHOLD && abs(velocityX) > SWIPE_VELOCITY_THRESHOLD) {