Update CandyBarSplashActivity.java

zixpo · Jan 2, 2025 · 35a3d69 · 35a3d69
1 parent 9f2bee7
commit 35a3d69
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/library/src/main/java/candybar/lib/activities/CandyBarSplashActivity.java b/library/src/main/java/candybar/lib/activities/CandyBarSplashActivity.java
@@ -6,6 +6,7 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -61,15 +62,17 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 .executeOnThreadPool();
 
         mWallpaperThumbPreloader = new WallpaperThumbPreloader(this).execute();
-    }
 
-    @Override
-    public void onBackPressed() {
-        if (mWallpaperThumbPreloader != null) {
-            mWallpaperThumbPreloader.cancel(true);
-        }
-        Database.get(this.getApplicationContext()).closeDatabase();
-        super.onBackPressed();
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                if (mWallpaperThumbPreloader != null) {
+                    mWallpaperThumbPreloader.cancel(true);
+                }
+                Database.get(getApplicationContext()).closeDatabase();
+                finish();
+            }
+        });
     }
 
     @Override