fix looking up old transactions with non-ASCII names (broken in 0.18.0)

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / db / DB.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/db/DB.java b/app/src/main/java/net/ktnx/mobileledger/db/DB.java
index 9819d23f7f135159c901528e0003ea87d0da01c7..1e7de71da194c0c21ab0039843215e9363716e7d 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/db/DB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/db/DB.java
@@ -57,7 +57,7 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
                       TransactionAccount.class
           })
 abstract public class DB extends RoomDatabase {
-    public static final int REVISION = 60;
+    public static final int REVISION = 61;
     public static final String DB_NAME = "MoLe.db";
     public static final MutableLiveData<Boolean> initComplete = new MutableLiveData<>(false);
     private static DB instance;
@@ -77,7 +77,7 @@ abstract public class DB extends RoomDatabase {
                                     multiVersionMigration(30, 32), multiVersionMigration(32, 34),
                                     multiVersionMigration(34, 40), singleVersionMigration(41),
                                     multiVersionMigration(41, 58), singleVersionMigration(59),
-                                    singleVersionMigration(60)
+                                    singleVersionMigration(60), singleVersionMigration(61)
                     })
                    .addCallback(new Callback() {
                        @Override
@@ -108,8 +108,8 @@ abstract public class DB extends RoomDatabase {
                 // SharedPreferences
                 if (toVersion == 59) {
                     try (Cursor c = db.query(
-                            "SELECT p.id, p.theme_hue FROM profiles p WHERE p.id=(SELECT o.value " +
-                            "FROM options WHERE o.profile_uid IS NULL AND o.name=?",
+                            "SELECT p.id, p.theme FROM profiles p WHERE p.id=(SELECT o.value " +
+                            "FROM options o WHERE o.profile_id=0 AND o.name=?)",
                             new Object[]{"profile_id"}))
                     {
                         if (c.moveToFirst()) {