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=b3920fe4d5e5a9acba517ad8ec842f38fbc72839;hp=038515bfb02e4ec32e01293476c179c878276f22;hb=c0b1645b9f14e6b25803efd2fa048e27030ba5e6;hpb=94aa0aa57db3dce40f31fc0321c718998d9cb48b
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 038515bf..b3920fe4 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -1,18 +1,18 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.model;
@@ -21,6 +21,7 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
+import net.ktnx.mobileledger.utils.Globals;
import net.ktnx.mobileledger.utils.MLDB;
import java.util.ArrayList;
@@ -30,78 +31,89 @@ import java.util.UUID;
public final class MobileLedgerProfile {
private String uuid;
private String name;
+ private boolean permitPosting;
private String url;
private boolean authEnabled;
private String authUserName;
private String authPassword;
- public MobileLedgerProfile(String uuid, String name, String url, boolean authEnabled,
- String authUserName, 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;
this.url = url;
this.authEnabled = authEnabled;
this.authUserName = authUserName;
this.authPassword = authPassword;
+ this.themeId = themeId;
+ this.orderNo = -1;
}
- public MobileLedgerProfile(CharSequence name, CharSequence url, boolean authEnabled,
- CharSequence authUserName, CharSequence authPassword) {
+ 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;
}
- public static List loadAllFromDB() {
- List result = new ArrayList<>();
+ // loads all profiles into Data.profiles
+ // returns the profile with the given UUID
+ public static MobileLedgerProfile loadAllFromDB(String currentProfileUUID) {
+ MobileLedgerProfile result = null;
+ List list = new ArrayList<>();
SQLiteDatabase db = MLDB.getReadableDatabase();
try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " +
- "auth_password FROM profiles", null))
+ "auth_password, permit_posting, theme, order_no FROM " +
+ "profiles order by order_no", null))
{
while (cursor.moveToNext()) {
- result.add(new MobileLedgerProfile(cursor.getString(0), cursor.getString(1), cursor.getString(2), cursor.getInt(3) == 1, cursor.getString(4),
- cursor.getString(5)));
+ 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));
+ item.orderNo = cursor.getInt(8);
+ list.add(item);
+ if (item.getUuid().equals(currentProfileUUID)) result = item;
}
}
+ Data.profiles.setList(list);
return result;
}
- public static List createInitialProfileList() {
- List result = new ArrayList<>();
- MobileLedgerProfile first =
- new MobileLedgerProfile(UUID.randomUUID().toString(), "default", "", false, "", "");
- first.storeInDB();
- result.add(first);
-
- return result;
- }
- public static MobileLedgerProfile loadUUIDFromDB(String profileUUID) {
- SQLiteDatabase db = MLDB.getReadableDatabase();
- String name;
- String url;
- String authUser;
- String authPassword;
- Boolean useAuthentication;
- try (Cursor cursor = db.rawQuery("SELECT name, url, use_authentication, auth_user, " +
- "auth_password FROM profiles WHERE uuid=?",
- new String[]{profileUUID}))
- {
- if (cursor.moveToNext()) {
- name = cursor.getString(0);
- url = cursor.getString(1);
- useAuthentication = cursor.getInt(2) == 1;
- authUser = useAuthentication ? cursor.getString(3) : null;
- authPassword = useAuthentication ? cursor.getString(4) : null;
- }
- else {
- name = "Unknown profile";
- url = "Https://server/url";
- useAuthentication = false;
- authUser = authPassword = null;
+ public static void storeProfilesOrder() {
+ SQLiteDatabase db = MLDB.getWritableDatabase();
+ db.beginTransaction();
+ try {
+ int orderNo = 0;
+ 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();
}
-
- return new MobileLedgerProfile(profileUUID, name, url, useAuthentication, authUser,
- authPassword);
+ finally {
+ db.endTransaction();
+ }
+ }
+ public boolean isPostingPermitted() {
+ return permitPosting;
+ }
+ public void setPostingPermitted(boolean permitPosting) {
+ this.permitPosting = permitPosting;
}
public String getUuid() {
return uuid;
@@ -109,21 +121,21 @@ public final class MobileLedgerProfile {
public String getName() {
return name;
}
- public void setName(CharSequence text) {
- setName(String.valueOf(text));
- }
public void setName(String name) {
this.name = name;
}
+ public void setName(CharSequence text) {
+ setName(String.valueOf(text));
+ }
public String getUrl() {
return url;
}
- public void setUrl(CharSequence text) {
- setUrl(String.valueOf(text));
- }
public void setUrl(String url) {
this.url = url;
}
+ public void setUrl(CharSequence text) {
+ setUrl(String.valueOf(text));
+ }
public boolean isAuthEnabled() {
return authEnabled;
}
@@ -133,29 +145,35 @@ public final class MobileLedgerProfile {
public String getAuthUserName() {
return authUserName;
}
- public void setAuthUserName(CharSequence text) {
- setAuthUserName(String.valueOf(text));
- }
public void setAuthUserName(String authUserName) {
this.authUserName = authUserName;
}
+ public void setAuthUserName(CharSequence text) {
+ setAuthUserName(String.valueOf(text));
+ }
public String getAuthPassword() {
return authPassword;
}
- public void setAuthPassword(CharSequence text) {
- setAuthPassword(String.valueOf(text));
- }
public void setAuthPassword(String authPassword) {
this.authPassword = authPassword;
}
+ public void setAuthPassword(CharSequence text) {
+ setAuthPassword(String.valueOf(text));
+ }
public void storeInDB() {
SQLiteDatabase db = MLDB.getWritableDatabase();
db.beginTransaction();
try {
- db.execSQL("REPLACE INTO profiles(uuid, name, url, use_authentication, auth_user, " +
- "auth_password) VALUES(?, ?, ?, ?, ?, ?)",
- new Object[]{uuid, name, url, authEnabled, authEnabled ? authUserName : null,
- authEnabled ? authPassword : null
+// 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, theme, order_no) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ new Object[]{uuid, name, permitPosting, url, authEnabled,
+ authEnabled ? authUserName : null,
+ authEnabled ? authPassword : null, themeId, orderNo
});
db.setTransactionSuccessful();
}
@@ -163,16 +181,18 @@ public final class MobileLedgerProfile {
db.endTransaction();
}
}
- public void storeAccount(String name) {
+ public void storeAccount(LedgerAccount acc) {
SQLiteDatabase db = MLDB.getWritableDatabase();
- do {
- LedgerAccount acc = new LedgerAccount(name);
- db.execSQL("replace into accounts(profile, name, name_upper, level, keep) values(?, " +
- "?, ?, ?, 1)",
- new Object[]{this.uuid, name, name.toUpperCase(), acc.getLevel()});
- name = acc.getParentName();
- } while (name != null);
+ // replace into is a bad idea because it would reset hidden to its default value
+ // we like the default, but for new accounts only
+ db.execSQL("update accounts set level = ?, keep = 1 where profile=? and name = ?",
+ new Object[]{acc.getLevel(), uuid, acc.getName()});
+ db.execSQL("insert into accounts(profile, name, name_upper, parent_name, level) " +
+ "select ?,?,?,?,? where (select changes() = 0)",
+ new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(),
+ acc.getLevel()
+ });
}
public void storeAccountValue(String name, String currency, Float amount) {
SQLiteDatabase db = MLDB.getWritableDatabase();
@@ -190,7 +210,8 @@ public final class MobileLedgerProfile {
db.execSQL("INSERT INTO transactions(profile, id, date, description, data_hash, keep) " +
"values(?,?,?,?,?,1)",
- new Object[]{uuid, tr.getId(), tr.getDate(), tr.getDescription(), tr.getDataHash()
+ new Object[]{uuid, tr.getId(), Globals.formatLedgerDate(tr.getDate()),
+ tr.getDescription(), tr.getDataHash()
});
for (LedgerTransactionAccount item : tr.getAccounts()) {
@@ -202,7 +223,7 @@ public final class MobileLedgerProfile {
}
Log.d("profile", String.format("Transaction %d stored", tr.getId()));
}
- public String get_option_value(String name, String default_value) {
+ public String getOption(String name, String default_value) {
SQLiteDatabase db = MLDB.getReadableDatabase();
try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?",
new String[]{uuid, name}))
@@ -225,9 +246,9 @@ public final class MobileLedgerProfile {
return default_value;
}
}
- public long get_option_value(String name, long default_value) {
+ public long getLongOption(String name, long default_value) {
long longResult;
- String result = get_option_value(name, "");
+ String result = getOption(name, "");
if ((result == null) || result.isEmpty()) {
Log.d("profile", String.format("Returning default value for option %s", name));
longResult = default_value;
@@ -245,18 +266,50 @@ public final class MobileLedgerProfile {
return longResult;
}
- public void set_option_value(String name, String value) {
+ public void setOption(String name, String value) {
Log.d("profile", String.format("setting option %s=%s", name, value));
SQLiteDatabase db = MLDB.getWritableDatabase();
db.execSQL("insert or replace into options(profile, name, value) values(?, ?, ?);",
new String[]{uuid, name, value});
}
- public void set_option_value(String name, long value) {
- set_option_value(name, String.valueOf(value));
+ public void setLongOption(String name, long value) {
+ setOption(name, String.valueOf(value));
}
public void removeFromDB() {
SQLiteDatabase db = MLDB.getWritableDatabase();
- Log.d("db", String.format("removinf progile %s from DB", uuid));
+ Log.d("db", String.format("removing progile %s from DB", uuid));
db.execSQL("delete from profiles where uuid=?", new Object[]{uuid});
}
+ public LedgerAccount loadAccount(String name) {
+ SQLiteDatabase db = MLDB.getReadableDatabase();
+ try (Cursor cursor = db.rawQuery("SELECT hidden from accounts where profile=? and name=?",
+ new String[]{uuid, name}))
+ {
+ if (cursor.moveToFirst()) {
+ LedgerAccount acc = new LedgerAccount(name);
+ acc.setHidden(cursor.getInt(0) == 1);
+
+ return acc;
+ }
+ }
+
+ return null;
+ }
+ public LedgerTransaction loadTransaction(int transactionId) {
+ LedgerTransaction tr = new LedgerTransaction(transactionId, this.uuid);
+ tr.loadData(MLDB.getReadableDatabase());
+
+ 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());
+ }
}