From 47ae37989e7fce9d2f0cf8d29ec4bf8cb2a97bd8 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Fri, 3 Jan 2025 23:22:41 -0500 Subject: [PATCH 1/3] Upgrade targetSdk to 35 --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7687acb4..b8834c1a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -43,7 +43,7 @@ android { defaultConfig { applicationId = "app.grapheneos.apps" minSdk = 31 - targetSdk = 34 + targetSdk = 35 versionCode = 27 versionName = versionCode.toString() resourceConfigurations.add("en") From 858d7a1167acef9aa17c46583ea63997aac4c8bb Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Fri, 3 Jan 2025 23:22:51 -0500 Subject: [PATCH 2/3] Use new API for enabling edge to edge --- app/src/main/java/app/grapheneos/apps/ui/MainActivity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/app/grapheneos/apps/ui/MainActivity.kt b/app/src/main/java/app/grapheneos/apps/ui/MainActivity.kt index 8d8e06d5..9642f74e 100644 --- a/app/src/main/java/app/grapheneos/apps/ui/MainActivity.kt +++ b/app/src/main/java/app/grapheneos/apps/ui/MainActivity.kt @@ -6,6 +6,7 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED import android.os.Build import android.os.Bundle import android.view.ViewGroup +import androidx.activity.enableEdgeToEdge import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity @@ -36,7 +37,7 @@ class MainActivity : AppCompatActivity() { val views = MainActivityBinding.inflate(layoutInflater) this.views = views - window.setDecorFitsSystemWindows(false) + enableEdgeToEdge() ViewCompat.setOnApplyWindowInsetsListener(views.root) { v, insets -> val paddingInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars()) From 7eff83a2f69ded22e92e530b5b64aa47551aa3c9 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Fri, 3 Jan 2025 23:27:30 -0500 Subject: [PATCH 3/3] Stop self when onTimeout is called for dataSync service Introduced in Android 15, and while this isn't required, this avoids any internal exceptions --- .../java/app/grapheneos/apps/PackageDownloadFgService.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/app/grapheneos/apps/PackageDownloadFgService.kt b/app/src/main/java/app/grapheneos/apps/PackageDownloadFgService.kt index becc7629..131c3571 100644 --- a/app/src/main/java/app/grapheneos/apps/PackageDownloadFgService.kt +++ b/app/src/main/java/app/grapheneos/apps/PackageDownloadFgService.kt @@ -75,4 +75,9 @@ class PackageDownloadFgService : Service() { } override fun onBind(intent: Intent?): IBinder? = null + + override fun onTimeout(startId: Int, fgsType: Int) { + super.onTimeout(startId, fgsType) + stopSelf() + } }