X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fdb%2FDB.java;h=b03faa62fbb1d19b9e75a2c8ce1a2b33a49c54a4;hb=4a44ce88b61f00c2710877cf26818db2728b5d91;hp=9819d23f7f135159c901528e0003ea87d0da01c7;hpb=33a8ebb5312cbe68076eb7979a121c488ef01449;p=mobile-ledger.git

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 9819d23f..b03faa62 100644
--- a/app/src/main/java/net/ktnx/mobileledger/db/DB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/db/DB.java
@@ -46,6 +46,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Locale;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -57,7 +58,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 = 63;
     public static final String DB_NAME = "MoLe.db";
     public static final MutableLiveData<Boolean> initComplete = new MutableLiveData<>(false);
     private static DB instance;
@@ -77,7 +78,8 @@ 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),
+                                    singleVersionMigration(62), singleVersionMigration(63)
                     })
                    .addCallback(new Callback() {
                        @Override
@@ -108,8 +110,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()) {
@@ -122,6 +124,14 @@ abstract public class DB extends RoomDatabase {
                         }
                     }
                 }
+                if (toVersion == 63) {
+                    try (Cursor c = db.query("SELECT id FROM templates")) {
+                        while (c.moveToNext()) {
+                            db.execSQL("UPDATE templates SET uuid=? WHERE id=?",
+                                    new Object[]{UUID.randomUUID().toString(), c.getLong(0)});
+                        }
+                    }
+                }
             }
         };
     }