X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=6ebba5762da199c65223f3c4702b73c970c319cf;hp=9731e3e6b4eb7689e422fc7ba697ff13b0532a7e;hb=9ea53633542c034f33e4a4aaaef8c534572b1812;hpb=7165b89c8ff2b9d8f69e02354197127ec27a4a47

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 9731e3e6..6ebba576 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -44,36 +44,11 @@ public final class MobileLedgerProfile {
     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() {
+        this.uuid = String.valueOf(UUID.randomUUID());
     }
-    public MobileLedgerProfile(String uuid, String name, boolean permitPosting, String url,
-                               boolean authEnabled, String authUserName, String authPassword,
-                               int themeId) {
+    public MobileLedgerProfile(String uuid) {
         this.uuid = uuid;
-        this.name = name;
-        this.permitPosting = permitPosting;
-        this.url = url;
-        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, int themeId) {
-        this.uuid = String.valueOf(UUID.randomUUID());
-        this.name = String.valueOf(name);
-        this.permitPosting = permitPosting;
-        this.url = String.valueOf(url);
-        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
@@ -86,10 +61,14 @@ public final class MobileLedgerProfile {
                                          "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.getInt(7));
+                MobileLedgerProfile item = new MobileLedgerProfile(cursor.getString(0));
+                item.setName(cursor.getString(1));
+                item.setUrl(cursor.getString(2));
+                item.setAuthEnabled(cursor.getInt(3) == 1);
+                item.setAuthUserName(cursor.getString(4));
+                item.setAuthPassword(cursor.getString(5));
+                item.setPostingPermitted(cursor.getInt(6) == 1);
+                item.setThemeId(cursor.getInt(7));
                 item.orderNo = cursor.getInt(8);
                 list.add(item);
                 if (item.getUuid().equals(currentProfileUUID)) result = item;
@@ -289,11 +268,12 @@ public final class MobileLedgerProfile {
         Log.d("db", String.format("removing profile %s from DB", uuid));
         db.beginTransaction();
         try {
-            db.execSQL("delete from profiles where uuid=?", new Object[]{uuid});
-            db.execSQL("delete from accounts where profile=?", new Object[]{uuid});
-            db.execSQL("delete from account_values where profile=?", new Object[]{uuid});
-            db.execSQL("delete from transactions where profile=?", new Object[]{uuid});
-            db.execSQL("delete from transaction_accounts where profile=?", new Object[]{uuid});
+            Object[] uuid_param = new Object[]{uuid};
+            db.execSQL("delete from profiles where uuid=?", uuid_param);
+            db.execSQL("delete from accounts where profile=?", uuid_param);
+            db.execSQL("delete from account_values where profile=?", uuid_param);
+            db.execSQL("delete from transactions where profile=?", uuid_param);
+            db.execSQL("delete from transaction_accounts where profile=?", uuid_param);
             db.setTransactionSuccessful();
         }
         finally {