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=70c12ab90f6fd7e1a447727cc65c0cc9709278f4;hb=c0b1645b9f14e6b25803efd2fa048e27030ba5e6;hpb=e12bae55fb75c0c30055dd34ded195e75feb3844
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 70c12ab9..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;
@@ -31,40 +31,65 @@ 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 order by order_no", 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 void storeProfilesOrder() {
@@ -75,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();
@@ -83,43 +109,11 @@ public final class MobileLedgerProfile {
db.endTransaction();
}
}
- 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 boolean isPostingPermitted() {
+ return permitPosting;
}
- 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;
- }
- }
-
- return new MobileLedgerProfile(profileUUID, name, url, useAuthentication, authUser,
- authPassword);
+ public void setPostingPermitted(boolean permitPosting) {
+ this.permitPosting = permitPosting;
}
public String getUuid() {
return uuid;
@@ -170,10 +164,16 @@ public final class MobileLedgerProfile {
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();
}
@@ -295,4 +295,21 @@ public final class MobileLedgerProfile {
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());
+ }
}