fix saved profile moving at the top of the profile list

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / model / MobileLedgerProfile.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
index bb3f20a47df588610c24dc535971da63a83e51f2..b3920fe4d5e5a9acba517ad8ec842f38fbc72839 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -36,8 +36,16 @@ public final class MobileLedgerProfile {
     private boolean authEnabled;
     private String authUserName;
     private String authPassword;
+    private int themeId;
+    private int orderNo = -1;
     public MobileLedgerProfile(String uuid, String name, boolean permitPosting, String url,
                                boolean authEnabled, String authUserName, String authPassword) {
+        this(uuid, name, permitPosting, url, authEnabled, authUserName, authPassword, -1);
+
+    }
+    public MobileLedgerProfile(String uuid, String name, boolean permitPosting, String url,
+                               boolean authEnabled, String authUserName, String authPassword,
+                               int themeId) {
         this.uuid = uuid;
         this.name = name;
         this.permitPosting = permitPosting;
@@ -45,10 +53,12 @@ public final class MobileLedgerProfile {
         this.authEnabled = authEnabled;
         this.authUserName = authUserName;
         this.authPassword = authPassword;
+        this.themeId = themeId;
+        this.orderNo = -1;
     }
     public MobileLedgerProfile(CharSequence name, boolean permitPosting, CharSequence url,
                                boolean authEnabled, CharSequence authUserName,
-                               CharSequence authPassword) {
+                               CharSequence authPassword, int themeId) {
         this.uuid = String.valueOf(UUID.randomUUID());
         this.name = String.valueOf(name);
         this.permitPosting = permitPosting;
@@ -56,6 +66,8 @@ public final class MobileLedgerProfile {
         this.authEnabled = authEnabled;
         this.authUserName = String.valueOf(authUserName);
         this.authPassword = String.valueOf(authPassword);
+        this.themeId = themeId;
+        this.orderNo = -1;
     }
     // loads all profiles into Data.profiles
     // returns the profile with the given UUID
@@ -64,14 +76,15 @@ public final class MobileLedgerProfile {
         List<MobileLedgerProfile> list = new ArrayList<>();
         SQLiteDatabase db = MLDB.getReadableDatabase();
         try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " +
-                                         "auth_password, permit_posting FROM profiles order by " +
-                                         "order_no", null))
+                                         "auth_password, permit_posting, theme, order_no FROM " +
+                                         "profiles order by order_no", null))
         {
             while (cursor.moveToNext()) {
                 MobileLedgerProfile item =
                         new MobileLedgerProfile(cursor.getString(0), cursor.getString(1),
                                 cursor.getInt(6) == 1, cursor.getString(2), cursor.getInt(3) == 1,
-                                cursor.getString(4), cursor.getString(5));
+                                cursor.getString(4), cursor.getString(5), cursor.getInt(7));
+                item.orderNo = cursor.getInt(8);
                 list.add(item);
                 if (item.getUuid().equals(currentProfileUUID)) result = item;
             }
@@ -87,6 +100,7 @@ public final class MobileLedgerProfile {
             for (MobileLedgerProfile p : Data.profiles.getList()) {
                 db.execSQL("update profiles set order_no=? where uuid=?",
                         new Object[]{orderNo, p.getUuid()});
+                p.orderNo = orderNo;
                 orderNo++;
             }
             db.setTransactionSuccessful();
@@ -150,12 +164,16 @@ public final class MobileLedgerProfile {
         SQLiteDatabase db = MLDB.getWritableDatabase();
         db.beginTransaction();
         try {
+//            Log.d("profiles", String.format("Storing profile in DB: uuid=%s, name=%s, " +
+//                                            "url=%s, permit_posting=%s, authEnabled=%s, " +
+//                                            "themeId=%d", uuid, name, url,
+//                    permitPosting ? "TRUE" : "FALSE", authEnabled ? "TRUE" : "FALSE", themeId));
             db.execSQL("REPLACE INTO profiles(uuid, name, permit_posting, url, " +
                        "use_authentication, auth_user, " +
-                       "auth_password) VALUES(?, ?, ?, ?, ?, ?, ?)",
+                       "auth_password, theme, order_no) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)",
                     new Object[]{uuid, name, permitPosting, url, authEnabled,
                                  authEnabled ? authUserName : null,
-                                 authEnabled ? authPassword : null
+                                 authEnabled ? authPassword : null, themeId, orderNo
                     });
             db.setTransactionSuccessful();
         }
@@ -283,4 +301,15 @@ public final class MobileLedgerProfile {
 
         return tr;
     }
+    public int getThemeId() {
+//        Log.d("profile", String.format("Profile.getThemeId() returning %d", themeId));
+        return this.themeId;
+    }
+    public void setThemeId(int themeId) {
+//        Log.d("profile", String.format("Profile.setThemeId(%d) called", themeId));
+        this.themeId = themeId;
+    }
+    public void setThemeId(Object o) {
+        setThemeId(Integer.valueOf(String.valueOf(o)).intValue());
+    }
 }