remove unused method

[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 6fc2551f592d650fb6a396e1d92d025b2119d8fe..6c7fb195719bb97ea7b5e6c2fc1dac03adb8ef34 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -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;
@@ -52,18 +53,25 @@ public final class MobileLedgerProfile {
         this.authUserName = String.valueOf(authUserName);
         this.authPassword = String.valueOf(authPassword);
     }
-    public static List<MobileLedgerProfile> loadAllFromDB() {
-        List<MobileLedgerProfile> 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<MobileLedgerProfile> 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))
         {
             while (cursor.moveToNext()) {
-                result.add(new MobileLedgerProfile(cursor.getString(0), cursor.getString(1),
+                MobileLedgerProfile item =
+                        new MobileLedgerProfile(cursor.getString(0), cursor.getString(1),
                         cursor.getString(2), cursor.getInt(3) == 1, cursor.getString(4),
-                        cursor.getString(5)));
+                                cursor.getString(5));
+                list.add(item);
+                if (item.getUuid().equals(currentProfileUUID)) result = item;
             }
         }
+        Data.profiles.setList(list);
         return result;
     }
     public static void storeProfilesOrder() {
@@ -82,65 +90,28 @@ public final class MobileLedgerProfile {
             db.endTransaction();
         }
     }
-    public static List<MobileLedgerProfile> createInitialProfileList() {
-        List<MobileLedgerProfile> 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;
-            }
-        }
-
-        return new MobileLedgerProfile(profileUUID, name, url, useAuthentication, authUser,
-                authPassword);
-    }
     public String getUuid() {
         return uuid;
     }
     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;
     }
@@ -150,21 +121,21 @@ 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();
@@ -209,7 +180,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()) {
@@ -221,7 +193,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}))
@@ -244,9 +216,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;
@@ -264,14 +236,14 @@ 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();