From 2b157c10befb88c8d39352847ad1514d87b25032 Mon Sep 17 00:00:00 2001
From: Secozzi <secozzi@proton.me>
Date: Mon, 22 Jun 2026 20:25:17 +0200
Subject: [PATCH] Fix custom buttons not being added

---
 CHANGELOG.md                                       |  2 ++
 .../restore/restorers/CustomButtonRestorer.kt      |  2 +-
 .../custombutton/CustomButtonRepositoryImpl.kt     |  9 ++++++++-
 .../sqldelight/tachiyomi/data/custom_buttons.sq    | 14 ++++++++------
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6589eeba8..96ded68664 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co
 - `Other` - for technical stuff.
 
 ## [Unreleased]
+### Fixed
+- Fix custom buttons not being added ([@Secozzi](https://github.com/Secozzi)) ([#164](https://github.com/quickdesh/Animiru/pull/164))
 
 ## [v0.19.7.6] - 2026-06-12
 ### Improved
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CustomButtonRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CustomButtonRestorer.kt
index e16221d030..5d4b03147a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CustomButtonRestorer.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CustomButtonRestorer.kt
@@ -28,7 +28,7 @@ class CustomButtonRestorer(
                     if (dbCustomButton != null) return@map dbCustomButton
                     val sortIndex = nextSortIndex++
                     val isFavorite = it.isFavorite && !dbHasFavorite
-                    database.custom_buttonsQueries.insert(
+                    database.custom_buttonsQueries.insertReturningId(
                         it.name,
                         isFavorite,
                         sortIndex,
diff --git a/data/src/main/java/tachiyomi/data/custombutton/CustomButtonRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/custombutton/CustomButtonRepositoryImpl.kt
index fb763eb7f7..cef115debb 100644
--- a/data/src/main/java/tachiyomi/data/custombutton/CustomButtonRepositoryImpl.kt
+++ b/data/src/main/java/tachiyomi/data/custombutton/CustomButtonRepositoryImpl.kt
@@ -30,7 +30,14 @@ class CustomButtonRepositoryImpl(
         onStartup: String,
     ) {
         try {
-            database.custom_buttonsQueries.insert(name, false, sortIndex, content, longPressContent, onStartup)
+            database.custom_buttonsQueries.insert(
+                name,
+                false,
+                sortIndex,
+                content,
+                longPressContent,
+                onStartup,
+            )
         } catch (ex: SQLiteException) {
             throw SaveCustomButtonException(ex)
         }
diff --git a/data/src/main/sqldelight/tachiyomi/data/custom_buttons.sq b/data/src/main/sqldelight/tachiyomi/data/custom_buttons.sq
index 42bc236b5b..cf6e45472a 100644
--- a/data/src/main/sqldelight/tachiyomi/data/custom_buttons.sq
+++ b/data/src/main/sqldelight/tachiyomi/data/custom_buttons.sq
@@ -35,12 +35,14 @@ SELECT *
 FROM custom_buttons
 ORDER BY sortIndex;
 
-insert {
-    INSERT INTO custom_buttons(name, isFavorite, sortIndex, content, longPressContent, onStartup)
-    VALUES (:name, :isFavorite, :sortIndex, :content, :longPressContent, :onStartup);
-
-    SELECT last_insert_rowid();
-}
+insert:
+INSERT INTO custom_buttons(name, isFavorite, sortIndex, content, longPressContent, onStartup)
+VALUES (:name, :isFavorite, :sortIndex, :content, :longPressContent, :onStartup);
+
+insertReturningId:
+INSERT INTO custom_buttons(name, isFavorite, sortIndex, content, longPressContent, onStartup)
+VALUES (:name, :isFavorite, :sortIndex, :content, :longPressContent, :onStartup)
+RETURNING _id;
 
 delete:
 DELETE FROM custom_buttons